Skip to content

Commit c86edd0

Browse files
ssahasrassahasra
authored
[SPIR-V] strengthen some lit tests (#111636)
These tests were failing spuriously with unrelated changes under development.
1 parent 562999a commit c86edd0

File tree

3 files changed

+47
-29
lines changed

3 files changed

+47
-29
lines changed

‎clang/test/CodeGenHLSL/convergence/do.while.hlsl

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ void test1() {
88
do {
99
} while (cond());
1010
}
11-
// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
11+
// CHECK-LABEL: define spir_func void @_Z5test1v()
12+
// CHECK-SAME: [[A0:#[0-9]+]] {
1213
// CHECK: entry:
1314
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
1415
// CHECK: do.body:
@@ -21,30 +22,32 @@ void test2() {
2122
foo();
2223
} while (cond());
2324
}
24-
// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
25+
// CHECK-LABEL: define spir_func void @_Z5test2v()
26+
// CHECK-SAME: [[A0]] {
2527
// CHECK: entry:
2628
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
2729
// CHECK: do.body:
2830
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
2931
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
3032
// CHECK: do.cond:
31-
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
33+
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
3234

3335
void test3() {
3436
do {
3537
if (cond())
3638
foo();
3739
} while (cond());
3840
}
39-
// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
41+
// CHECK-LABEL: define spir_func void @_Z5test3v()
42+
// CHECK-SAME: [[A0]] {
4043
// CHECK: entry:
4144
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
4245
// CHECK: do.body:
4346
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
4447
// CHECK: if.then:
4548
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
4649
// CHECK: do.cond:
47-
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
50+
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
4851

4952
void test4() {
5053
do {
@@ -54,15 +57,16 @@ void test4() {
5457
}
5558
} while (cond());
5659
}
57-
// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
60+
// CHECK-LABEL: define spir_func void @_Z5test4v()
61+
// CHECK-SAME: [[A0]] {
5862
// CHECK: entry:
5963
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
6064
// CHECK: do.body:
6165
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
6266
// CHECK: if.then:
6367
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
6468
// CHECK: do.cond:
65-
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
69+
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
6670

6771
void test5() {
6872
do {
@@ -74,7 +78,8 @@ void test5() {
7478
}
7579
} while (cond());
7680
}
77-
// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
81+
// CHECK-LABEL: define spir_func void @_Z5test5v()
82+
// CHECK-SAME: [[A0]] {
7883
// CHECK: entry:
7984
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
8085
// CHECK: do.body:
@@ -84,7 +89,7 @@ void test5() {
8489
// CHECK: if.then:
8590
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T2]]) ]
8691
// CHECK: do.cond:
87-
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
92+
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
8893

8994
// CHECK-DAG: attributes [[A0]] = { {{.*}}convergent{{.*}} }
9095
// CHECK-DAG: attributes [[A3]] = { {{.*}}convergent{{.*}} }

‎clang/test/CodeGenHLSL/convergence/for.hlsl

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ void test1() {
1010
foo();
1111
}
1212
}
13-
// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
13+
// CHECK-LABEL: define spir_func void @_Z5test1v()
14+
// CHECK-SAME: [[A0:#[0-9]+]] {
1415
// CHECK: entry:
1516
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
1617
// CHECK: for.cond:
@@ -22,56 +23,60 @@ void test2() {
2223
foo();
2324
}
2425
}
25-
// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
26+
// CHECK-LABEL: define spir_func void @_Z5test2v()
27+
// CHECK-SAME: [[A0]] {
2628
// CHECK: entry:
2729
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
2830
// CHECK: for.cond:
2931
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
3032
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
3133
// CHECK: for.body:
32-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
34+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
3335

3436
void test3() {
3537
for (cond();;) {
3638
foo();
3739
}
3840
}
39-
// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
41+
// CHECK-LABEL: define spir_func void @_Z5test3v()
42+
// CHECK-SAME: [[A0]] {
4043
// CHECK: entry:
4144
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
4245
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T0]]) ]
4346
// CHECK: for.cond:
4447
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
45-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
48+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
4649

4750
void test4() {
4851
for (cond();cond2();) {
4952
foo();
5053
}
5154
}
52-
// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
55+
// CHECK-LABEL: define spir_func void @_Z5test4v()
56+
// CHECK-SAME: [[A0]] {
5357
// CHECK: entry:
5458
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
5559
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T0]]) ]
5660
// CHECK: for.cond:
5761
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
5862
// CHECK: call spir_func noundef i1 @_Z5cond2v() [[A3]] [ "convergencectrl"(token [[T1]]) ]
5963
// CHECK: for.body:
60-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
64+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
6165

