Skip to content

Commit 0c6c4a9

Browse files
fmayerfmayer
authored
Revert "[Driver][ROCm][OpenMP] Fix default ockl linking for OpenMP." (#126628)
Reverts #126186 This broke the sanitizer buildbot: https://lab.llvm.org/buildbot/#/builders/55/builds/6846
1 parent 001ba42 commit 0c6c4a9

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎clang/lib/Driver/ToolChains/AMDGPU.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,20 +1014,17 @@ RocmInstallationDetector::getCommonBitcodeLibs(
10141014
bool isOpenMP = false) const {
10151015
llvm::SmallVector<ToolChain::BitCodeLibraryInfo, 12> BCLibs;
10161016

1017-
// GPU Sanitizer currently only supports ASan and is enabled through host
1018-
// ASan.
1019-
auto GPUSanEnabled = [GPUSan]() {
1020-
return std::get<bool>(GPUSan) &&
1021-
std::get<const SanitizerArgs>(GPUSan).needsAsanRt();
1022-
};
1017+
auto GPUSanEnabled = [GPUSan]() { return std::get<bool>(GPUSan); };
10231018
auto AddBCLib = [&](ToolChain::BitCodeLibraryInfo BCLib,
10241019
bool Internalize = true) {
10251020
BCLib.ShouldInternalize = Internalize;
10261021
BCLibs.emplace_back(BCLib);
10271022
};
10281023
auto AddSanBCLibs = [&]() {
10291024
if (GPUSanEnabled()) {
1030-
AddBCLib(getAsanRTLPath(), false);
1025+
auto SanArgs = std::get<const SanitizerArgs>(GPUSan);
1026+
if (SanArgs.needsAsanRt())
1027+
AddBCLib(getAsanRTLPath(), false);
10311028
}
10321029
};
10331030

@@ -1069,7 +1066,7 @@ ROCMToolChain::getCommonDeviceLibNames(const llvm::opt::ArgList &DriverArgs,
10691066
// them all?
10701067
std::tuple<bool, const SanitizerArgs> GPUSan(
10711068
DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
1072-
options::OPT_fno_gpu_sanitize, true),
1069+
options::OPT_fno_gpu_sanitize, false),
10731070
getSanitizerArgs(DriverArgs));
10741071
bool DAZ = DriverArgs.hasFlag(options::OPT_fgpu_flush_denormals_to_zero,
10751072
options::OPT_fno_gpu_flush_denormals_to_zero,
@@ -1102,7 +1099,7 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
11021099
return false;
11031100

11041101
if (!DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
1105-
options::OPT_fno_gpu_sanitize, true))
1102+
options::OPT_fno_gpu_sanitize, false))
11061103
return true;
11071104

11081105
auto &Diags = TC.getDriver().getDiags();

