llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Shilei Tian (shiltian)

<details>
<summary>Changes</summary>

Reverts llvm/llvm-project#<!-- -->183926 because of some BB failures.

---
Full diff: https://github.com/llvm/llvm-project/pull/184035.diff


1 Files Affected:

- (modified) clang/test/CodeGenOpenCL/cl-uniform-wg-size.cl (+14-31) 


``````````diff
diff --git a/clang/test/CodeGenOpenCL/cl-uniform-wg-size.cl 
b/clang/test/CodeGenOpenCL/cl-uniform-wg-size.cl
index 004a8109fd452..98587c694619f 100644
--- a/clang/test/CodeGenOpenCL/cl-uniform-wg-size.cl
+++ b/clang/test/CodeGenOpenCL/cl-uniform-wg-size.cl
@@ -1,36 +1,19 @@
-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-attributes --check-globals all --version 6
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL1.2 -o - %s | FileCheck %s 
-check-prefixes CHECK,CHECK-UNIFORM-12
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -o - %s | FileCheck %s 
-check-prefixes CHECK,CHECK-NONUNIFORM-20
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -cl-uniform-work-group-size -o 
- %s | FileCheck %s -check-prefixes CHECK,CHECK-UNIFORM-20
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -foffload-uniform-block -o - 
%s | FileCheck %s -check-prefixes CHECK,CHECK-UNIFORM-20
+// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL1.2 -o - %s 2>&1 | FileCheck %s 
-check-prefixes CHECK,CHECK-UNIFORM
+// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -o - %s 2>&1 | FileCheck %s 
-check-prefixes CHECK,CHECK-NONUNIFORM
+// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -cl-uniform-work-group-size -o 
- %s 2>&1 | FileCheck %s -check-prefixes CHECK,CHECK-UNIFORM
+// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -foffload-uniform-block -o - 
%s 2>&1 | FileCheck %s -check-prefixes CHECK,CHECK-UNIFORM
 
-// CHECK: Function Attrs: convergent noinline norecurse nounwind optnone
-// CHECK-LABEL: define dso_local spir_kernel void @ker(
-// CHECK-SAME: ) #[[ATTR0:[0-9]+]] !kernel_arg_addr_space [[META3:![0-9]+]] 
!kernel_arg_access_qual [[META3]] !kernel_arg_type [[META3]] 
!kernel_arg_base_type [[META3]] !kernel_arg_type_qual [[META3]] {
-// CHECK-NEXT:  [[ENTRY:.*:]]
-// CHECK-NEXT:    call void @__clang_ocl_kern_imp_ker() #[[ATTR2:[0-9]+]]
-// CHECK-NEXT:    ret void
-//
 kernel void ker() {};
+// CHECK: define{{.*}}@ker() #[[ATTR0:[0-9]+]]
+
+// CHECK: define{{.*}}@__clang_ocl_kern_imp_ker() #[[ATTR1:[0-9]+]]
 
-// CHECK: Function Attrs: convergent noinline norecurse nounwind optnone
-// CHECK-LABEL: define dso_local void @foo(
-// CHECK-SAME: ) #[[ATTR1:[0-9]+]] {
-// CHECK-NEXT:  [[ENTRY:.*:]]
-// CHECK-NEXT:    ret void
-//
 void foo() {};
+// CHECK: define{{.*}}@foo() #[[ATTR1:[0-9]+]]
+
+// CHECK: attributes #[[ATTR0]]
+// CHECK-UNIFORM: "uniform-work-group-size"="true"
+// CHECK-NONUNIFORM: "uniform-work-group-size"="false"
 
-//.
-// CHECK-UNIFORM-12: attributes #[[ATTR0]] = { convergent noinline norecurse 
nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" 
"uniform-work-group-size"="true" }
-// CHECK-UNIFORM-12: attributes #[[ATTR1]] = { convergent noinline norecurse 
nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" 
}
-// CHECK-UNIFORM-12: attributes #[[ATTR2]] = { convergent nounwind }
-//.
-// CHECK-NONUNIFORM-20: attributes #[[ATTR0]] = { convergent noinline 
norecurse nounwind optnone "min-legal-vector-width"="0" 
"no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-features"="+cx8,+mmx,+sse,+sse2,+x87" "uniform-work-group-size"="false" 
}
-// CHECK-NONUNIFORM-20: attributes #[[ATTR1]] = { convergent noinline 
norecurse nounwind optnone "min-legal-vector-width"="0" 
"no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-features"="+cx8,+mmx,+sse,+sse2,+x87" }
-// CHECK-NONUNIFORM-20: attributes #[[ATTR2]] = { convergent nounwind }
-//.
-// CHECK-UNIFORM-20: attributes #[[ATTR0]] = { convergent noinline norecurse 
nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" 
"uniform-work-group-size"="true" }
-// CHECK-UNIFORM-20: attributes #[[ATTR1]] = { convergent noinline norecurse 
nounwind optnone "min-legal-vector-width"="0" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" 
}
-// CHECK-UNIFORM-20: attributes #[[ATTR2]] = { convergent nounwind }
-//.
+// CHECK: attributes #[[ATTR1]]
+// CHECK-NOT: uniform-work-group-size

``````````

</details>


https://github.com/llvm/llvm-project/pull/184035
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to