Merge pull request #1466 from vext01/yklua-while-fixes

Yklua while loop fixes
ykjit · Nov 18, 2024 · 9530f86 · 9530f86
2 parents f081d90 + 9ba3d0a
commit 9530f86
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/bin/yk-config b/bin/yk-config
@@ -46,6 +46,10 @@ handle_arg() {
             OUTPUT="${OUTPUT} -fyk-noinline-funcs-with-loops"
             # Don't optimise functions by changing their calling convention.
             OUTPUT="${OUTPUT} -mllvm -yk-dont-opt-func-abi"
+            # Ensure any jump threading pass that may run at pre-link time
+            # doesn't interfere with control points that will be added at
+            # link-time (the functionalities are guarded by the same flag).
+            OUTPUT="${OUTPUT} -mllvm -yk-patch-control-point"
             ;;
         --cppflags)
             # Path to yk.h

diff --git a/ykrt/src/compile/jitc_yk/opt/mod.rs b/ykrt/src/compile/jitc_yk/opt/mod.rs
@@ -274,10 +274,13 @@ impl Opt {
                         let Const::Int(_, v) = self.m.const_(cidx) else {
                             panic!()
                         };
+                        // DynPtrAdd indices are signed, so we have to be careful to interpret the
+                        // constant as such.
+                        let v = *v as i64;
                         // LLVM IR allows `off` to be an `i64` but our IR currently allows only an
                         // `i32`. On that basis, we can hit our limits before the program has
                         // itself hit UB, at which point we can't go any further.
-                        let off = i32::try_from(*v)
+                        let off = i32::try_from(v)
                             .map_err(|_| ())
                             .and_then(|v| v.checked_mul(i32::from(x.elem_size())).ok_or(()))
                             .map_err(|_| {
@@ -1000,6 +1003,34 @@ mod test {
         );
     }
 
+    #[test]
+    fn opt_dynptradd_const() {
+        Module::assert_ir_transform_eq(
+            "
+          entry:
+            %0: ptr = load_ti 0
+            %1: ptr = dyn_ptr_add %0, 2i64, 8
+            black_box %1
+            %3: ptr = dyn_ptr_add %0, -1i64, 8
+            black_box %3
+            %5: ptr = dyn_ptr_add %0, -8i64, 16
+            black_box %5
+        ",
+            |m| opt(m).unwrap(),
+            "
+          ...
+          entry:
+            %0: ptr = load_ti...
+            %1: ptr = ptr_add %0, 16
+            black_box %1
+            %3: ptr = ptr_add %0, -8
+            black_box %3
+            %5: ptr = ptr_add %0, -128
+            black_box %5
+        ",
+        );
+    }
+
     #[test]
     fn opt_guard_dup() {
         Module::assert_ir_transform_eq(