6266
void test5() {
6367
for (cond();cond2();foo()) {
6468
}
6569
}
66-
// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
70+
// CHECK-LABEL: define spir_func void @_Z5test5v()
71+
// CHECK-SAME: [[A0]] {
6772
// CHECK: entry:
6873
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
6974
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T0]]) ]
7075
// CHECK: for.cond:
7176
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T0]]) ]
7277
// CHECK: call spir_func noundef i1 @_Z5cond2v() [[A3]] [ "convergencectrl"(token [[T1]]) ]
7378
// CHECK: for.inc:
74-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
79+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
7580

7681
void test6() {
7782
for (cond();cond2();foo()) {
@@ -81,7 +86,8 @@ void test6() {
8186
}
8287
}
8388
}
84-
// CHECK: define spir_func void @_Z5test6v() [[A0:#[0-9]+]] {
89+
// CHECK-LABEL: define spir_func void @_Z5test6v()
90+
// CHECK-SAME: [[A0]] {
8591
// CHECK: entry:
8692
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
8793
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T0]]) ]
@@ -92,12 +98,12 @@ void test6() {
9298
// CHECK: [[C1:%[a-zA-Z0-9]+]] = call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
9399
// CHECK: br i1 [[C1]], label %if.then, label %if.end
94100
// CHECK: if.then:
95-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
101+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
96102
// CHECK: br label %for.end
97103
// CHECK: if.end:
98104
// CHECK: br label %for.inc
99105
// CHECK: for.inc:
100-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
106+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T1]]) ]
101107

102108
void test7() {
103109
for (cond();;) {
@@ -106,7 +112,8 @@ void test7() {
106112
}
107113
}
108114
}
109-
// CHECK: define spir_func void @_Z5test7v() [[A0:#[0-9]+]] {
115+
// CHECK-LABEL: define spir_func void @_Z5test7v()
116+
// CHECK-SAME: [[A0]] {
110117
// CHECK: entry:
111118
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
112119
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T0]]) ]
@@ -115,7 +122,7 @@ void test7() {
115122
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
116123
// CHECK: for.cond3:
117124
// CHECK: [[T2:%[0-9]+]] = call token @llvm.experimental.convergence.loop() [ "convergencectrl"(token [[T1]]) ]
118-
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T2]]) ]
125+
// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token [[T2]]) ]
119126

120127
// CHECK-DAG: attributes [[A0]] = { {{.*}}convergent{{.*}} }
121128
// CHECK-DAG: attributes [[A3]] = { {{.*}}convergent{{.*}} }

‎clang/test/CodeGenHLSL/convergence/while.hlsl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ void test1() {
88
while (cond()) {
99
}
1010
}
11-
// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
11+
// CHECK-LABEL: define spir_func void @_Z5test1v()
12+
// CHECK-SAME: [[A0:#[0-9]+]] {
1213
// CHECK: entry:
1314
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
1415
// CHECK: while.cond:
@@ -20,7 +21,8 @@ void test2() {
2021
foo();
2122
}
2223
}
23-
// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
24+
// CHECK-LABEL: define spir_func void @_Z5test2v()
25+
// CHECK-SAME: [[A0]] {
2426
// CHECK: entry:
2527
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
2628
// CHECK: while.cond:
@@ -36,7 +38,8 @@ void test3() {
3638
foo();
3739
}
3840
}
39-
// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
41+
// CHECK-LABEL: define spir_func void @_Z5test3v()
42+
// CHECK-SAME: [[A0]] {
4043
// CHECK: entry:
4144
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
4245
// CHECK: while.cond:
@@ -56,7 +59,8 @@ void test4() {
5659
}
5760
}
5861
}
59-
// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
62+
// CHECK-LABEL: define spir_func void @_Z5test4v()
63+
// CHECK-SAME: [[A0]] {
6064
// CHECK: entry:
6165
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
6266
// CHECK: while.cond:
@@ -78,7 +82,8 @@ void test5() {
7882
}
7983
}
8084
}
81-
// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
85+
// CHECK-LABEL: define spir_func void @_Z5test5v()
86+
// CHECK-SAME: [[A0]] {
8287
// CHECK: entry:
8388
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
8489
// CHECK: while.cond:
@@ -102,7 +107,8 @@ void test6() {
102107
}
103108
}
104109
}
105-
// CHECK: define spir_func void @_Z5test6v() [[A0:#[0-9]+]] {
110+
// CHECK-LABEL: define spir_func void @_Z5test6v()
111+
// CHECK-SAME: [[A0]] {
106112
// CHECK: entry:
107113
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
108114
// CHECK: while.cond:

0 commit comments

Comments
 (0)