Skip to content

Commit ff302f8

Browse files
nikicnikic
committed
[AArch64] Convert some tests to opaque pointers (NFC)
1 parent 1565317 commit ff302f8

12 files changed

+424
-501
lines changed

‎llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-large.mir

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
define dso_local i32 @gv_large() {
1010
entry:
1111
%retval = alloca i32, align 4
12-
store i32 0, i32* %retval, align 4
13-
%0 = load i32, i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0), align 4
14-
%1 = load i32, i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0), align 4
12+
store i32 0, ptr %retval, align 4
13+
%0 = load i32, ptr @foo1, align 4
14+
%1 = load i32, ptr @foo2, align 4
1515
%add = add nsw i32 %0, %1
1616
ret i32 %add
1717
}
@@ -41,8 +41,8 @@ body: |
4141
; CHECK: [[MOVKXi5:%[0-9]+]]:gpr64 = MOVKXi [[MOVKXi4]], target-flags(aarch64-g3) @foo2, 48
4242
; CHECK: [[COPY1:%[0-9]+]]:gpr64sp = COPY [[MOVKXi5]]
4343
; CHECK: STRWui $wzr, %stack.0.retval, 0 :: (store (s32) into %ir.retval)
44-
; CHECK: [[LDRWui:%[0-9]+]]:gpr32 = LDRWui [[COPY]], 0 :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0)`)
45-
; CHECK: [[LDRWui1:%[0-9]+]]:gpr32 = LDRWui [[COPY1]], 0 :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0)`)
44+
; CHECK: [[LDRWui:%[0-9]+]]:gpr32 = LDRWui [[COPY]], 0 :: (load (s32) from @foo1)
45+
; CHECK: [[LDRWui1:%[0-9]+]]:gpr32 = LDRWui [[COPY1]], 0 :: (load (s32) from @foo2)
4646
; CHECK: [[ADDWrr:%[0-9]+]]:gpr32 = ADDWrr [[LDRWui]], [[LDRWui1]]
4747
; CHECK: $w0 = COPY [[ADDWrr]]
4848
; CHECK: RET_ReallyLR implicit $w0
@@ -53,8 +53,8 @@ body: |
5353
%6:gpr(p0) = COPY %7(p0)
5454
%0:gpr(p0) = G_FRAME_INDEX %stack.0.retval
5555
G_STORE %1(s32), %0(p0) :: (store (s32) into %ir.retval)
56-
%2:gpr(s32) = G_LOAD %3(p0) :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0)`)
57-
%5:gpr(s32) = G_LOAD %6(p0) :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0)`)
56+
%2:gpr(s32) = G_LOAD %3(p0) :: (load (s32) from @foo1)
57+
%5:gpr(s32) = G_LOAD %6(p0) :: (load (s32) from @foo2)
5858
%8:gpr(s32) = G_ADD %2, %5
5959
$w0 = COPY %8(s32)
6060
RET_ReallyLR implicit $w0