‎clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ llvm::opt::DerivedArgList *AMDGPUOpenMPToolChain::TranslateArgs(
6868
Action::OffloadKind DeviceOffloadKind) const {
6969
DerivedArgList *DAL =
7070
HostTC.TranslateArgs(Args, BoundArch, DeviceOffloadKind);
71-
if (!DAL || Args.hasArg(options::OPT_fsanitize_EQ))
71+
if (!DAL)
7272
DAL = new DerivedArgList(Args.getBaseArgs());
7373

7474
const OptTable &Opts = getDriver().getOpts();

‎clang/test/Driver/amdgpu-openmp-sanitize-options.c

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// REQUIRES: x86-registered-target, amdgpu-registered-target
2+
13
// Fail on invalid ROCm Path.
24
// RUN: not %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fgpu-sanitize -nogpuinc --rocm-path=%S/Inputs/rocm-invalid %s 2>&1 \
35
// RUN: | FileCheck --check-prefix=FAIL %s
@@ -11,52 +13,53 @@
1113
// RUN: | FileCheck --check-prefix=NOTSUPPORTED %s
1214

1315
// GPU ASan Enabled Test Cases
16+
// ASan enabled for amdgpu-arch [gfx908]
17+
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908 -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
18+
// RUN: | FileCheck -check-prefixes=NOXNACK,GPUSAN %s
19+
20+
// GPU ASan enabled for amdgpu-arch [gfx908:xnack-]
21+
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack- -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
22+
// RUN: | FileCheck -check-prefixes=XNACKNEG,GPUSAN %s
1423

1524
// GPU ASan enabled for amdgpu-arch [gfx908:xnack+]
1625
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
17-
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
18-
19-
// GPU ASan enabled through '-fsanitize=address' flag without '-fgpu-sanitize' for amdgpu-arch [gfx908:xnack+]
20-
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address --rocm-path=%S/Inputs/rocm %s 2>&1 \
21-
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
26+
// RUN: | FileCheck -check-prefixes=GPUSAN %s
2227

2328
// ASan enabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
2429
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ --offload-arch=gfx900:xnack+ -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
25-
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
30+
// RUN: | FileCheck -check-prefixes=GPUSAN %s
2631

2732
// GPU ASan Disabled Test Cases
28-
29-
// GPU ASan disabled through '-fsanitize=address' without '-fgpu-sanitize' flag for amdgpu-arch [gfx908]
30-
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908 -fsanitize=address --rocm-path=%S/Inputs/rocm %s 2>&1 \
31-
// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
32-
33-
// GPU ASan disabled for amdgpu-arch [gfx908]
34-
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908 -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
35-
// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
33+
// ASan disabled for amdgpu-arch [gfx908]
34+
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908 -fsanitize=address -fno-gpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
35+
// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
3636

3737
// GPU ASan disabled for amdgpu-arch [gfx908:xnack-]
38-
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack- -fsanitize=address -fgpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
39-
// RUN: | FileCheck -check-prefixes=XNACKNEG,HOSTSAN,NOGPUSAN,SAN %s
38+
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack- -fsanitize=address -fno-gpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
39+
// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
4040

41-
// GPU ASan disabled using '-fno-gpu-sanitize' for amdgpu-arch [gfx908:xnack+]
41+
// GPU ASan disabled for amdgpu-arch [gfx908:xnack+]
4242
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fno-gpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
43-
// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
43+
// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
4444

45-
// GPU ASan disabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
45+
// ASan disabled for amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
4646
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ --offload-arch=gfx900:xnack+ -fsanitize=address -fno-gpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
47-
// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
47+
// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
4848

4949
// FAIL-DAG: error: cannot find ROCm device library for ABI version 5; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library
5050
// NOTSUPPORTED-DAG: warning: ignoring '-fsanitize=leak' option as it is not currently supported for target 'amdgcn-amd-amdhsa'
5151

5252
// NOXNACK: warning: ignoring '-fsanitize=address' option for offload arch 'gfx908' as it is not currently supported there. Use it with an offload arch containing 'xnack+' instead
5353
// XNACKNEG: warning: ignoring '-fsanitize=address' option for offload arch 'gfx908:xnack-' as it is not currently supported there. Use it with an offload arch containing 'xnack+' instead
5454

55-
// HOSTSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
55+
// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
56+
// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu".* "-emit-llvm-bc".* "-target-cpu" "(gfx908|gfx900)".* "-fopenmp".* "-fsanitize=address".* "-x" "c".*}}
57+
// GPUSAN: {{"[^"]*clang-offload-packager[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
58+
// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "ir".*}}
59+
// GPUSAN: {{"[^"]*clang-linker-wrapper[^"]*".* "--host-triple=x86_64-unknown-linux-gnu".* "--linker-path=[^"]*".* "--whole-archive" "[^"]*(libclang_rt.asan_static.a|libclang_rt.asan_static-x86_64.a)".* "--whole-archive" "[^"]*(libclang_rt.asan.a|libclang_rt.asan-x86_64.a)".*}}
5660

57-
// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu".* "-emit-llvm-bc".* "-mlink-bitcode-file" "[^"]*asanrtl.bc".* "-mlink-bitcode-file" "[^"]*ockl.bc".* "-target-cpu" "(gfx908|gfx900)".* "-fopenmp".* "-fsanitize=address".* "-x" "c".*}}
61+
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
5862
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu".* "-emit-llvm-bc".* "-target-cpu" "(gfx908|gfx900)".* "-fopenmp".* "-x" "c".*}}
59-
60-
// SAN: {{"[^"]*clang-offload-packager[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
61-
// SAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "ir".*}}
62-
// SAN: {{"[^"]*clang-linker-wrapper[^"]*".* "--host-triple=x86_64-unknown-linux-gnu".* "--linker-path=[^"]*".* "--whole-archive" "[^"]*(libclang_rt.asan_static.a|libclang_rt.asan_static-x86_64.a)".* "--whole-archive" "[^"]*(libclang_rt.asan.a|libclang_rt.asan-x86_64.a)".*}}
63+
// NOGPUSAN: {{"[^"]*clang-offload-packager[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
64+
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "ir".*}}
65+
// NOGPUSAN: {{"[^"]*clang-linker-wrapper[^"]*".* "--host-triple=x86_64-unknown-linux-gnu".* "--linker-path=[^"]*".* "--whole-archive" "[^"]*(libclang_rt.asan_static.a|libclang_rt.asan_static-x86_64.a)".* "--whole-archive" "[^"]*(libclang_rt.asan.a|libclang_rt.asan-x86_64.a)".*}}

‎clang/test/Driver/hip-sanitize-options.hip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clang -### --target=x86_64-unknown-linux-gnu --offload-arch=gfx900:xnack+ \
2-
// RUN: -fsanitize=address \
2+
// RUN: -fsanitize=address -fgpu-sanitize \
33
// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
44
// RUN: %s 2>&1 | FileCheck -check-prefixes=NORDC %s
55

0 commit comments

Comments
 (0)