More mir-opt test fixes for big-endian platforms

A number of mir-opt test cases are failing again on big-endian platforms, due to endian-specific binary encodings in the output files that are being checked by the test. To fix those, one of the following two strategies is used: a) Where a binary encoded value directly originates from some immediate constant in the test case source code, change that constant to an endian-invariant value (like 0x11000011). b) Where that is not easily possible or would change the essence of what the test is checking for, disable the test on big-endian platforms. Fixes (again) rust-lang#105383.
uweigand · Jul 10, 2024 · 73caae4 · 73caae4
1 parent c092b28
commit 73caae4
Show file tree

Hide file tree

Showing 52 changed files with 150 additions and 142 deletions.
diff --git a/tests/mir-opt/const_debuginfo.rs b/tests/mir-opt/const_debuginfo.rs
@@ -1,5 +1,6 @@
 //@ test-mir-pass: SingleUseConsts
 //@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN
+//@ ignore-endian-big
 
 #![allow(unused)]
 

diff --git a/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff b/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff
@@ -21,12 +21,12 @@
 
       bb0: {
           StorageLive(_2);
--         _2 = (const 1_i32, const false);
-+         _2 = const (1_i32, false);
+-         _2 = (const 285212689_i32, const false);
++         _2 = const (285212689_i32, false);
           StorageLive(_3);
           _3 = &raw mut (_2.1: bool);
--         _2 = (const 1_i32, const false);
-+         _2 = const (1_i32, false);
+-         _2 = (const 285212689_i32, const false);
++         _2 = const (285212689_i32, false);
           StorageLive(_4);
           (*_3) = const true;
           _4 = const ();
@@ -47,6 +47,6 @@
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     01 00 00 00 00 __ __ __                         │ .....░░░
++     11 00 00 11 00 __ __ __                         │ .....░░░
   }
 
diff --git a/tests/mir-opt/const_prop/address_of_pair.rs b/tests/mir-opt/const_prop/address_of_pair.rs
@@ -16,9 +16,9 @@ pub fn fn0() -> bool {
     // CHECK-NOT: = const false;
     // CHECK-NOT: = const true;
     // CHECK: _0 = [[ret]];
-    let mut pair = (1, false);
+    let mut pair = (0x11000011, false); // Endian-invariant value.
     let ptr = core::ptr::addr_of_mut!(pair.1);
-    pair = (1, false);
+    pair = (0x11000011, false);
     unsafe {
         *ptr = true;
     }

diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff
@@ -11,22 +11,22 @@
 
       bb0: {
           StorageLive(_1);
--         _2 = AddWithOverflow(const 1_u32, const 1_u32);
--         assert(!move (_2.1: bool), "attempt to compute `{} + {}`, which would overflow", const 1_u32, const 1_u32) -> [success: bb1, unwind unreachable];
-+         _2 = const (2_u32, false);
-+         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 1_u32, const 1_u32) -> [success: bb1, unwind unreachable];
+-         _2 = AddWithOverflow(const 285212689_u32, const 285212689_u32);
+-         assert(!move (_2.1: bool), "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind unreachable];
++         _2 = const (570425378_u32, false);
++         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind unreachable];
       }
 
       bb1: {
 -         _1 = move (_2.0: u32);
-+         _1 = const 2_u32;
++         _1 = const 570425378_u32;
           _0 = const ();
           StorageDead(_1);
           return;
       }
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     02 00 00 00 00 __ __ __                         │ .....░░░
++     22 00 00 22 00 __ __ __                         │ "..".░░░
   }
 
diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff
@@ -11,22 +11,22 @@
 
       bb0: {
           StorageLive(_1);
--         _2 = AddWithOverflow(const 1_u32, const 1_u32);
--         assert(!move (_2.1: bool), "attempt to compute `{} + {}`, which would overflow", const 1_u32, const 1_u32) -> [success: bb1, unwind continue];
-+         _2 = const (2_u32, false);
-+         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 1_u32, const 1_u32) -> [success: bb1, unwind continue];
+-         _2 = AddWithOverflow(const 285212689_u32, const 285212689_u32);
+-         assert(!move (_2.1: bool), "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind continue];
++         _2 = const (570425378_u32, false);
++         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind continue];
       }
 
       bb1: {
 -         _1 = move (_2.0: u32);
-+         _1 = const 2_u32;
++         _1 = const 570425378_u32;
           _0 = const ();
           StorageDead(_1);
           return;
       }
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     02 00 00 00 00 __ __ __                         │ .....░░░
++     22 00 00 22 00 __ __ __                         │ "..".░░░
   }
 
diff --git a/tests/mir-opt/const_prop/checked_add.rs b/tests/mir-opt/const_prop/checked_add.rs
@@ -7,6 +7,6 @@ fn main() {
     // CHECK-LABEL: fn main(
     // CHECK: debug x => [[x:_.*]];
     // CHECK: assert(!const false,
-    // CHECK: [[x]] = const 2_u32;
-    let x: u32 = 1 + 1;
+    // CHECK: [[x]] = const 570425378_u32;
+    let x: u32 = 0x11000011 + 0x11000011; // Endian-invariant value.
 }
diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff
@@ -14,8 +14,8 @@
 
       bb0: {
           StorageLive(_1);
--         _1 = (const 42_i32, const 43_i32);
-+         _1 = const (42_i32, 43_i32);
+-         _1 = (const 285212689_i32, const 570425378_i32);
++         _1 = const (285212689_i32, 570425378_i32);
           (_1.1: i32) = const 99_i32;
           StorageLive(_2);
           _2 = _1;
@@ -27,6 +27,6 @@
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     2a 00 00 00 2b 00 00 00                         │ *...+...
++     11 00 00 11 22 00 00 22                         │ ....".."
   }
 
diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs
@@ -5,10 +5,10 @@ fn main() {
     // CHECK-LABEL: fn main(
     // CHECK: debug x => [[x:_.*]];
     // CHECK: debug y => [[y:_.*]];
-    // CHECK: [[x]] = const (42_i32, 43_i32);
+    // CHECK: [[x]] = const (285212689_i32, 570425378_i32);
     // CHECK: ([[x]].1: i32) = const 99_i32;
     // CHECK: [[y]] = [[x]];
-    let mut x = (42, 43);
+    let mut x = (0x11000011, 0x22000022); // Endian-invariant values.
     x.1 = 99;
     let y = x;
 }
diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff
@@ -18,8 +18,8 @@
 
       bb0: {
           StorageLive(_1);
--         _1 = (const 42_i32, const 43_i32);
-+         _1 = const (42_i32, 43_i32);
+-         _1 = (const 285212689_i32, const 570425378_i32);
++         _1 = const (285212689_i32, 570425378_i32);
           StorageLive(_2);
           _2 = &mut _1;
           ((*_2).1: i32) = const 99_i32;
@@ -34,6 +34,6 @@
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     2a 00 00 00 2b 00 00 00                         │ *...+...
++     11 00 00 11 22 00 00 22                         │ ....".."
   }
 
diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs
@@ -6,11 +6,11 @@ fn main() {
     // CHECK: debug x => [[x:_.*]];
     // CHECK: debug z => [[z:_.*]];
     // CHECK: debug y => [[y:_.*]];
-    // CHECK: [[x]] = const (42_i32, 43_i32);
+    // CHECK: [[x]] = const (285212689_i32, 570425378_i32);
     // CHECK: [[z]] = &mut [[x]];
     // CHECK: ((*[[z]]).1: i32) = const 99_i32;
     // CHECK: [[y]] = [[x]];
-    let mut x = (42, 43);
+    let mut x = (0x11000011, 0x22000022); // Endian-invariant values.
     let z = &mut x;
     z.1 = 99;
     let y = x;

diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff
@@ -29,8 +29,8 @@
 
       bb1: {
           StorageLive(_2);
--         _2 = (const 1_i32, const 2_i32);
-+         _2 = const (1_i32, 2_i32);
+-         _2 = (const 285212689_i32, const 570425378_i32);
++         _2 = const (285212689_i32, 570425378_i32);
           StorageLive(_3);
           _3 = _1;
 -         (_2.1: i32) = move _3;
@@ -51,6 +51,6 @@
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     01 00 00 00 02 00 00 00                         │ ........
++     11 00 00 11 22 00 00 22                         │ ....".."
   }
 
diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff
@@ -29,8 +29,8 @@
 
       bb1: {
           StorageLive(_2);
--         _2 = (const 1_i32, const 2_i32);
-+         _2 = const (1_i32, 2_i32);
+-         _2 = (const 285212689_i32, const 570425378_i32);
++         _2 = const (285212689_i32, 570425378_i32);
           StorageLive(_3);
           _3 = _1;
 -         (_2.1: i32) = move _3;
@@ -51,6 +51,6 @@
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     01 00 00 00 02 00 00 00                         │ ........
++     11 00 00 11 22 00 00 22                         │ ....".."
   }
 
diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs
@@ -9,12 +9,12 @@ fn main() {
     // CHECK: debug y => [[y:_.*]];
     // CHECK: debug z => [[z:_.*]];
     // CHECK: [[a]] = foo()
-    // CHECK: [[x]] = const (1_i32, 2_i32);
+    // CHECK: [[x]] = const (285212689_i32, 570425378_i32);
     // CHECK: ([[x]].1: i32) = [[a]];
     // CHECK: [[y]] = ([[x]].1: i32);
     // CHECK: [[z]] = ([[x]].0: i32);
     let a = foo();
-    let mut x: (i32, i32) = (1, 2);
+    let mut x: (i32, i32) = (0x11000011, 0x22000022); // Endian-invariant values.
     x.1 = a;
     let y = x.1;
     let z = x.0;

diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff
@@ -6,20 +6,20 @@
       let mut _1: (u32, bool);
 
       bb0: {
--         _1 = AddWithOverflow(const 2_u32, const 2_u32);
--         assert(!move (_1.1: bool), "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind unreachable];
-+         _1 = const (4_u32, false);
-+         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind unreachable];
+-         _1 = AddWithOverflow(const 285212689_u32, const 285212689_u32);
+-         assert(!move (_1.1: bool), "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind unreachable];
++         _1 = const (570425378_u32, false);
++         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind unreachable];
       }
 
       bb1: {
 -         _0 = move (_1.0: u32);
-+         _0 = const 4_u32;
++         _0 = const 570425378_u32;
           return;
       }
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     04 00 00 00 00 __ __ __                         │ .....░░░
++     22 00 00 22 00 __ __ __                         │ "..".░░░
   }
 
diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff
@@ -6,20 +6,20 @@
       let mut _1: (u32, bool);
 
       bb0: {
--         _1 = AddWithOverflow(const 2_u32, const 2_u32);
--         assert(!move (_1.1: bool), "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind continue];
-+         _1 = const (4_u32, false);
-+         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind continue];
+-         _1 = AddWithOverflow(const 285212689_u32, const 285212689_u32);
+-         assert(!move (_1.1: bool), "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind continue];
++         _1 = const (570425378_u32, false);
++         assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind continue];
       }
 
       bb1: {
 -         _0 = move (_1.0: u32);
-+         _0 = const 4_u32;
++         _0 = const 570425378_u32;
           return;
       }
 + }
 + 
 + ALLOC0 (size: 8, align: 4) {
-+     04 00 00 00 00 __ __ __                         │ .....░░░
++     22 00 00 22 00 __ __ __                         │ "..".░░░
   }
 
diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir
@@ -5,16 +5,16 @@ fn add() -> u32 {
     let mut _1: (u32, bool);
 
     bb0: {
-        _1 = const (4_u32, false);
-        assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind unreachable];
+        _1 = const (570425378_u32, false);
+        assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind unreachable];
     }
 
     bb1: {
-        _0 = const 4_u32;
+        _0 = const 570425378_u32;
         return;
     }
 }
 
 ALLOC0 (size: 8, align: 4) {
-    04 00 00 00 00 __ __ __                         │ .....░░░
+    22 00 00 22 00 __ __ __                         │ "..".░░░
 }
diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir
@@ -5,16 +5,16 @@ fn add() -> u32 {
     let mut _1: (u32, bool);
 
     bb0: {
-        _1 = const (4_u32, false);
-        assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 2_u32, const 2_u32) -> [success: bb1, unwind continue];
+        _1 = const (570425378_u32, false);
+        assert(!const false, "attempt to compute `{} + {}`, which would overflow", const 285212689_u32, const 285212689_u32) -> [success: bb1, unwind continue];
     }
 
     bb1: {
-        _0 = const 4_u32;
+        _0 = const 570425378_u32;
         return;
     }
 }
 
 ALLOC0 (size: 8, align: 4) {
-    04 00 00 00 00 __ __ __                         │ .....░░░
+    22 00 00 22 00 __ __ __                         │ "..".░░░
 }
diff --git a/tests/mir-opt/const_prop/return_place.rs b/tests/mir-opt/const_prop/return_place.rs
@@ -6,8 +6,8 @@
 // EMIT_MIR return_place.add.PreCodegen.before.mir
 fn add() -> u32 {
     // CHECK-LABEL: fn add(
-    // CHECK: _0 = const 4_u32;
-    2 + 2
+    // CHECK: _0 = const 570425378_u32;
+    0x11000011 + 0x11000011 // Endian-invariant value.
 }
 
 fn main() {

diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff
@@ -41,7 +41,7 @@
 
       bb1: {
 -         _1 = (*_2)[_6];
-+         _1 = const 2_u32;
++         _1 = const 570425378_u32;
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
@@ -52,6 +52,6 @@
 + }
 + 
 + ALLOC0 (size: 12, align: 4) {
-+     01 00 00 00 02 00 00 00 03 00 00 00             │ ............
++     11 00 00 11 22 00 00 22 33 00 00 33             │ ....".."3..3
   }
 
diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff
@@ -41,7 +41,7 @@
 
       bb1: {
 -         _1 = (*_2)[_6];
-+         _1 = const 2_u32;
++         _1 = const 570425378_u32;
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
@@ -52,6 +52,6 @@
 + }
 + 
 + ALLOC0 (size: 12, align: 4) {
-+     01 00 00 00 02 00 00 00 03 00 00 00             │ ............
++     11 00 00 11 22 00 00 22 33 00 00 33             │ ....".."3..3
   }
 
diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff
@@ -41,7 +41,7 @@
 
       bb1: {
 -         _1 = (*_2)[_6];
-+         _1 = const 2_u32;
++         _1 = const 570425378_u32;
           StorageDead(_6);
           StorageDead(_4);
           StorageDead(_2);
@@ -52,6 +52,6 @@
 + }
 + 
 + ALLOC0 (size: 12, align: 4) {
-+     01 00 00 00 02 00 00 00 03 00 00 00             │ ............
++     11 00 00 11 22 00 00 22 33 00 00 33             │ ....".."3..3
   }