Skip to content

Commit 998b11d

Browse files
VoxSciurorumVoxSciurorum
committed
Update tests for new intrinsic signature
1 parent 900fd66 commit 998b11d

File tree

8 files changed

+34
-33
lines changed

8 files changed

+34
-33
lines changed

‎clang/test/Cilk/hyper-array-extern-1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int read_array_hyper(unsigned i)
1010
{
1111
return x[i];
1212
// CHECK: %[[ARRAYIDX:.+]] = getelementptr inbounds
13-
// CHECK: %[[VIEWRAW:.+]] = call ptr @llvm.hyper.lookup.i64(ptr %[[ARRAYIDX]], i64 4, ptr null, ptr null)
13+
// CHECK: %[[VIEWRAW:.+]] = call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[ARRAYIDX]], i64 4, ptr null, ptr null)
1414
// CHECK-NOT: call ptr @llvm.hyper.lookup
1515
// CHECK: %[[VAL:.+]] = load i32, ptr %[[VIEWRAW]]
1616
// CHECK: ret i32 %[[VAL]]

‎clang/test/Cilk/hyper-assign.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ extern long _Hyperobject x, _Hyperobject y;
66

77
long chain_assign()
88
{
9-
// CHECK: %[[Y1RAW:.+]] = call ptr @llvm.hyper.lookup.i64(ptr @y, i64 8, ptr null, ptr null)
9+
// CHECK: %[[Y1RAW:.+]] = call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @y, i64 8, ptr null, ptr null)
1010
// CHECK: %[[Y1VAL:.+]] = load i64, ptr %[[Y1RAW]]
11-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 8, ptr null, ptr null)
11+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 8, ptr null, ptr null)
1212
// CHECK: store i64 %[[Y1VAL]]
13-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @y, i64 8, ptr null, ptr null)
14-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 8, ptr null, ptr null)
13+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @y, i64 8, ptr null, ptr null)
14+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 8, ptr null, ptr null)
1515
return x = y = x = y;
1616
}
1717

1818
long simple_assign(long val)
1919
{
20-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 8, ptr null, ptr null)
20+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 8, ptr null, ptr null)
2121
// CHECK-NOT: call ptr @llvm.hyper.lookup
2222
// CHECK: store i64
2323
return x = val;
@@ -26,11 +26,11 @@ long simple_assign(long val)
2626
long subtract()
2727
{
2828
// The order is not fixed here.
29-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @y, i64 8, ptr null, ptr null)
29+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @y, i64 8, ptr null, ptr null)
3030
// CHECK: load i64
3131
// CHECK: add nsw i64 %[[Y:.+]], 1
3232
// CHECK: store i64
33-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 8, ptr null, ptr null)
33+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 8, ptr null, ptr null)
3434
// CHECK: load i64
3535
// CHECK: sub nsw
3636
// CHECK: store i64

‎clang/test/Cilk/hyper-complex.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern __complex__ float _Hyperobject c;
77
// CHECK-LABEL: get_real
88
float get_real()
99
{
10-
// CHECK: %[[RAW1:.+]] = call ptr @llvm.hyper.lookup.i64(ptr @c, i64 8, ptr null, ptr null)
10+
// CHECK: %[[RAW1:.+]] = call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @c, i64 8, ptr null, ptr null)
1111
// CHECK: %[[FIELD1:.+]] = getelementptr inbounds { float, float }, ptr %[[RAW1]], i32 0, i32 0
1212
// CHECK: %[[RET1:.+]] = load float, ptr %[[FIELD1]]
1313
// CHECK: ret float %[[RET1]]
@@ -16,7 +16,7 @@ float get_real()
1616
// CHECK-LABEL: get_imag
1717
float get_imag()
1818
{
19-
// CHECK: %[[RAW2:.+]] = call ptr @llvm.hyper.lookup.i64(ptr @c, i64 8, ptr null, ptr null)
19+
// CHECK: %[[RAW2:.+]] = call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @c, i64 8, ptr null, ptr null)
2020
// CHECK: %[[FIELD2:.+]] = getelementptr inbounds { float, float }, ptr %[[RAW2]], i32 0, i32 1
2121
// CHECK: load float, ptr %[[FIELD2]]
2222
// CHECK: ret float
@@ -27,7 +27,7 @@ float get_imag()
2727
float get_abs()
2828
{
2929
// Only one call to llvm.hyper.lookup.
30-
// CHECK: @llvm.hyper.lookup.i64(ptr @c, i64 8, ptr null, ptr null)
30+
// CHECK: @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @c, i64 8, ptr null, ptr null)
3131
// CHECK-NOT: @llvm.hyper.lookup
3232
// CHECK: call float @cabsf
3333
// CHECK: ret float

‎clang/test/Cilk/hyper-copy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ extern struct S b __attribute__((aligned(8)));
99
// CHECK-LABEL: scopy
1010
void scopy()
1111
{
12-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @a, i64 8, ptr null, ptr null)
12+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @a, i64 8, ptr null, ptr null)
1313
// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 @b,
14-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @a, i64 8, ptr null, ptr null)
14+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @a, i64 8, ptr null, ptr null)
1515
// CHECK: call void @llvm.memcpy.p0.p0.i64
1616
// CHECK: ret void
1717
b = a;

