Skip to content

Commit 46f1bab

Browse files
ampandey-1995ampandey-1995
authored
Reapply "[Driver][ROCm][OpenMP] Fix default ockl linking for OpenMP."… (#126671)
- This reverts commit 0c6c4a9. - Add '-mcode-object-version=5' as to explicitly use code object version 5 to match with 'FAIL' diagnostic. - Add Requires directive to support lit test run on platforms registered with x86_64 and amdgpu.
1 parent 7dd8280 commit 46f1bab

File tree

5 files changed

+56
-52
lines changed

5 files changed

+56
-52
lines changed

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -950,13 +950,7 @@ void ROCMToolChain::addClangTargetOptions(
950950
ABIVer))
951951
return;
952952

953-
std::tuple<bool, const SanitizerArgs> GPUSan(
954-
DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
955-
options::OPT_fno_gpu_sanitize, true),
956-
getSanitizerArgs(DriverArgs));
957-
958953
bool Wave64 = isWave64(DriverArgs, Kind);
959-
960954
// TODO: There are way too many flags that change this. Do we need to check
961955
// them all?
962956
bool DAZ = DriverArgs.hasArg(options::OPT_cl_denorms_are_zero) ||
@@ -969,6 +963,12 @@ void ROCMToolChain::addClangTargetOptions(
969963
bool CorrectSqrt =
970964
DriverArgs.hasArg(options::OPT_cl_fp32_correctly_rounded_divide_sqrt);
971965

966+
// GPU Sanitizer currently only supports ASan and is enabled through host
967+
// ASan.
968+
bool GPUSan = DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
969+
options::OPT_fno_gpu_sanitize, true) &&
970+
getSanitizerArgs(DriverArgs).needsAsanRt();
971+
972972
// Add the OpenCL specific bitcode library.
973973
llvm::SmallVector<BitCodeLibraryInfo, 12> BCLibs;
974974
BCLibs.emplace_back(RocmInstallation->getOpenCLPath().str());
@@ -1009,30 +1009,25 @@ llvm::SmallVector<ToolChain::BitCodeLibraryInfo, 12>
10091009
RocmInstallationDetector::getCommonBitcodeLibs(
10101010
const llvm::opt::ArgList &DriverArgs, StringRef LibDeviceFile, bool Wave64,
10111011
bool DAZ, bool FiniteOnly, bool UnsafeMathOpt, bool FastRelaxedMath,
1012-
bool CorrectSqrt, DeviceLibABIVersion ABIVer,
1013-
const std::tuple<bool, const SanitizerArgs> &GPUSan,
1014-
bool isOpenMP = false) const {
1012+
bool CorrectSqrt, DeviceLibABIVersion ABIVer, bool GPUSan,
1013+
bool isOpenMP) const {
10151014
llvm::SmallVector<ToolChain::BitCodeLibraryInfo, 12> BCLibs;
10161015

1017-
auto GPUSanEnabled = [GPUSan]() { return std::get<bool>(GPUSan); };
10181016
auto AddBCLib = [&](ToolChain::BitCodeLibraryInfo BCLib,
10191017
bool Internalize = true) {
10201018
BCLib.ShouldInternalize = Internalize;
10211019
BCLibs.emplace_back(BCLib);
10221020
};
10231021
auto AddSanBCLibs = [&]() {
1024-
if (GPUSanEnabled()) {
1025-
auto SanArgs = std::get<const SanitizerArgs>(GPUSan);
1026-
if (SanArgs.needsAsanRt())
1027-
AddBCLib(getAsanRTLPath(), false);
1028-
}
1022+
if (GPUSan)
1023+
AddBCLib(getAsanRTLPath(), false);
10291024
};
10301025

10311026
AddSanBCLibs();
10321027
AddBCLib(getOCMLPath());
10331028
if (!isOpenMP)
10341029
AddBCLib(getOCKLPath());
1035-
else if (GPUSanEnabled() && isOpenMP)
1030+
else if (GPUSan && isOpenMP)
10361031
AddBCLib(getOCKLPath(), false);
10371032
AddBCLib(getDenormalsAreZeroPath(DAZ));
10381033
AddBCLib(getUnsafeMathPath(UnsafeMathOpt || FastRelaxedMath));
@@ -1064,10 +1059,6 @@ ROCMToolChain::getCommonDeviceLibNames(const llvm::opt::ArgList &DriverArgs,
10641059
// If --hip-device-lib is not set, add the default bitcode libraries.
10651060
// TODO: There are way too many flags that change this. Do we need to check
10661061
// them all?
1067-
std::tuple<bool, const SanitizerArgs> GPUSan(
1068-
DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
1069-
options::OPT_fno_gpu_sanitize, false),
1070-
getSanitizerArgs(DriverArgs));
10711062
bool DAZ = DriverArgs.hasFlag(options::OPT_fgpu_flush_denormals_to_zero,
10721063
options::OPT_fno_gpu_flush_denormals_to_zero,
10731064
getDefaultDenormsAreZeroForTarget(Kind));
@@ -1083,6 +1074,12 @@ ROCMToolChain::getCommonDeviceLibNames(const llvm::opt::ArgList &DriverArgs,
10831074
options::OPT_fno_hip_fp32_correctly_rounded_divide_sqrt, true);
10841075
bool Wave64 = isWave64(DriverArgs, Kind);
10851076

1077+
// GPU Sanitizer currently only supports ASan and is enabled through host
1078+
// ASan.
1079+
bool GPUSan = DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
1080+
options::OPT_fno_gpu_sanitize, true) &&
1081+
getSanitizerArgs(DriverArgs).needsAsanRt();
1082+
10861083
return RocmInstallation->getCommonBitcodeLibs(
10871084
DriverArgs, LibDeviceFile, Wave64, DAZ, FiniteOnly, UnsafeMathOpt,
10881085
FastRelaxedMath, CorrectSqrt, ABIVer, GPUSan, isOpenMP);
@@ -1095,11 +1092,12 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
10951092
if (TargetID.empty())
10961093
return false;
10971094
Option O = A->getOption();
1095+
10981096
if (!O.matches(options::OPT_fsanitize_EQ))
10991097
return false;
11001098

