Skip to content

Commit a955192

Browse files
WeaverGroverkss
authored andcommitted
Revert "clang/AMDGPU: Restore O3 checks in default-attributes.hip (llvm#115238)"
This reverts commit 889d677. Caused the following build bot failures, author has failed to address: https://lab.llvm.org/buildbot/#/builders/144/builds/11132 https://lab.llvm.org/buildbot/#/builders/46/builds/7541 https://lab.llvm.org/buildbot/#/builders/190/builds/9077 Please fix before recommitting.
1 parent c181325 commit a955192

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

clang/test/CodeGenHIP/default-attributes.hip

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -x hip -fno-ident -fcuda-is-device \
33
// RUN: -emit-llvm -o - %s | FileCheck -check-prefix=OPTNONE %s
44

5-
// RUN: %clang_cc1 -O3 -triple amdgcn-amd-amdhsa -x hip -fno-ident -fcuda-is-device \
6-
// RUN: -emit-llvm -o - %s | FileCheck -check-prefix=OPT %s
7-
85
#define __device__ __attribute__((device))
96
#define __global__ __attribute__((global))
107

@@ -13,10 +10,6 @@
1310
// OPTNONE: @llvm.compiler.used = appending addrspace(1) global [1 x ptr] [ptr addrspacecast (ptr addrspace(1) @__hip_cuid_ to ptr)], section "llvm.metadata"
1411
// OPTNONE: @__oclc_ABI_version = weak_odr hidden local_unnamed_addr addrspace(4) constant i32 500
1512
//.
16-
// OPT: @__hip_cuid_ = addrspace(1) global i8 0
17-
// OPT: @__oclc_ABI_version = weak_odr hidden local_unnamed_addr addrspace(4) constant i32 500
18-
// OPT: @llvm.compiler.used = appending addrspace(1) global [1 x ptr] [ptr addrspacecast (ptr addrspace(1) @__hip_cuid_ to ptr)], section "llvm.metadata"
19-
//.
2013
__device__ void extern_func();
2114

2215
// OPTNONE: Function Attrs: convergent mustprogress noinline nounwind optnone
@@ -26,13 +19,6 @@ __device__ void extern_func();
2619
// OPTNONE-NEXT: call void @_Z11extern_funcv() #[[ATTR3:[0-9]+]]
2720
// OPTNONE-NEXT: ret void
2821
//
29-
// OPT: Function Attrs: convergent mustprogress nounwind
30-
// OPT-LABEL: define {{[^@]+}}@_Z4funcv
31-
// OPT-SAME: () local_unnamed_addr #[[ATTR0:[0-9]+]] {
32-
// OPT-NEXT: entry:
33-
// OPT-NEXT: tail call void @_Z11extern_funcv() #[[ATTR3:[0-9]+]]
34-
// OPT-NEXT: ret void
35-
//
3622
__device__ void func() {
3723
extern_func();
3824
}
@@ -44,13 +30,6 @@ __device__ void func() {
4430
// OPTNONE-NEXT: call void @_Z11extern_funcv() #[[ATTR3]]
4531
// OPTNONE-NEXT: ret void
4632
//
47-
// OPT: Function Attrs: convergent mustprogress norecurse nounwind
48-
// OPT-LABEL: define {{[^@]+}}@_Z6kernelv
49-
// OPT-SAME: () local_unnamed_addr #[[ATTR2:[0-9]+]] {
50-
// OPT-NEXT: entry:
51-
// OPT-NEXT: tail call void @_Z11extern_funcv() #[[ATTR3]]
52-
// OPT-NEXT: ret void
53-
//
5433
__global__ void kernel() {
5534
extern_func();
5635
}
@@ -60,16 +39,7 @@ __global__ void kernel() {
6039
// OPTNONE: attributes #[[ATTR2]] = { convergent mustprogress noinline norecurse nounwind optnone "amdgpu-flat-work-group-size"="1,1024" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "uniform-work-group-size"="true" }
6140
// OPTNONE: attributes #[[ATTR3]] = { convergent nounwind }
6241
//.
63-
// OPT: attributes #[[ATTR0]] = { convergent mustprogress nounwind "amdgpu-waves-per-eu"="4,10" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "uniform-work-group-size"="false" }
64-
// OPT: attributes #[[ATTR1:[0-9]+]] = { convergent nounwind "amdgpu-waves-per-eu"="4,10" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "uniform-work-group-size"="false" }
65-
// OPT: attributes #[[ATTR2]] = { convergent mustprogress norecurse nounwind "amdgpu-flat-work-group-size"="1,1024" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "uniform-work-group-size"="true" }
66-
// OPT: attributes #[[ATTR3]] = { convergent nounwind }
67-
//.
6842
// OPTNONE: [[META0:![0-9]+]] = !{i32 1, !"amdhsa_code_object_version", i32 500}
6943
// OPTNONE: [[META1:![0-9]+]] = !{i32 1, !"amdgpu_printf_kind", !"hostcall"}
7044
// OPTNONE: [[META2:![0-9]+]] = !{i32 1, !"wchar_size", i32 4}
7145
//.
72-
// OPT: [[META0:![0-9]+]] = !{i32 1, !"amdhsa_code_object_version", i32 500}
73-
// OPT: [[META1:![0-9]+]] = !{i32 1, !"amdgpu_printf_kind", !"hostcall"}
74-
// OPT: [[META2:![0-9]+]] = !{i32 1, !"wchar_size", i32 4}
75-
//.

0 commit comments

Comments
 (0)