‎clang/test/Cilk/hyper-template.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ template<typename T> struct S { T member; };
55
S<long> _Hyperobject S_long;
66

77
// CHECK-LABEL: @_Z1fv
8-
// CHECK: %0 = call ptr @llvm.hyper.lookup.i64(ptr @S_long, i64 8, ptr null, ptr null)
8+
// CHECK: %0 = call ptr @llvm.tapir.frame()
9+
// CHECK: %1 = call ptr @llvm.hyper.lookup.i64(ptr %0, ptr @S_long, i64 8, ptr null, ptr null)
910
// CHECK-NOT: call ptr @llvm.hyper.lookup
1011
// CHECK: getelementptr
1112
// CHECK: %[[RET:.+]] = load i64

‎clang/test/Cilk/hyper-unary.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ void function1()
1111
{
1212
// CHECK: store i32 1, ptr %[[Y:.+]],
1313
int _Hyperobject y = 1;
14-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 4, ptr null, ptr null)
14+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 4, ptr null, ptr null)
1515
// CHECK: load i32
16-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %[[Y]], i64 4, ptr null, ptr null)
16+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[Y]], i64 4, ptr null, ptr null)
1717
// CHECK: load i32
1818
(void)x; (void)y;
1919
}
@@ -23,9 +23,9 @@ void function2()
2323
{
2424
// CHECK: store i32 1, ptr %[[Y:.+]],
2525
int _Hyperobject y = 1;
26-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 4, ptr null, ptr null)
26+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 4, ptr null, ptr null)
2727
// CHECK: load i32
28-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %[[Y]], i64 4, ptr null, ptr null)
28+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[Y]], i64 4, ptr null, ptr null)
2929
// CHECK: load i32
3030
(void)!x; (void)!y;
3131
}
@@ -35,18 +35,18 @@ void function3()
3535
{
3636
// CHECK: store i32 1, ptr %[[Y:.+]],
3737
int _Hyperobject y = 1;
38-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 4, ptr null, ptr null)
38+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 4, ptr null, ptr null)
3939
// CHECK: load i32
40-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %[[Y]], i64 4, ptr null, ptr null)
40+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[Y]], i64 4, ptr null, ptr null)
4141
// CHECK: load i32
4242
(void)-x; (void)-y;
43-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr @x, i64 4, ptr null, ptr null)
43+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr @x, i64 4, ptr null, ptr null)
4444
// CHECK: load i32
45-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %[[Y]], i64 4, ptr null, ptr null)
45+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[Y]], i64 4, ptr null, ptr null)
4646
// CHECK: load i32
4747
(void)~x; (void)~y;
4848
// CHECK: %[[XP:.+]] = load ptr, ptr @xp
49-
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %[[XP]], i64 4, ptr null, ptr null)
49+
// CHECK: call ptr @llvm.hyper.lookup.i64(ptr %{{[0-9]+}}, ptr %[[XP]], i64 4, ptr null, ptr null)
5050
// CHECK: load i32
5151
(void)*xp;
5252
}

‎llvm/test/Transforms/Tapir/157.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pfor.cond: ; preds = %pfor.inc, %pfor.ph
3535
pfor.body: ; preds = %pfor.cond
3636
%2 = load i64, i64* %add.ptr, align 8, !tbaa !4
3737
%3 = bitcast i64* %sum to i8*
38-
%4 = call i8* @llvm.hyper.lookup(i8* nonnull %3, i64 8, i8* bitcast (void (i8*)* @zero to i8*), i8* bitcast (void (i8*, i8*)* @plus to i8*))
38+
%4 = call i8* @llvm.hyper.lookup(ptr null, i8* nonnull %3, i64 8, i8* bitcast (void (i8*)* @zero to i8*), i8* bitcast (void (i8*, i8*)* @plus to i8*))
3939
%5 = bitcast i8* %4 to i64*
4040
%6 = load i64, i64* %5, align 8, !tbaa !4
4141
%add = add nsw i64 %6, %2
@@ -52,7 +52,7 @@ pfor.cond.cleanup: ; preds = %pfor.inc
5252

