https://github.com/ampandey-1995 updated
https://github.com/llvm/llvm-project/pull/126671
>From 8367c38f7f04273e3ab2451351b6db8d3f7dbc0c Mon Sep 17 00:00:00 2001
From: Amit Pandey <pandey.kumaramit2...@gmail.com>
Date: Tue, 11 Feb 2025 08:06:21 +0530
Subject: [PATCH 1/2] Reapply "[Driver][ROCm][OpenMP] Fix default ockl linking
for OpenMP." (#126628)
- This reverts commit 0c6c4a99936d4d39015c8d2332483f8db78f69cf.
- 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.
---
clang/lib/Driver/ToolChains/AMDGPU.cpp | 15 +++--
clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 2 +-
.../Driver/amdgpu-openmp-sanitize-options.c | 57 +++++++++----------
clang/test/Driver/hip-sanitize-options.hip | 2 +-
4 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp
b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index e66e5a32e58acd..202198e96c0127 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -1014,7 +1014,12 @@ RocmInstallationDetector::getCommonBitcodeLibs(
bool isOpenMP = false) const {
llvm::SmallVector<ToolChain::BitCodeLibraryInfo, 12> BCLibs;
- auto GPUSanEnabled = [GPUSan]() { return std::get<bool>(GPUSan); };
+ // GPU Sanitizer currently only supports ASan and is enabled through host
+ // ASan.
+ auto GPUSanEnabled = [GPUSan]() {
+ return std::get<bool>(GPUSan) &&
+ std::get<const SanitizerArgs>(GPUSan).needsAsanRt();
+ };
auto AddBCLib = [&](ToolChain::BitCodeLibraryInfo BCLib,
bool Internalize = true) {
BCLib.ShouldInternalize = Internalize;
@@ -1022,9 +1027,7 @@ RocmInstallationDetector::getCommonBitcodeLibs(
};
auto AddSanBCLibs = [&]() {
if (GPUSanEnabled()) {
- auto SanArgs = std::get<const SanitizerArgs>(GPUSan);
- if (SanArgs.needsAsanRt())
- AddBCLib(getAsanRTLPath(), false);
+ AddBCLib(getAsanRTLPath(), false);
}
};
@@ -1066,7 +1069,7 @@ ROCMToolChain::getCommonDeviceLibNames(const
llvm::opt::ArgList &DriverArgs,
// them all?
std::tuple<bool, const SanitizerArgs> GPUSan(
DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
- options::OPT_fno_gpu_sanitize, false),
+ options::OPT_fno_gpu_sanitize, true),
getSanitizerArgs(DriverArgs));
bool DAZ = DriverArgs.hasFlag(options::OPT_fgpu_flush_denormals_to_zero,
options::OPT_fno_gpu_flush_denormals_to_zero,
@@ -1099,7 +1102,7 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
return false;
if (!DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
- options::OPT_fno_gpu_sanitize, false))
+ options::OPT_fno_gpu_sanitize, true))
return true;
auto &Diags = TC.getDriver().getDiags();
diff --git a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
index 00bf9c7338edd1..aba79f5fa6fa7b 100644
--- a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
@@ -68,7 +68,7 @@ llvm::opt::DerivedArgList
*AMDGPUOpenMPToolChain::TranslateArgs(
Action::OffloadKind DeviceOffloadKind) const {
DerivedArgList *DAL =
HostTC.TranslateArgs(Args, BoundArch, DeviceOffloadKind);
- if (!DAL)
+ if (!DAL || Args.hasArg(options::OPT_fsanitize_EQ))
DAL = new DerivedArgList(Args.getBaseArgs());
const OptTable &Opts = getDriver().getOpts();
diff --git a/clang/test/Driver/amdgpu-openmp-sanitize-options.c
b/clang/test/Driver/amdgpu-openmp-sanitize-options.c
index c28a758bfc0c5e..f6a8a7dc57cccd 100644
--- a/clang/test/Driver/amdgpu-openmp-sanitize-options.c
+++ b/clang/test/Driver/amdgpu-openmp-sanitize-options.c
@@ -1,11 +1,11 @@
// REQUIRES: x86-registered-target, amdgpu-registered-target
// Fail on invalid ROCm Path.
-// 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 \
+// 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 \
// RUN: | FileCheck --check-prefix=FAIL %s
// Enable multiple sanitizer's apart from ASan with invalid rocm-path.
-// 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 \
+// 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 \
// RUN: | FileCheck --check-prefixes=NOTSUPPORTED,FAIL %s
// Memory, Leak, UndefinedBehaviour and Thread Sanitizer are not supported on
AMDGPU.
@@ -13,38 +13,40 @@
// RUN: | FileCheck --check-prefix=NOTSUPPORTED %s
// GPU ASan Enabled Test Cases
-// ASan enabled for amdgpu-arch [gfx908]
-// 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 \
-// RUN: | FileCheck -check-prefixes=NOXNACK,GPUSAN %s
-
-// GPU ASan enabled for amdgpu-arch [gfx908:xnack-]
-// 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 \
-// RUN: | FileCheck -check-prefixes=XNACKNEG,GPUSAN %s
// GPU ASan enabled for amdgpu-arch [gfx908:xnack+]
// 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 \
-// RUN: | FileCheck -check-prefixes=GPUSAN %s
+// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
+
+// GPU ASan enabled through '-fsanitize=address' flag without
'-fgpu-sanitize' for amdgpu-arch [gfx908:xnack+]
+// 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 \
+// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
// ASan enabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
// 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 \
-// RUN: | FileCheck -check-prefixes=GPUSAN %s
+// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
// GPU ASan Disabled Test Cases
-// ASan disabled for amdgpu-arch [gfx908]
-// 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 \
-// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
+
+// GPU ASan disabled through '-fsanitize=address' without '-fgpu-sanitize'
flag for amdgpu-arch [gfx908]
+// 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 \
+// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
+
+// GPU ASan disabled for amdgpu-arch [gfx908]
+// 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 \
+// RUN: | FileCheck -check-prefixes=NOXNACK,HOSTSAN,NOGPUSAN,SAN %s
// GPU ASan disabled for amdgpu-arch [gfx908:xnack-]
-// 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 \
-// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
+// 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 \
+// RUN: | FileCheck -check-prefixes=XNACKNEG,HOSTSAN,NOGPUSAN,SAN %s
-// GPU ASan disabled for amdgpu-arch [gfx908:xnack+]
+// GPU ASan disabled using '-fno-gpu-sanitize' for amdgpu-arch [gfx908:xnack+]
// 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 \
-// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
+// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
-// ASan disabled for amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
+// GPU ASan disabled for multiple amdgpu-arch [gfx908:xnack+,gfx900:xnack+]
// 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 \
-// RUN: | FileCheck -check-prefixes=NOGPUSAN %s
+// RUN: | FileCheck -check-prefixes=HOSTSAN,NOGPUSAN,SAN %s
// 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
// NOTSUPPORTED-DAG: warning: ignoring '-fsanitize=leak' option as it is not
currently supported for target 'amdgcn-amd-amdhsa'
@@ -52,14 +54,11 @@
// 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
// 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
-// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"c".*}}
-// 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".*}}
-// GPUSAN: {{"[^"]*clang-offload-packager[^"]*" "-o".*
"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
-// GPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"ir".*}}
-// 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)".*}}
+// HOSTSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"c".*}}
-// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"c".*}}
+// 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".*}}
// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "amdgcn-amd-amdhsa"
"-aux-triple" "x86_64-unknown-linux-gnu".* "-emit-llvm-bc".* "-target-cpu"
"(gfx908|gfx900)".* "-fopenmp".* "-x" "c".*}}
-// NOGPUSAN: {{"[^"]*clang-offload-packager[^"]*" "-o".*
"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
-// NOGPUSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"ir".*}}
-// 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)".*}}
+
+// SAN: {{"[^"]*clang-offload-packager[^"]*" "-o".*
"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
+// SAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".*
"-fopenmp".* "-fsanitize=address".* "-fopenmp-targets=amdgcn-amd-amdhsa".* "-x"
"ir".*}}
+// 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)".*}}
diff --git a/clang/test/Driver/hip-sanitize-options.hip
b/clang/test/Driver/hip-sanitize-options.hip
index 8a852867f5b3b3..8de0ee9e18426b 100644
--- a/clang/test/Driver/hip-sanitize-options.hip
+++ b/clang/test/Driver/hip-sanitize-options.hip
@@ -1,5 +1,5 @@
// RUN: %clang -### --target=x86_64-unknown-linux-gnu
--offload-arch=gfx900:xnack+ \
-// RUN: -fsanitize=address -fgpu-sanitize \
+// RUN: -fsanitize=address \
// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
// RUN: %s 2>&1 | FileCheck -check-prefixes=NORDC %s
>From d0b644e19f34a0e14003083efd89700920661773 Mon Sep 17 00:00:00 2001
From: Amit Pandey <pandey.kumaramit2...@gmail.com>
Date: Tue, 11 Feb 2025 19:14:45 +0530
Subject: [PATCH 2/2] Address Comments of @arsenm.
---
clang/lib/Driver/ToolChains/AMDGPU.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp
b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index 202198e96c0127..39a837b56271bd 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -1016,17 +1016,16 @@ RocmInstallationDetector::getCommonBitcodeLibs(
// GPU Sanitizer currently only supports ASan and is enabled through host
// ASan.
- auto GPUSanEnabled = [GPUSan]() {
- return std::get<bool>(GPUSan) &&
- std::get<const SanitizerArgs>(GPUSan).needsAsanRt();
- };
+ bool GPUSanEnabled = std::get<bool>(GPUSan) &&
+ std::get<const SanitizerArgs>(GPUSan).needsAsanRt();
+
auto AddBCLib = [&](ToolChain::BitCodeLibraryInfo BCLib,
bool Internalize = true) {
BCLib.ShouldInternalize = Internalize;
BCLibs.emplace_back(BCLib);
};
auto AddSanBCLibs = [&]() {
- if (GPUSanEnabled()) {
+ if (GPUSanEnabled) {
AddBCLib(getAsanRTLPath(), false);
}
};
@@ -1035,7 +1034,7 @@ RocmInstallationDetector::getCommonBitcodeLibs(
AddBCLib(getOCMLPath());
if (!isOpenMP)
AddBCLib(getOCKLPath());
- else if (GPUSanEnabled() && isOpenMP)
+ else if (GPUSanEnabled && isOpenMP)
AddBCLib(getOCKLPath(), false);
AddBCLib(getDenormalsAreZeroPath(DAZ));
AddBCLib(getUnsafeMathPath(UnsafeMathOpt || FastRelaxedMath));
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
