Skip to content

Commit 71f14ff

Browse files
Artem-BArtem-B
authored
[HIP] Fix tests broken by #117074 / 689c532 (#117361)
1 parent c87336f commit 71f14ff

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎clang/test/Driver/hip-rdc-device-only.hip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
// EMITBC-SAME: "-emit-llvm-bc"
6767
// EMITLL-SAME: "-emit-llvm"
6868
// COMMON-SAME: {{.*}} "-main-file-name" "a.cu"
69-
// COMMON-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
69+
// COMMON-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
7070
// COMMON-SAME: "-fapply-global-visibility-to-externs"
7171
// COMMON-SAME: "-target-cpu" "gfx803"
7272
// COMMON-SAME: "-fgpu-rdc"
@@ -79,7 +79,7 @@
7979
// EMITBC-SAME: "-emit-llvm-bc"
8080
// EMITLL-SAME: "-emit-llvm"
8181
// COMMON-SAME: {{.*}} "-main-file-name" "a.cu"
82-
// COMMON-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
82+
// COMMON-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
8383
// COMMON-SAME: "-fapply-global-visibility-to-externs"
8484
// COMMON-SAME: "-target-cpu" "gfx900"
8585
// COMMON-SAME: "-fgpu-rdc"
@@ -96,7 +96,7 @@
9696
// EMITBC-SAME: "-emit-llvm-bc"
9797
// EMITLL-SAME: "-emit-llvm"
9898
// COMMON-SAME: {{.*}} "-main-file-name" "b.hip"
99-
// COMMON-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
99+
// COMMON-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
100100
// COMMON-SAME: "-fapply-global-visibility-to-externs"
101101
// COMMON-SAME: "-target-cpu" "gfx803"
102102
// COMMON-SAME: "-fgpu-rdc"
@@ -109,7 +109,7 @@
109109
// EMITBC-SAME: "-emit-llvm-bc"
110110
// EMITLL-SAME: "-emit-llvm"
111111
// COMMON-SAME: {{.*}} "-main-file-name" "b.hip"
112-
// COMMON-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
112+
// COMMON-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
113113
// COMMON-SAME: "-fapply-global-visibility-to-externs"
114114
// COMMON-SAME: "-target-cpu" "gfx900"
115115
// COMMON-SAME: "-fgpu-rdc"

‎clang/test/Driver/hip-toolchain-no-rdc.hip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
5050
// CHECK-SAME: "-emit-obj"
5151
// CHECK-SAME: {{.*}} "-main-file-name" "a.cu"
52-
// CHECK-SAME: "-fcuda-is-device" "-mllvm" "-amdgpu-internalize-symbols"
52+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-mllvm" "-amdgpu-internalize-symbols"
5353
// CHECK-SAME: "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
5454
// CHECK-SAME: "-fapply-global-visibility-to-externs"
5555
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
@@ -72,7 +72,7 @@
7272
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
7373
// CHECK-SAME: "-emit-obj"
7474
// CHECK-SAME: {{.*}} "-main-file-name" "a.cu"
75-
// CHECK-SAME: "-fcuda-is-device" "-mllvm" "-amdgpu-internalize-symbols"
75+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-mllvm" "-amdgpu-internalize-symbols"
7676
// CHECK-SAME: "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
7777
// CHECK-SAME: "-fapply-global-visibility-to-externs"
7878
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
@@ -112,7 +112,7 @@
112112
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
113113
// CHECK-SAME: "-emit-obj"
114114
// CHECK-SAME: {{.*}} "-main-file-name" "b.hip"
115-
// CHECK-SAME: "-fcuda-is-device" "-mllvm" "-amdgpu-internalize-symbols"
115+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-mllvm" "-amdgpu-internalize-symbols"
116116
// CHECK-SAME: "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
117117
// CHECK-SAME: "-fapply-global-visibility-to-externs"
118118
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
@@ -135,7 +135,7 @@
135135
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
136136
// CHECK-SAME: "-emit-obj"
137137
// CHECK-SAME: {{.*}} "-main-file-name" "b.hip"
138-
// CHECK-SAME: "-fcuda-is-device" "-mllvm" "-amdgpu-internalize-symbols"
138+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-mllvm" "-amdgpu-internalize-symbols"
139139
// CHECK-SAME: "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
140140
// CHECK-SAME: "-fapply-global-visibility-to-externs"
141141
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"

‎clang/test/Driver/hip-toolchain-rdc-separate.hip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
1414
// CHECK-SAME: "-emit-llvm-bc"
1515
// CHECK-SAME: {{.*}} "-main-file-name" "a.cu"
16-
// CHECK-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
16+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
1717
// CHECK-SAME: "-fapply-global-visibility-to-externs"
1818
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
1919
// CHECK-SAME: "-target-cpu" "gfx803"
@@ -48,7 +48,7 @@
4848
// CHECK-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
4949
// CHECK-SAME: "-emit-llvm-bc"
5050
// CHECK-SAME: {{.*}} "-main-file-name" "b.hip"
51-
// CHECK-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
51+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
5252
// CHECK-SAME: "-fapply-global-visibility-to-externs"
5353
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
5454
// CHECK-SAME: "-target-cpu" "gfx803"

‎clang/test/Driver/hip-toolchain-rdc.hip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
// CHECK-SAME: "-aux-triple" [[HOST:"x86_64-[^"]+"]]
9494
// CHECK-SAME: "-emit-llvm-bc"
9595
// CHECK-SAME: {{.*}} "-main-file-name" "a.cu"
96-
// CHECK-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
96+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
9797
// CHECK-SAME: "-fapply-global-visibility-to-externs"
9898
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
9999
// CHECK-SAME: "-target-cpu" "gfx803"
@@ -105,7 +105,7 @@
105105
// CHECK-SAME: "-aux-triple" [[HOST]]
106106
// CHECK-SAME: "-emit-llvm-bc"
107107
// CHECK-SAME: {{.*}} "-main-file-name" "b.hip"
108-
// CHECK-SAME: "-fcuda-is-device" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
108+
// CHECK-SAME: "-fcuda-is-device" "-fno-threadsafe-statics" "-fcuda-allow-variadic-functions" "-fvisibility=hidden"
109109
// CHECK-SAME: "-fapply-global-visibility-to-externs"
110110
// CHECK-SAME: "{{.*}}lib1.bc" "{{.*}}lib2.bc"
111111
// CHECK-SAME: "-target-cpu" "gfx803"

0 commit comments

Comments
 (0)