Update conformance suite to latest (vbpf#574)

* Update bpf_conformance to latest * Remove movsx imm tests since movsx is only defined for register operands per latest mailing list discussion * Run new test cases added to conformance suite * Fix conformance bug --------- Signed-off-by: Dave Thaler <[email protected]>
dthaler · Jan 25, 2024 · f3964ef · f3964ef
1 parent e8047ca
commit f3964ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/external/bpf_conformance b/external/bpf_conformance
diff --git a/src/crab/ebpf_domain.cpp b/src/crab/ebpf_domain.cpp
@@ -2751,7 +2751,11 @@ void ebpf_domain_t::operator()(const Bin& bin) {
                 default: break;
                 }
             });
-            havoc(dst.type);
+            if ((bin.dst.v != std::get<Reg>(bin.v).v) || (type_inv.get_type(m_inv, dst.type) == T_UNINIT)) {
+                // Only forget the destination type if we're copying from a different register,
+                // or from the same uninitialized register.
+                havoc(dst.type);
+            }
             type_inv.assign_type(m_inv, bin.dst, std::get<Reg>(bin.v));
             break;
         }

diff --git a/src/test/test_conformance.cpp b/src/test/test_conformance.cpp
@@ -93,6 +93,7 @@ TEST_CONFORMANCE("jeq-reg.data")
 TEST_CONFORMANCE("jeq32-imm.data")
 TEST_CONFORMANCE("jeq32-reg.data")
 TEST_CONFORMANCE("jge-imm.data")
+TEST_CONFORMANCE("jge-reg.data")
 TEST_CONFORMANCE("jge32-imm.data")
 TEST_CONFORMANCE("jge32-reg.data")
 TEST_CONFORMANCE("jgt-imm.data")
@@ -185,15 +186,10 @@ TEST_CONFORMANCE("mod64-by-zero-reg.data")
 TEST_CONFORMANCE("mod64.data")
 TEST_CONFORMANCE("mov.data")
 TEST_CONFORMANCE("mov64-sign-extend.data")
-TEST_CONFORMANCE("movsx1632-imm.data")
 TEST_CONFORMANCE("movsx1632-reg.data")
-TEST_CONFORMANCE("movsx1664-imm.data")
 TEST_CONFORMANCE("movsx1664-reg.data")
-TEST_CONFORMANCE("movsx3264-imm.data")
 TEST_CONFORMANCE("movsx3264-reg.data")
-TEST_CONFORMANCE("movsx832-imm.data")
 TEST_CONFORMANCE("movsx832-reg.data")
-TEST_CONFORMANCE("movsx864-imm.data")
 TEST_CONFORMANCE("movsx864-reg.data")
 TEST_CONFORMANCE("mul32-imm.data")
 TEST_CONFORMANCE("mul32-reg-overflow.data")
+1 −1		.github/workflows/Build.yml
+1 −1		external/elfio
+1 −0		include/bpf_conformance.h
+3 −0		src/bpf_conformance.cc
+1 −6		src/opcode_names.h
+2 −0		tests/add.data
+7 −3		tests/add64.data
+2 −1		tests/alu-arith.data
+2 −0		tests/alu-bit.data
+2 −1		tests/alu64-arith.data
+2 −0		tests/alu64-bit.data
+2 −0		tests/jeq-reg.data
+2 −0		tests/jeq32-reg.data
+18 −0		tests/jge-reg.data
+2 −0		tests/jge32-reg.data
+1 −0		tests/jne-reg.data
+2 −1		tests/jne32-reg.data
+2 −0		tests/jset-reg.data
+2 −0		tests/jset32-reg.data
+2 −0		tests/jsge-reg.data
+2 −0		tests/jsge32-reg.data
+1 −0		tests/jsgt-reg.data
+1 −0		tests/jsgt32-reg.data
+3 −0		tests/jsle-reg.data
+3 −0		tests/jsle32-reg.data
+1 −0		tests/mov.data
+4 −2		tests/mov64.data
+0 −7		tests/movsx1664-imm.data
+0 −7		tests/movsx3264-imm.data
+0 −7		tests/movsx832-imm.data
+0 −7		tests/movsx864-imm.data