11011099
if (!DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
1102-
options::OPT_fno_gpu_sanitize, false))
1100+
options::OPT_fno_gpu_sanitize, true))
11031101
return true;
11041102

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,18 @@ llvm::opt::DerivedArgList *AMDGPUOpenMPToolChain::TranslateArgs(
6868
Action::OffloadKind DeviceOffloadKind) const {
6969
DerivedArgList *DAL =
7070
HostTC.TranslateArgs(Args, BoundArch, DeviceOffloadKind);
71+
7172
if (!DAL)
7273
DAL = new DerivedArgList(Args.getBaseArgs());
7374

7475
const OptTable &Opts = getDriver().getOpts();
7576

77+
// Skip sanitize options passed from the HostTC. Claim them early.
78+
// The decision to sanitize device code is computed only by
79+
// 'shouldSkipSanitizeOption'.
80+
if (DAL->hasArg(options::OPT_fsanitize_EQ))
81+
DAL->claimAllArgs(options::OPT_fsanitize_EQ);
82+
7683
for (Arg *A : Args)
7784
if (!shouldSkipSanitizeOption(*this, Args, BoundArch, A) &&
7885
!llvm::is_contained(*DAL, A))

‎clang/lib/Driver/ToolChains/ROCm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class RocmInstallationDetector {
178178
const llvm::opt::ArgList &DriverArgs, StringRef LibDeviceFile,
179179
bool Wave64, bool DAZ, bool FiniteOnly, bool UnsafeMathOpt,
180180
bool FastRelaxedMath, bool CorrectSqrt, DeviceLibABIVersion ABIVer,
181-
const std::tuple<bool, const SanitizerArgs> &GPUSan, bool isOpenMP) const;
181+
bool GPUSan, bool isOpenMP) const;
182182
/// Check file paths of default bitcode libraries common to AMDGPU based
183183
/// toolchains. \returns false if there are invalid or missing files.
184184
bool checkCommonBitcodeLibs(StringRef GPUArch, StringRef LibDeviceFile,

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

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,64 @@
11
// REQUIRES: x86-registered-target, amdgpu-registered-target
22

33
// Fail on invalid ROCm Path.
4-
// 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 \
4+
// RUN: not %clang -no-canonical-prefixes -### -mcode-object-version=5 --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 \
55
// RUN: | FileCheck --check-prefix=FAIL %s
66

77
// Enable multiple sanitizer's apart from ASan with invalid rocm-path.
8-
// RUN: not %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fsanitize=leak -fgpu-sanitize --rocm-path=%S/Inputs/rocm-invalid -nogpuinc %s 2>&1 \
8+
// RUN: not %clang -no-canonical-prefixes -### -mcode-object-version=5 --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fsanitize=leak -fgpu-sanitize --rocm-path=%S/Inputs/rocm-invalid -nogpuinc %s 2>&1 \
99
// RUN: | FileCheck --check-prefixes=NOTSUPPORTED,FAIL %s
1010

1111
// Memory, Leak, UndefinedBehaviour and Thread Sanitizer are not supported on AMDGPU.
1212
// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address -fsanitize=leak -fgpu-sanitize --rocm-path=%S/Inputs/rocm -nogpuinc %s 2>&1 \
1313
// RUN: | FileCheck --check-prefix=NOTSUPPORTED %s
1414

1515
// 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
2316

2417
// GPU ASan enabled for amdgpu-arch [gfx908:xnack+]
2518
// 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 \
26-
// RUN: | FileCheck -check-prefixes=GPUSAN %s
19+
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
20+
21+
// GPU ASan enabled through '-fsanitize=address' flag without '-fgpu-sanitize' for amdgpu-arch [gfx908:xnack+]
22+
// 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 \
23+
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
2724

2825
// ASan enabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
2926
// 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 \
30-
// RUN: | FileCheck -check-prefixes=GPUSAN %s
27+
// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
3128

3229
// GPU ASan Disabled Test Cases
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
30+
31+
// GPU ASan disabled through '-fsanitize=address' without '-fgpu-sanitize' flag for amdgpu-arch [gfx908]
32+
// 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 \
33+
// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
34+
35+
// GPU ASan disabled for amdgpu-arch [gfx908]
36+
// 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 \
37+
// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
3638

3739
// 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 -fno-gpu-sanitize --rocm-path=%S/Inputs/rocm %s 2>&1 \
39-
// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
40+
// 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 \
41+
// RUN: | FileCheck -check-prefixes=XNACKNEG,HOSTSAN,NOGPUSAN,SAN %s
4042

41-
// GPU ASan disabled for amdgpu-arch [gfx908:xnack+]
43+
// GPU ASan disabled using '-fno-gpu-sanitize' for amdgpu-arch [gfx908:xnack+]
4244
// 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=NOGPUSAN %s
45+
// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
4446

45-
// ASan disabled for amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
47+
// GPU ASan disabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
4648
// 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=NOGPUSAN %s
49+
// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
4850

4951
// 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
5052
// NOTSUPPORTED-DAG: warning: ignoring '-fsanitize=leak' option as it is not currently supported for target 'amdgcn-amd-amdhsa'
5153

5254
// 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
5355
// 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
5456

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)".*}}
57+
// HOSTSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
6058

61-
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
59+
// 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".*}}
6260
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "amdgcn-amd-amdhsa" "-aux-triple" "x86_64-unknown-linux-gnu".* "-emit-llvm-bc".* "-target-cpu" "(gfx908|gfx900)".* "-fopenmp".* "-x" "c".*}}
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)".*}}
61+
62+
// SAN: {{"[^"]*clang-offload-packager[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
63+
// SAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x" "ir".*}}
64+
// 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)".*}}

‎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 -fgpu-sanitize \
2+
// RUN: -fsanitize=address \
33
// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
44
// RUN: %s 2>&1 | FileCheck -check-prefixes=NORDC %s
55

0 commit comments

Comments
 (0)