Skip to content

Commit 3b75afe

Browse files
tesujitesuji
committed
shorten array in tests
big arrays make the diff hard to read
1 parent 57ac10f commit 3b75afe

File tree

2 files changed

+38
-67
lines changed

2 files changed

+38
-67
lines changed

‎tests/mir-opt/const_array_locals.main.GVN.diff

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33

44
fn main() -> () {
55
let mut _0: ();
6-
let _1: [i32; 32];
7-
let mut _4: [i32; 12];
8-
let mut _5: [i32; 12];
9-
let mut _7: &[i32; 32];
10-
let _8: [i32; 32];
6+
let _1: [i32; 5];
7+
let mut _4: [i32; 5];
8+
let mut _5: [i32; 5];
9+
let mut _7: &[i32; 5];
10+
let _8: [i32; 5];
1111
let _9: ();
12-
let mut _10: [u16; 32];
12+
let mut _10: [u32; 5];
1313
let mut _12: [f32; 8];
1414
let _13: [[i32; 3]; 3];
1515
let mut _14: [i32; 3];
1616
let mut _15: [i32; 3];
1717
let mut _16: [i32; 3];
1818
scope 1 {
1919
debug _arr => _1;
20-
let _2: [i32; 32];
20+
let _2: [i32; 5];
2121
scope 2 {
22-
debug _barr => _2;
23-
let _3: [[i32; 12]; 2];
22+
debug _duplicated_arr => _2;
23+
let _3: [[i32; 5]; 2];
2424
scope 3 {
2525
debug _foo => _3;
26-
let _6: [i32; 32];
27-
let mut _17: &[i32; 32];
26+
let _6: [i32; 5];
27+
let mut _17: &[i32; 5];
2828
scope 4 {
2929
debug _darr => _6;
3030
let _11: F32x8;
@@ -38,18 +38,18 @@
3838

3939
bb0: {
4040
StorageLive(_1);
41-
- _1 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32, const 251_i32, const 191_i32, const 178_i32, const 9_i32, const 4_i32, const 56_i32, const 221_i32, const 193_i32, const 164_i32, const 194_i32, const 197_i32, const 6_i32, const 243_i32, const 218_i32, const 171_i32, const 87_i32, const 247_i32, const 104_i32, const 159_i32, const 22_i32, const 157_i32, const 105_i32, const 31_i32, const 96_i32, const 173_i32, const 50_i32, const 1_i32];
42-
+ _1 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32, 251_i32, 191_i32, 178_i32, 9_i32, 4_i32, 56_i32, 221_i32, 193_i32, 164_i32, 194_i32, 197_i32, 6_i32, 243_i32, 218_i32, 171_i32, 87_i32, 247_i32, 104_i32, 159_i32, 22_i32, 157_i32, 105_i32, 31_i32, 96_i32, 173_i32, 50_i32, 1_i32];
41+
- _1 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32];
42+
+ _1 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32];
4343
StorageLive(_2);
44-
- _2 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32, const 251_i32, const 191_i32, const 178_i32, const 9_i32, const 4_i32, const 56_i32, const 221_i32, const 193_i32, const 164_i32, const 194_i32, const 197_i32, const 6_i32, const 243_i32, const 218_i32, const 171_i32, const 87_i32, const 247_i32, const 104_i32, const 159_i32, const 22_i32, const 157_i32, const 105_i32, const 31_i32, const 96_i32, const 173_i32, const 50_i32, const 1_i32];
45-
+ _2 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32, 251_i32, 191_i32, 178_i32, 9_i32, 4_i32, 56_i32, 221_i32, 193_i32, 164_i32, 194_i32, 197_i32, 6_i32, 243_i32, 218_i32, 171_i32, 87_i32, 247_i32, 104_i32, 159_i32, 22_i32, 157_i32, 105_i32, 31_i32, 96_i32, 173_i32, 50_i32, 1_i32];
44+
- _2 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32];
45+
+ _2 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32];
4646
StorageLive(_3);
4747
StorageLive(_4);
48-
- _4 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32, const 251_i32, const 191_i32, const 178_i32, const 9_i32, const 4_i32, const 56_i32, const 221_i32];
49-
+ _4 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32, 251_i32, 191_i32, 178_i32, 9_i32, 4_i32, 56_i32, 221_i32];
48+
- _4 = [const 178_i32, const 9_i32, const 4_i32, const 56_i32, const 221_i32];
49+
+ _4 = const [178_i32, 9_i32, 4_i32, 56_i32, 221_i32];
5050
StorageLive(_5);
51-
- _5 = [const 193_i32, const 164_i32, const 194_i32, const 197_i32, const 6_i32, const 243_i32, const 218_i32, const 171_i32, const 87_i32, const 247_i32, const 104_i32, const 42_i32];
52-
+ _5 = const [193_i32, 164_i32, 194_i32, 197_i32, 6_i32, 243_i32, 218_i32, 171_i32, 87_i32, 247_i32, 104_i32, 42_i32];
51+
- _5 = [const 193_i32, const 164_i32, const 194_i32, const 197_i32, const 6_i32];
52+
+ _5 = const [193_i32, 164_i32, 194_i32, 197_i32, 6_i32];
5353
_3 = [move _4, move _5];
5454
StorageDead(_5);
5555
StorageDead(_4);
@@ -62,10 +62,10 @@
6262
StorageDead(_7);
6363
StorageLive(_9);
6464
StorageLive(_10);
65-
- _10 = [const 255_u16, const 105_u16, const 15_u16, const 39_u16, const 62_u16, const 251_u16, const 191_u16, const 178_u16, const 9_u16, const 4_u16, const 56_u16, const 221_u16, const 193_u16, const 164_u16, const 194_u16, const 197_u16, const 6_u16, const 243_u16, const 218_u16, const 171_u16, const 87_u16, const 247_u16, const 104_u16, const 159_u16, const 22_u16, const 157_u16, const 105_u16, const 31_u16, const 96_u16, const 173_u16, const 50_u16, const 1_u16];
65+
- _10 = [const 31_u32, const 96_u32, const 173_u32, const 50_u32, const 1_u32];
6666
- _9 = consume(move _10) -> [return: bb1, unwind continue];
67-
+ _10 = const [255_u16, 105_u16, 15_u16, 39_u16, 62_u16, 251_u16, 191_u16, 178_u16, 9_u16, 4_u16, 56_u16, 221_u16, 193_u16, 164_u16, 194_u16, 197_u16, 6_u16, 243_u16, 218_u16, 171_u16, 87_u16, 247_u16, 104_u16, 159_u16, 22_u16, 157_u16, 105_u16, 31_u16, 96_u16, 173_u16, 50_u16, 1_u16];
68-
+ _9 = consume(const [255_u16, 105_u16, 15_u16, 39_u16, 62_u16, 251_u16, 191_u16, 178_u16, 9_u16, 4_u16, 56_u16, 221_u16, 193_u16, 164_u16, 194_u16, 197_u16, 6_u16, 243_u16, 218_u16, 171_u16, 87_u16, 247_u16, 104_u16, 159_u16, 22_u16, 157_u16, 105_u16, 31_u16, 96_u16, 173_u16, 50_u16, 1_u16]) -> [return: bb1, unwind continue];
67+
+ _10 = const [31_u32, 96_u32, 173_u32, 50_u32, 1_u32];
68+
+ _9 = consume(const [31_u32, 96_u32, 173_u32, 50_u32, 1_u32]) -> [return: bb1, unwind continue];
6969
}
7070

