https://github.com/ssahasra created
https://github.com/llvm/llvm-project/pull/111636
These tests were failing spuriously with unrelated changes under development.
>From 107a8819e02c9a5eaf7db5a520543666ea3c3a91 Mon Sep 17 00:00:00 2001
From: Sameer Sahasrabuddhe <sameer.sahasrabud...@amd.com>
Date: Wed, 9 Oct 2024 11:30:37 +0530
Subject: [PATCH] [SPIR-V] strengthen some lit tests
These tests were failing spuriously with unrelated changes under development.
---
.../CodeGenHLSL/convergence/do.while.hlsl | 23 +++++++-----
clang/test/CodeGenHLSL/convergence/for.hlsl | 35 +++++++++++--------
clang/test/CodeGenHLSL/convergence/while.hlsl | 18 ++++++----
3 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/clang/test/CodeGenHLSL/convergence/do.while.hlsl
b/clang/test/CodeGenHLSL/convergence/do.while.hlsl
index ea5a45ba8fd780..934fe3ea9eb7a0 100644
--- a/clang/test/CodeGenHLSL/convergence/do.while.hlsl
+++ b/clang/test/CodeGenHLSL/convergence/do.while.hlsl
@@ -8,7 +8,8 @@ void test1() {
do {
} while (cond());
}
-// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test1v()
+// CHECK-SAME: [[A0:#[0-9]+]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: do.body:
@@ -21,14 +22,15 @@ void test2() {
foo();
} while (cond());
}
-// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test2v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: do.body:
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T0]]) ]
// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: do.cond:
-// CHECK: call spir_func noundef i1 @_Z4condv()
[[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test3() {
do {
@@ -36,7 +38,8 @@ void test3() {
foo();
} while (cond());
}
-// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test3v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: do.body:
@@ -44,7 +47,7 @@ void test3() {
// CHECK: if.then:
// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: do.cond:
-// CHECK: call spir_func noundef i1 @_Z4condv()
[[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test4() {
do {
@@ -54,7 +57,8 @@ void test4() {
}
} while (cond());
}
-// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test4v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: do.body:
@@ -62,7 +66,7 @@ void test4() {
// CHECK: if.then:
// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: do.cond:
-// CHECK: call spir_func noundef i1 @_Z4condv()
[[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test5() {
do {
@@ -74,7 +78,8 @@ void test5() {
}
} while (cond());
}
-// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test5v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: do.body:
@@ -84,7 +89,7 @@ void test5() {
// CHECK: if.then:
// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T2]]) ]
// CHECK: do.cond:
-// CHECK: call spir_func noundef i1 @_Z4condv()
[[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK-DAG: attributes [[A0]] = { {{.*}}convergent{{.*}} }
// CHECK-DAG: attributes [[A3]] = { {{.*}}convergent{{.*}} }
diff --git a/clang/test/CodeGenHLSL/convergence/for.hlsl
b/clang/test/CodeGenHLSL/convergence/for.hlsl
index 95f9a196bdb676..363c6a48839b56 100644
--- a/clang/test/CodeGenHLSL/convergence/for.hlsl
+++ b/clang/test/CodeGenHLSL/convergence/for.hlsl
@@ -10,7 +10,8 @@ void test1() {
foo();
}
}
-// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test1v()
+// CHECK-SAME: [[A0:#[0-9]+]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: for.cond:
@@ -22,34 +23,37 @@ void test2() {
foo();
}
}
-// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test2v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: for.cond:
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T0]]) ]
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: for.body:
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test3() {
for (cond();;) {
foo();
}
}
-// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test3v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T0]]) ]
// CHECK: for.cond:
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T0]]) ]
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test4() {
for (cond();cond2();) {
foo();
}
}
-// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test4v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T0]]) ]
@@ -57,13 +61,14 @@ void test4() {
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T0]]) ]
// CHECK: call spir_func noundef i1 @_Z5cond2v() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: for.body:
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test5() {
for (cond();cond2();foo()) {
}
}
-// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test5v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T0]]) ]
@@ -71,7 +76,7 @@ void test5() {
// CHECK: [[T1:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T0]]) ]
// CHECK: call spir_func noundef i1 @_Z5cond2v() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: for.inc:
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test6() {
for (cond();cond2();foo()) {
@@ -81,7 +86,8 @@ void test6() {
}
}
}
-// CHECK: define spir_func void @_Z5test6v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test6v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T0]]) ]
@@ -92,12 +98,12 @@ void test6() {
// CHECK: [[C1:%[a-zA-Z0-9]+]] = call spir_func noundef i1 @_Z4condv()
[[A3]] [ "convergencectrl"(token [[T1]]) ]
// CHECK: br i1 [[C1]], label %if.then, label %if.end
// CHECK: if.then:
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [ "convergencectrl"(token
[[T1]]) ]
// CHECK: br label %for.end
// CHECK: if.end:
// CHECK: br label %for.inc
// CHECK: for.inc:
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T1]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T1]]) ]
void test7() {
for (cond();;) {
@@ -106,7 +112,8 @@ void test7() {
}
}
}
-// CHECK: define spir_func void @_Z5test7v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test7v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T0]]) ]
@@ -115,7 +122,7 @@ void test7() {
// CHECK: call spir_func noundef i1 @_Z4condv() [[A3]] [
"convergencectrl"(token [[T1]]) ]
// CHECK: for.cond3:
// CHECK: [[T2:%[0-9]+]] = call token @llvm.experimental.convergence.loop()
[ "convergencectrl"(token [[T1]]) ]
-// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [
"convergencectrl"(token [[T2]]) ]
+// CHECK: call spir_func void @_Z3foov() [[A3]] [
"convergencectrl"(token [[T2]]) ]
// CHECK-DAG: attributes [[A0]] = { {{.*}}convergent{{.*}} }
// CHECK-DAG: attributes [[A3]] = { {{.*}}convergent{{.*}} }
diff --git a/clang/test/CodeGenHLSL/convergence/while.hlsl
b/clang/test/CodeGenHLSL/convergence/while.hlsl
index 92777000190d22..570b4b1336717b 100644
--- a/clang/test/CodeGenHLSL/convergence/while.hlsl
+++ b/clang/test/CodeGenHLSL/convergence/while.hlsl
@@ -8,7 +8,8 @@ void test1() {
while (cond()) {
}
}
-// CHECK: define spir_func void @_Z5test1v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test1v()
+// CHECK-SAME: [[A0:#[0-9]+]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
@@ -20,7 +21,8 @@ void test2() {
foo();
}
}
-// CHECK: define spir_func void @_Z5test2v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test2v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
@@ -36,7 +38,8 @@ void test3() {
foo();
}
}
-// CHECK: define spir_func void @_Z5test3v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test3v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
@@ -56,7 +59,8 @@ void test4() {
}
}
}
-// CHECK: define spir_func void @_Z5test4v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test4v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
@@ -78,7 +82,8 @@ void test5() {
}
}
}
-// CHECK: define spir_func void @_Z5test5v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test5v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
@@ -102,7 +107,8 @@ void test6() {
}
}
}
-// CHECK: define spir_func void @_Z5test6v() [[A0:#[0-9]+]] {
+// CHECK-LABEL: define spir_func void @_Z5test6v()
+// CHECK-SAME: [[A0]] {
// CHECK: entry:
// CHECK: [[T0:%[0-9]+]] = call token @llvm.experimental.convergence.entry()
// CHECK: while.cond:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
