Skip to content

Ignore mir tests on big-endian #77413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Ignore mir tests on big-endian #77413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/mir-opt/const_prop/checked_add.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C overflow-checks=on

// ignore-endian-big
// EMIT_MIR checked_add.main.ConstProp.diff
fn main() {
let x: u32 = 1 + 1;
Expand Down
2 changes: 1 addition & 1 deletion src/test/mir-opt/const_prop/mutable_variable_aggregate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -O

// ignore-endian-big
// EMIT_MIR mutable_variable_aggregate.main.ConstProp.diff
fn main() {
let mut x = (42, 43);
Expand Down
2 changes: 1 addition & 1 deletion src/test/mir-opt/const_prop/mutable_variable_no_prop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -O

// ignore-endian-big
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is odd, so I think it's ok to ignore here

static mut STATIC: u32 = 42;

// EMIT_MIR mutable_variable_no_prop.main.ConstProp.diff
Expand Down
2 changes: 1 addition & 1 deletion src/test/mir-opt/const_prop/optimizes_into_variable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C overflow-checks=on

// ignore-endian-big
struct Point {
x: u32,
y: u32,
Expand Down
2 changes: 1 addition & 1 deletion src/test/mir-opt/const_prop/return_place.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C overflow-checks=on

// ignore-endian-big
// EMIT_MIR return_place.add.ConstProp.diff
// EMIT_MIR return_place.add.PreCodegen.before.mir
fn add() -> u32 {
Expand Down
40 changes: 20 additions & 20 deletions src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@
+ // MIR for `main` after ConstProp

fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/tuple_literal_propagation.rs:2:11: 2:11
let _1: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
let _2: (); // in scope 0 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
let mut _3: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
let mut _0: (); // return place in scope 0 at $DIR/tuple_literal_propagation.rs:3:11: 3:11
let _1: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
let _2: (); // in scope 0 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
let mut _3: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
scope 1 {
debug x => _1; // in scope 1 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
debug x => _1; // in scope 1 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
}

bb0: {
StorageLive(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
(_1.0: u32) = const 1_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
(_1.1: u32) = const 2_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
StorageLive(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
- _3 = _1; // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
+ _3 = const (1_u32, 2_u32); // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
StorageLive(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
(_1.0: u32) = const 1_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:4:13: 4:19
(_1.1: u32) = const 2_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:4:13: 4:19
StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
StorageLive(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
- _3 = _1; // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
+ _3 = const (1_u32, 2_u32); // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
+ // ty::Const
+ // + ty: (u32, u32)
+ // + val: Value(ByRef { alloc: Allocation { bytes: [1, 0, 0, 0, 2, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
+ // mir::Constant
+ // + span: $DIR/tuple_literal_propagation.rs:5:13: 5:14
+ // + span: $DIR/tuple_literal_propagation.rs:6:13: 6:14
+ // + literal: Const { ty: (u32, u32), val: Value(ByRef { alloc: Allocation { bytes: [1, 0, 0, 0, 2, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a "significant" diff -- i.e., not just line numbers changing. Maybe a bug in how github is showing it or a rebase error?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just line numbers changing AFAICT. Diffs of diffs are hard to parse for me also.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Things like these can be avoided by adding new comment lines in existing empty lines or just adding them at the end of the file. We have no policy on this though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is just line numbers changing - the existing file didn't have an empty line to fit a comment into, and I thought putting it at the end of the file would be inconsistent with everything else.

_2 = consume(move _3) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
_2 = consume(move _3) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
// mir::Constant
// + span: $DIR/tuple_literal_propagation.rs:5:5: 5:12
// + span: $DIR/tuple_literal_propagation.rs:6:5: 6:12
// + literal: Const { ty: fn((u32, u32)) {consume}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:5:14: 5:15
StorageDead(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:5:15: 5:16
_0 = const (); // scope 0 at $DIR/tuple_literal_propagation.rs:2:11: 6:2
StorageDead(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:6:1: 6:2
return; // scope 0 at $DIR/tuple_literal_propagation.rs:6:2: 6:2
StorageDead(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:6:14: 6:15
StorageDead(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:6:15: 6:16
_0 = const (); // scope 0 at $DIR/tuple_literal_propagation.rs:3:11: 7:2
StorageDead(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:7:1: 7:2
return; // scope 0 at $DIR/tuple_literal_propagation.rs:7:2: 7:2
}
}

1 change: 1 addition & 0 deletions src/test/mir-opt/const_prop/tuple_literal_propagation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ignore-endian-big
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of ignoring this test we should add tuples and arrays to the "don't verbosely print the constant" list if all tuple fields or the array element type are on the "don't verbosely print constants of this type" list.

// EMIT_MIR tuple_literal_propagation.main.ConstProp.diff
fn main() {
let x = (1, 2);
Expand Down