7171
bb1: {
@@ -105,33 +105,23 @@
105105
+ 0x10 │ 00 00 80 3f 00 00 80 3f 00 00 80 3f 00 00 28 42 │ ...?...?...?..(B
106106
+ }
107107
+
108-
+ ALLOC1 (size: 64, align: 2) {
109-
+ 0x00 │ ff 00 69 00 0f 00 27 00 3e 00 fb 00 bf 00 b2 00 │ ..i...'.>.......
110-
+ 0x10 │ 09 00 04 00 38 00 dd 00 c1 00 a4 00 c2 00 c5 00 │ ....8...........
111-
+ 0x20 │ 06 00 f3 00 da 00 ab 00 57 00 f7 00 68 00 9f 00 │ ........W...h...
112-
+ 0x30 │ 16 00 9d 00 69 00 1f 00 60 00 ad 00 32 00 01 00 │ ....i...`...2...
108+
+ ALLOC1 (size: 20, align: 4) {
109+
+ 0x00 │ 1f 00 00 00 60 00 00 00 ad 00 00 00 32 00 00 00 │ ....`.......2...
110+
+ 0x10 │ 01 00 00 00 │ ....
113111
+ }
114112
+
115-
+ ALLOC2 (size: 48, align: 4) {
113+
+ ALLOC2 (size: 20, align: 4) {
116114
+ 0x00 │ c1 00 00 00 a4 00 00 00 c2 00 00 00 c5 00 00 00 │ ................
117-
+ 0x10 │ 06 00 00 00 f3 00 00 00 da 00 00 00 ab 00 00 00 │ ................
118-
+ 0x20 │ 57 00 00 00 f7 00 00 00 68 00 00 00 2a 00 00 00 │ W.......h...*...
115+
+ 0x10 │ 06 00 00 00 │ ....
119116
+ }
120117
+
121-
+ ALLOC3 (size: 48, align: 4) {
122-
+ 0x00 │ ff 00 00 00 69 00 00 00 0f 00 00 00 27 00 00 00 │ ....i.......'...
123-
+ 0x10 │ 3e 00 00 00 fb 00 00 00 bf 00 00 00 b2 00 00 00 │ >...............
124-
+ 0x20 │ 09 00 00 00 04 00 00 00 38 00 00 00 dd 00 00 00 │ ........8.......
118+
+ ALLOC3 (size: 20, align: 4) {
119+
+ 0x00 │ b2 00 00 00 09 00 00 00 04 00 00 00 38 00 00 00 │ ............8...
120+
+ 0x10 │ dd 00 00 00 │ ....
125121
+ }
126122
+
127-
+ ALLOC4 (size: 128, align: 4) {
123+
+ ALLOC4 (size: 20, align: 4) {
128124
+ 0x00 │ ff 00 00 00 69 00 00 00 0f 00 00 00 27 00 00 00 │ ....i.......'...
129-
+ 0x10 │ 3e 00 00 00 fb 00 00 00 bf 00 00 00 b2 00 00 00 │ >...............
130-
+ 0x20 │ 09 00 00 00 04 00 00 00 38 00 00 00 dd 00 00 00 │ ........8.......
131-
+ 0x30 │ c1 00 00 00 a4 00 00 00 c2 00 00 00 c5 00 00 00 │ ................
132-
+ 0x40 │ 06 00 00 00 f3 00 00 00 da 00 00 00 ab 00 00 00 │ ................
133-
+ 0x50 │ 57 00 00 00 f7 00 00 00 68 00 00 00 9f 00 00 00 │ W.......h.......
134-
+ 0x60 │ 16 00 00 00 9d 00 00 00 69 00 00 00 1f 00 00 00 │ ........i.......
135-
+ 0x70 │ 60 00 00 00 ad 00 00 00 32 00 00 00 01 00 00 00 │ `.......2.......
125+
+ 0x10 │ 3e 00 00 00 │ >...
136126
}
137127

‎tests/mir-opt/const_array_locals.rs

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,20 @@ struct F32x8([f32; 8]);
66

77
// EMIT_MIR const_array_locals.main.GVN.diff
88
// CHECK-LABEL: fn main(
9-
#[rustfmt::skip]
109
pub fn main() {
11-
let _arr = [
12-
255, 105, 15, 39, 62, 251, 191, 178, 9, 4, 56, 221,
13-
193, 164, 194, 197, 6, 243, 218, 171, 87, 247, 104,
14-
159, 22, 157, 105, 31, 96, 173, 50, 1,
15-
];
16-
// duplicate item
17-
let _barr = [
18-
255, 105, 15, 39, 62, 251, 191, 178, 9, 4, 56, 221,
19-
193, 164, 194, 197, 6, 243, 218, 171, 87, 247, 104,
20-
159, 22, 157, 105, 31, 96, 173, 50, 1,
21-
];
22-
let _foo = [
23-
[255, 105, 15, 39, 62, 251, 191, 178, 9, 4, 56, 221],
24-
[193, 164, 194, 197, 6, 243, 218, 171, 87, 247, 104, 42],
25-
];
26-
let _darr = *&[
27-
255, 105, 15, 39, 62, 251, 191, 178, 9, 4, 56, 221,
28-
193, 164, 194, 197, 6, 243, 218, 171, 87, 247, 104,
29-
159, 22, 157, 105, 31, 96, 173, 50, 1,
30-
];
10+
let _arr = [255, 105, 15, 39, 62];
11+
let _duplicated_arr = [255, 105, 15, 39, 62];
12+
let _foo = [[178, 9, 4, 56, 221], [193, 164, 194, 197, 6]];
13+
let _darr = *&[254, 42, 15, 39, 62];
3114

32-
consume([255, 105, 15, 39, 62, 251, 191, 178, 9, 4, 56, 221,
33-
193, 164, 194, 197, 6, 243, 218, 171, 87, 247, 104,
34-
159, 22, 157, 105, 31, 96, 173, 50, 1,]);
15+
consume([31, 96, 173, 50, 1]);
3516

3617
let _f = F32x8([1.0, 2.0, 3.0, 1.0, 1.0, 1.0, 1.0, 42.0]);
3718

3819
// ice
3920
[[1, 0, 0], [0, 1, 0], [0, 0, 1]]; // 2D array
4021
}
4122

42-
fn consume(_arr: [u16; 32]) {
23+
fn consume(_arr: [u32; 5]) {
4324
unimplemented!()
4425
}

0 commit comments

Comments
 (0)