‎llvm/test/CodeGen/AArch64/GlobalISel/select-gv-cmodel-tiny.mir

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
define dso_local i32 @gv_tiny() {
1010
entry:
1111
%retval = alloca i32, align 4
12-
store i32 0, i32* %retval, align 4
13-
%0 = load i32, i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0), align 4
14-
%1 = load i32, i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0), align 4
12+
store i32 0, ptr %retval, align 4
13+
%0 = load i32, ptr @foo1, align 4
14+
%1 = load i32, ptr @foo2, align 4
1515
%add = add nsw i32 %0, %1
1616
ret i32 %add
1717
}
@@ -35,8 +35,8 @@ body: |
3535
; CHECK: [[ADR1:%[0-9]+]]:gpr64 = ADR @foo2
3636
; CHECK: [[COPY1:%[0-9]+]]:gpr64sp = COPY [[ADR1]]
3737
; CHECK: STRWui $wzr, %stack.0.retval, 0 :: (store (s32) into %ir.retval)
38-
; CHECK: [[LDRWui:%[0-9]+]]:gpr32 = LDRWui [[COPY]], 0 :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0)`)
39-
; CHECK: [[LDRWui1:%[0-9]+]]:gpr32 = LDRWui [[COPY1]], 0 :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0)`)
38+
; CHECK: [[LDRWui:%[0-9]+]]:gpr32 = LDRWui [[COPY]], 0 :: (load (s32) from @foo1)
39+
; CHECK: [[LDRWui1:%[0-9]+]]:gpr32 = LDRWui [[COPY1]], 0 :: (load (s32) from @foo2)
4040
; CHECK: [[ADDWrr:%[0-9]+]]:gpr32 = ADDWrr [[LDRWui]], [[LDRWui1]]
4141
; CHECK: $w0 = COPY [[ADDWrr]]
4242
; CHECK: RET_ReallyLR implicit $w0
@@ -47,8 +47,8 @@ body: |
4747
%6:gpr(p0) = COPY %7(p0)
4848
%0:gpr(p0) = G_FRAME_INDEX %stack.0.retval
4949
G_STORE %1(s32), %0(p0) :: (store (s32) into %ir.retval)
50-
%2:gpr(s32) = G_LOAD %3(p0) :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo1, i64 0, i64 0)`)
51-
%5:gpr(s32) = G_LOAD %6(p0) :: (load (s32) from `i32* getelementptr inbounds ([1073741824 x i32], [1073741824 x i32]* @foo2, i64 0, i64 0)`)
50+
%2:gpr(s32) = G_LOAD %3(p0) :: (load (s32) from @foo1)
51+
%5:gpr(s32) = G_LOAD %6(p0) :: (load (s32) from @foo2)
5252
%8:gpr(s32) = G_ADD %2, %5
5353
$w0 = COPY %8(s32)
5454
RET_ReallyLR implicit $w0

‎llvm/test/CodeGen/AArch64/aarch64-gep-opt.ll

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ target triple = "aarch64-linux-gnueabi"
1616

1717
; Check that when two complex GEPs are used in two basic blocks, LLVM can
1818
; eliminate the common subexpression for the second use.
19-
define void @test_GEP_CSE([240 x %struct]* %string, i32* %adj, i32 %lib, i64 %idxprom) {
20-
%liberties = getelementptr [240 x %struct], [240 x %struct]* %string, i64 1, i64 %idxprom, i32 3
21-
%1 = load i32, i32* %liberties, align 4
19+
define void @test_GEP_CSE(ptr %string, ptr %adj, i32 %lib, i64 %idxprom) {
20+
%liberties = getelementptr [240 x %struct], ptr %string, i64 1, i64 %idxprom, i32 3
21+
%1 = load i32, ptr %liberties, align 4
2222
%cmp = icmp eq i32 %1, %lib
2323
br i1 %cmp, label %if.then, label %if.end
2424

2525
if.then: ; preds = %entry
26-
%origin = getelementptr [240 x %struct], [240 x %struct]* %string, i64 1, i64 %idxprom, i32 2
27-
%2 = load i32, i32* %origin, align 4
28-
store i32 %2, i32* %adj, align 4
26+
%origin = getelementptr [240 x %struct], ptr %string, i64 1, i64 %idxprom, i32 2
27+
%2 = load i32, ptr %origin, align 4
28+
store i32 %2, ptr %adj, align 4
2929
br label %if.end
3030

3131
if.end: ; preds = %if.then, %entry
@@ -39,7 +39,7 @@ if.end: ; preds = %if.then, %entry
3939
; CHECK:ldr
4040

4141
; CHECK-NoAA-LABEL: @test_GEP_CSE(
42-
; CHECK-NoAA: [[PTR0:%[a-zA-Z0-9]+]] = ptrtoint [240 x %struct]* %string to i64
42+
; CHECK-NoAA: [[PTR0:%[a-zA-Z0-9]+]] = ptrtoint ptr %string to i64
4343
; CHECK-NoAA: [[PTR1:%[a-zA-Z0-9]+]] = mul i64 %idxprom, 96
4444
; CHECK-NoAA: [[PTR2:%[a-zA-Z0-9]+]] = add i64 [[PTR0]], [[PTR1]]
4545
; CHECK-NoAA: add i64 [[PTR2]], 23052
@@ -51,38 +51,35 @@ if.end: ; preds = %if.then, %entry
5151
; CHECK-NoAA: inttoptr
5252

5353
; CHECK-UseAA-LABEL: @test_GEP_CSE(
54-
; CHECK-UseAA: [[PTR0:%[a-zA-Z0-9]+]] = bitcast [240 x %struct]* %string to i8*
5554
; CHECK-UseAA: [[IDX:%[a-zA-Z0-9]+]] = mul i64 %idxprom, 96
56-
; CHECK-UseAA: [[PTR1:%[a-zA-Z0-9]+]] = getelementptr i8, i8* [[PTR0]], i64 [[IDX]]
57-
; CHECK-UseAA: getelementptr i8, i8* [[PTR1]], i64 23052
58-
; CHECK-UseAA: bitcast
55+
; CHECK-UseAA: [[PTR1:%[a-zA-Z0-9]+]] = getelementptr i8, ptr %string, i64 [[IDX]]
56+
; CHECK-UseAA: getelementptr i8, ptr [[PTR1]], i64 23052
5957
; CHECK-UseAA: if.then:
60-
; CHECK-UseAA: getelementptr i8, i8* [[PTR1]], i64 23048
61-
; CHECK-UseAA: bitcast
58+
; CHECK-UseAA: getelementptr i8, ptr [[PTR1]], i64 23048
6259

6360
%class.my = type { i32, [128 x i32], i32, [256 x %struct.pt]}
64-
%struct.pt = type { %struct.point*, i32, i32 }
61+
%struct.pt = type { ptr, i32, i32 }
6562
%struct.point = type { i32, i32 }
6663

6764
; Check when a GEP is used across two basic block, LLVM can sink the address
6865
; calculation and code gen can generate a better addressing mode for the second
6966
; use.
70-
define void @test_GEP_across_BB(%class.my* %this, i64 %idx) {
71-
%1 = getelementptr %class.my, %class.my* %this, i64 0, i32 3, i64 %idx, i32 1
72-
%2 = load i32, i32* %1, align 4
73-
%3 = getelementptr %class.my, %class.my* %this, i64 0, i32 3, i64 %idx, i32 2
74-
%4 = load i32, i32* %3, align 4
67+
define void @test_GEP_across_BB(ptr %this, i64 %idx) {
68+
%1 = getelementptr %class.my, ptr %this, i64 0, i32 3, i64 %idx, i32 1
69+
%2 = load i32, ptr %1, align 4
70+
%3 = getelementptr %class.my, ptr %this, i64 0, i32 3, i64 %idx, i32 2
71+
%4 = load i32, ptr %3, align 4
7572
%5 = icmp eq i32 %2, %4
7673
br i1 %5, label %if.true, label %exit
7774

7875
if.true:
7976
%6 = shl i32 %4, 1
80-
store i32 %6, i32* %3, align 4
77+
store i32 %6, ptr %3, align 4
8178
br label %exit
8279

8380
exit:
8481
%7 = add nsw i32 %4, 1
85-
store i32 %7, i32* %1, align 4
82+
store i32 %7, ptr %1, align 4
8683
ret void
8784
}
8885
; CHECK-LABEL: test_GEP_across_BB:
@@ -97,21 +94,19 @@ exit:
9794
; CHECK-NoAA: add i64 [[TMP]], 532
9895
; CHECK-NoAA: if.true:
9996
; CHECK-NoAA: inttoptr
100-
; CHECK-NoAA: bitcast
10197
; CHECK-NoAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, {{.*}}, i64 532
10298
; CHECK-NoAA: exit:
10399
; CHECK-NoAA: inttoptr
104-
; CHECK-NoAA: bitcast
105100
; CHECK-NoAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, {{.*}}, i64 528
106101

107102
; CHECK-UseAA-LABEL: test_GEP_across_BB(
108103
; CHECK-UseAA: [[PTR0:%[a-zA-Z0-9]+]] = getelementptr
109-
; CHECK-UseAA: getelementptr i8, i8* [[PTR0]], i64 528
110-
; CHECK-UseAA: getelementptr i8, i8* [[PTR0]], i64 532
104+
; CHECK-UseAA: getelementptr i8, ptr [[PTR0]], i64 528
105+
; CHECK-UseAA: getelementptr i8, ptr [[PTR0]], i64 532
111106
; CHECK-UseAA: if.true:
112-
; CHECK-UseAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, i8* [[PTR0]], i64 532
107+
; CHECK-UseAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, ptr [[PTR0]], i64 532
113108
; CHECK-UseAA: exit:
114-
; CHECK-UseAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, i8* [[PTR0]], i64 528
109+
; CHECK-UseAA: {{%sunk[a-zA-Z0-9]+}} = getelementptr i8, ptr [[PTR0]], i64 528
115110

116111
%struct.S = type { float, double }
117112
@struct_array = global [1024 x %struct.S] zeroinitializer, align 16
@@ -121,49 +116,49 @@ exit:
121116
; The constant offsets are from indices "i64 %idxprom" and "i32 1". As the
122117
; alloca size of %struct.S is 16, and "i32 1" is the 2rd element whose field
123118
; offset is 8, the total constant offset is (5 * 16 + 8) = 88.
124-
define double* @test-struct_1(i32 %i) {
119+
define ptr @test-struct_1(i32 %i) {
125120
entry:
126121
%add = add nsw i32 %i, 5
127122
%idxprom = sext i32 %add to i64
128-
%p = getelementptr [1024 x %struct.S], [1024 x %struct.S]* @struct_array, i64 0, i64 %idxprom, i32 1
129-
ret double* %p
123+
%p = getelementptr [1024 x %struct.S], ptr @struct_array, i64 0, i64 %idxprom, i32 1
124+
ret ptr %p
130125
}
131126
; CHECK-NoAA-LABEL: @test-struct_1(
132127
; CHECK-NoAA-NOT: getelementptr
133128
; CHECK-NoAA: add i64 %{{[a-zA-Z0-9]+}}, 88
134129

135130
; CHECK-UseAA-LABEL: @test-struct_1(
136-
; CHECK-UseAA: getelementptr i8, i8* %{{[a-zA-Z0-9]+}}, i64 88
131+
; CHECK-UseAA: getelementptr i8, ptr %{{[a-zA-Z0-9]+}}, i64 88
137132

138133
%struct3 = type { i64, i32 }
139134
%struct2 = type { %struct3, i32 }
140135
%struct1 = type { i64, %struct2 }
141-
%struct0 = type { i32, i32, i64*, [100 x %struct1] }
136+
%struct0 = type { i32, i32, ptr, [100 x %struct1] }
142137

143138
; The constant offsets are from indices "i32 3", "i64 %arrayidx" and "i32 1".
144139
; "i32 3" is the 4th element whose field offset is 16. The alloca size of
145140
; %struct1 is 32. "i32 1" is the 2rd element whose field offset is 8. So the
146141
; total constant offset is 16 + (-2 * 32) + 8 = -40
147-
define %struct2* @test-struct_2(%struct0* %ptr, i64 %idx) {
142+
define ptr @test-struct_2(ptr %ptr, i64 %idx) {
148143
entry:
149144
%arrayidx = add nsw i64 %idx, -2
150-
%ptr2 = getelementptr %struct0, %struct0* %ptr, i64 0, i32 3, i64 %arrayidx, i32 1
151-
ret %struct2* %ptr2
145+
%ptr2 = getelementptr %struct0, ptr %ptr, i64 0, i32 3, i64 %arrayidx, i32 1
146+
ret ptr %ptr2
152147
}
153148
; CHECK-NoAA-LABEL: @test-struct_2(
154149
; CHECK-NoAA-NOT: = getelementptr
155150
; CHECK-NoAA: add i64 %{{[a-zA-Z0-9]+}}, -40
156151

157152
; CHECK-UseAA-LABEL: @test-struct_2(
158-
; CHECK-UseAA: getelementptr i8, i8* %{{[a-zA-Z0-9]+}}, i64 -40
153+
; CHECK-UseAA: getelementptr i8, ptr %{{[a-zA-Z0-9]+}}, i64 -40
159154

160155
; Test that when a index is added from two constant, SeparateConstOffsetFromGEP
161156
; pass does not generate incorrect result.
162-
define void @test_const_add([3 x i32]* %in) {
157+
define void @test_const_add(ptr %in) {
163158
%inc = add nsw i32 2, 1
164159
%idxprom = sext i32 %inc to i64
165-
%arrayidx = getelementptr [3 x i32], [3 x i32]* %in, i64 %idxprom, i64 2
166-
store i32 0, i32* %arrayidx, align 4
160+
%arrayidx = getelementptr [3 x i32], ptr %in, i64 %idxprom, i64 2
161+
store i32 0, ptr %arrayidx, align 4
167162
ret void
168163
}
169164
; CHECK-LABEL: test_const_add:

0 commit comments

Comments
 (0)