5353
pfor.end: ; preds = %entry, %pfor.cond.cleanup
5454
%7 = bitcast i64* %sum to i8*
55-
%8 = call i8* @llvm.hyper.lookup(i8* nonnull %7, i64 8, i8* bitcast (void (i8*)* @zero to i8*), i8* bitcast (void (i8*, i8*)* @plus to i8*))
55+
%8 = call i8* @llvm.hyper.lookup(ptr null, i8* nonnull %7, i64 8, i8* bitcast (void (i8*)* @zero to i8*), i8* bitcast (void (i8*, i8*)* @plus to i8*))
5656
%9 = bitcast i8* %8 to i64*
5757
%10 = load i64, i64* %9, align 8, !tbaa !4
5858
%11 = bitcast i64* %sum to i8*
@@ -92,7 +92,7 @@ declare void @llvm.reducer.register.i64(i8*, i64, i8*, i8*) #2
9292
declare token @llvm.syncregion.start() #3
9393

9494
; Function Attrs: hyper_view inaccessiblememonly injective mustprogress nofree nounwind readonly strand_pure willreturn
95-
declare i8* @llvm.hyper.lookup(i8*, i64, i8*, i8*) #4
95+
declare i8* @llvm.hyper.lookup(i8 *, i8*, i64, i8*, i8*) #4
9696

9797
; Function Attrs: argmemonly mustprogress nofree nosync nounwind willreturn
9898
declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1

‎llvm/test/Transforms/Tapir/loop-stripmine-epilog-taskframe.ll

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ det.achd: ; preds = %pfor.body
212212
%sum_racy.0.load = load i64, i64* %sum_racy, align 8
213213
%add5 = add nsw i64 %sum_racy.0.load, %4
214214
store i64 %add5, i64* %sum_racy, align 8, !tbaa !7
215-
%5 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
215+
%5 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
216216
%6 = bitcast i8* %5 to i64*
217217
%7 = load i64, i64* %6, align 8, !tbaa !7
218218
%add7 = add nsw i64 %7, %4
219219
store i64 %add7, i64* %6, align 8, !tbaa !7
220220
%8 = load i64, i64* %add.ptr.i, align 8, !tbaa !7
221-
%9 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
221+
%9 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
222222
%10 = bitcast i8* %9 to i64*
223223
%11 = load i64, i64* %10, align 8, !tbaa !7
224224
%sub9 = sub nsw i64 %11, %8
@@ -231,13 +231,13 @@ det.cont: ; preds = %det.achd, %pfor.bod
231231
%sum_racy.0.load91 = load i64, i64* %sum_racy, align 8
232232
%add11 = add nsw i64 %sum_racy.0.load91, %12
233233
store i64 %add11, i64* %sum_racy, align 8, !tbaa !7
234-
%13 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
234+
%13 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
235235
%14 = bitcast i8* %13 to i64*
236236
%15 = load i64, i64* %14, align 8, !tbaa !7
237237
%add13 = add nsw i64 %15, %12
238238
store i64 %add13, i64* %14, align 8, !tbaa !7
239239
%16 = load i64, i64* %add.ptr.i79, align 8, !tbaa !7
240-
%17 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
240+
%17 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
241241
%18 = bitcast i8* %17 to i64*
242242
%19 = load i64, i64* %18, align 8, !tbaa !7
243243
%sub15 = sub nsw i64 %19, %16
@@ -289,10 +289,10 @@ sync.continue21: ; preds = %pfor.cond.cleanup
289289
to label %cleanup unwind label %lpad17.loopexit.split-lp
290290

291291
cleanup: ; preds = %sync.continue21, %entry
292-
%21 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
292+
%21 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %0, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
293293
%22 = bitcast i8* %21 to i64*
294294
%23 = load i64, i64* %22, align 8, !tbaa !7
295-
%24 = call i8* @llvm.hyper.lookup.i64(i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
295+
%24 = call i8* @llvm.hyper.lookup.i64(ptr null, i8* nonnull %1, i64 8, i8* bitcast (void (i8*)* @_ZN4cilkL4zeroIlEEvPv to i8*), i8* bitcast (void (i8*, i8*)* @_ZN4cilkL4plusIlEEvPvS1_ to i8*))
296296
%25 = bitcast i8* %24 to i64*
297297
%26 = load i64, i64* %25, align 8, !tbaa !7
298298
%sum_racy.0.load92 = load i64, i64* %sum_racy, align 8
@@ -467,7 +467,7 @@ declare void @llvm.reducer.register.i64(i8*, i64, i8*, i8*) #11
467467
declare token @llvm.syncregion.start() #12
468468

469469
; Function Attrs: hyper_view inaccessiblememonly injective mustprogress nofree nounwind readonly strand_pure willreturn
470-
declare i8* @llvm.hyper.lookup.i64(i8*, i64, i8*, i8*) #13
470+
declare i8* @llvm.hyper.lookup.i64(i8*, i8*, i64, i8*, i8*) #13
471471

472472
; Function Attrs: argmemonly mustprogress willreturn
473473
declare void @llvm.sync.unwind(token) #14

0 commit comments

Comments
 (0)