Merge branch 'master' into software-tracer

ykjit · Feb 1, 2024 · ad233f4 · ad233f4
2 parents 2690d9c + 7dc01b9
commit ad233f4
Show file tree

Hide file tree

Showing 49 changed files with 798 additions and 1,445 deletions.
diff --git a/hwtracer/Cargo.toml b/hwtracer/Cargo.toml
@@ -7,15 +7,15 @@ license = "Apache-2.0 OR MIT"
 
 [dependencies]
 libc = "0.2.148"
-strum = { version = "0.25", features = ["derive"] }
-strum_macros = "0.25"
+strum = { version = "0.26.1", features = ["derive"] }
+strum_macros = "0.26.1"
 deku = "0.16.0"
 ykaddr = { path = "../ykaddr" }
 intervaltree = "0.2.7"
 byteorder = "1.4.3"
 leb128 = "0.2.5"
 thiserror = "1"
-memmap2 = "0.7"
+memmap2 = "0.9.4"
 
 [dependencies.object]
 version = "0.32"

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -14,11 +14,6 @@ name = "c_tests"
 path = "langtest_c.rs"
 harness = false
 
-[[test]]
-name = "trace_compiler_tests"
-path = "langtest_trace_compiler.rs"
-harness = false
-
 [[test]]
 name = "ir_lowering_tests"
 path = "langtest_ir_lowering.rs"
@@ -27,16 +22,16 @@ harness = false
 [dependencies]
 clap = { features = ["derive"], version = "4.4" }
 hwtracer = { path = "../hwtracer" }
-memmap2 = "0.7"
+memmap2 = "0.9.4"
 regex = "1.9"
-tempfile = "3.8"
+tempfile = "3.9.0"
 ykbuild = { path = "../ykbuild" }
 ykrt = { path = "../ykrt", features = ["yk_testing", "yk_jitstate_debug"] }
 yktracec = { path = "../yktracec", features = ["yk_testing"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }
-lang_tester = "0.7.6"
+lang_tester = "0.8"
 ykcapi = { path = "../ykcapi", features = ["yk_testing"] }
 yktracec = { path = "../yktracec", features = ["yk_testing"] }
 ykrt = { path = "../ykrt", features = ["yk_testing", "yk_jitstate_debug"] }

diff --git a/tests/c/awkward_unmappable.c b/tests/c/awkward_unmappable.c
@@ -1,4 +1,5 @@
-// ignore: Fails with: Assertion `!CallStack.curMappableFrame()' failed
+// # Fails with: Assertion `!CallStack.curMappableFrame()' failed
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_SERIALISE_COMPILATION=1
 //   status: success

diff --git a/tests/c/call_ext_varargs.c b/tests/c/call_ext_varargs.c
@@ -1,4 +1,5 @@
-// ignore: static strings: https://github.com/ykjit/yk/issues/382
+// # static strings: https://github.com/ykjit/yk/issues/382
+// ignore-if: true
 // Compiler:
 // Run-time:
 //   env-var: YKD_PRINT_IR=jit-pre-opt

diff --git a/tests/c/constexpr.c.O0 b/tests/c/constexpr.c.O0
@@ -1 +1,2 @@
-// ignore: -O0 doesn't make a constant expression.
+// # -O0 doesn't make a constant expression.
+// ignore-if: true
diff --git a/tests/c/indirect_branch.c b/tests/c/indirect_branch.c
@@ -1,4 +1,5 @@
-// ignore: guards for indirect branches not implemented.
+// # guards for indirect branches not implemented.
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_PRINT_IR=jit-pre-opt
 //   env-var: YKD_PRINT_JITSTATE=1

diff --git a/tests/c/lifetime_intrinsics.c.O0 b/tests/c/lifetime_intrinsics.c.O0
@@ -1 +1,2 @@
-// ignore: no lifetime annotations at -O0.
+// # no lifetime annotations at -O0.
+// ignore-if: true
diff --git a/tests/c/many_threads_many_locs.c b/tests/c/many_threads_many_locs.c
@@ -1,4 +1,5 @@
-// ignore: Shadow stack doesn't currently support dynamically sized stack.
+// # Shadow stack doesn't currently support dynamically sized stack.
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_PRINT_JITSTATE=1
 //   stderr:

diff --git a/tests/c/many_threads_one_loc.c b/tests/c/many_threads_one_loc.c
@@ -1,4 +1,5 @@
-// ignore: Shadow stack doesn't currently support dynamically sized stack.
+// # Shadow stack doesn't currently support dynamically sized stack.
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_PRINT_IR=aot
 //   env-var: YKD_SERIALISE_COMPILATION=1

diff --git a/tests/c/simple_interp_loop1.c b/tests/c/simple_interp_loop1.c
@@ -1,4 +1,5 @@
-// ignore: Shadow stack doesn't currently support dynamically sized stack.
+// # Shadow stack doesn't currently support dynamically sized stack.
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_PRINT_IR=jit-pre-opt
 //   env-var: YKD_SERIALISE_COMPILATION=1

diff --git a/tests/c/simple_nested.c b/tests/c/simple_nested.c
@@ -1,4 +1,4 @@
-// ignore: dont
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_PRINT_IR=jit-pre-opt
 //   env-var: YKD_SERIALISE_COMPILATION=1

diff --git a/tests/c/stats2.c b/tests/c/stats2.c
@@ -1,4 +1,5 @@
-// ignore: Shadow stack not supported on non-main threads.
+// # Shadow stack not supported on non-main threads.
+// ignore-if: true
 // Run-time:
 //   env-var: YKD_SERIALISE_COMPILATION=1
 //   env-var: YKD_STATS=-

diff --git a/tests/langtest_c.rs b/tests/langtest_c.rs
@@ -93,6 +93,7 @@ fn run_suite(opt: &'static str) {
     let wrapper_path = ccg.wrapper_path();
 
     LangTester::new()
+        .comment_prefix("#")
         .test_dir("c")
         .test_path_filter(filter)
         .test_extract(move |p| {

diff --git a/tests/langtest_trace_compiler.rs b/tests/langtest_trace_compiler.rs
diff --git a/tests/src/bin/run_trace_compiler_test.rs b/tests/src/bin/run_trace_compiler_test.rs
diff --git a/tests/trace_compiler/call_ext.ll b/tests/trace_compiler/call_ext.ll
diff --git a/tests/trace_compiler/direct_recursion.ll b/tests/trace_compiler/direct_recursion.ll
diff --git a/tests/trace_compiler/global_immut.ll b/tests/trace_compiler/global_immut.ll
diff --git a/tests/trace_compiler/global_mut.ll b/tests/trace_compiler/global_mut.ll