https://github.com/ampandey-1995 updated
https://github.com/llvm/llvm-project/pull/126885
>From cfa9342304a03671ed261a4f0b0cbe0297bb050b Mon Sep 17 00:00:00 2001
From: Amit Pandey <pandey.kumaramit2...@gmail.com>
Date: Wed, 12 Feb 2025 15:47:33 +0530
Subject: [PATCH] [Driver][ROCm][ASan] Skip checking ':xnack+' feature for
gfx12.
Enable ASan instrumentation for 'gfx12' family targets.The GPU
features like ':xnack+ or :sramecc+' are implicitly handled in the
hardware for gfx12 family.
---
clang/lib/Driver/ToolChains/AMDGPU.cpp | 5 +++++
.../rocm/amdgcn/bitcode/oclc_isa_version_1200.bc | 0
clang/test/Driver/amdgpu-openmp-sanitize-options.c | 12 +++++++-----
clang/test/Driver/hip-sanitize-options.hip | 5 +++++
clang/test/Driver/rocm-device-libs.cl | 6 ++++++
5 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644
clang/test/Driver/Inputs/rocm/amdgcn/bitcode/oclc_isa_version_1200.bc
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp
b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index 8d5cb91ebad9a..3edd9f37897f1 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -1112,6 +1112,11 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
assert(OptionalGpuArch && "Invalid Target ID");
(void)OptionalGpuArch;
+
+ // Skip checking 'xnack+' feature availability for gfx12 family.
+ if (llvm::AMDGPU::getIsaVersion(TargetID).Major == 12)
+ return false;
+
auto Loc = FeatureMap.find("xnack");
if (Loc == FeatureMap.end() || !Loc->second) {
Diags.Report(
diff --git
a/clang/test/Driver/Inputs/rocm/amdgcn/bitcode/oclc_isa_version_1200.bc
b/clang/test/Driver/Inputs/rocm/amdgcn/bitcode/oclc_isa_version_1200.bc
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/clang/test/Driver/amdgpu-openmp-sanitize-options.c
b/clang/test/Driver/amdgpu-openmp-sanitize-options.c
index f6a8a7dc57ccc..bd3250a73f5b2 100644
--- a/clang/test/Driver/amdgpu-openmp-sanitize-options.c
+++ b/clang/test/Driver/amdgpu-openmp-sanitize-options.c
@@ -13,7 +13,6 @@
// RUN: | FileCheck --check-prefix=NOTSUPPORTED %s
// GPU ASan Enabled Test Cases
-
// 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=HOSTSAN,GPUSAN,SAN %s
@@ -22,12 +21,15 @@
// 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+]
+// GPU 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=HOSTSAN,GPUSAN,SAN %s
-// GPU ASan Disabled Test Cases
+// GPU ASan enabled for amdgpu-arch [gfx1200]
+// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu
-fopenmp=libomp --offload-arch=gfx1200 -fsanitize=address -fgpu-sanitize
--rocm-path=%S/Inputs/rocm %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=HOSTSAN,GPUSAN,SAN %s
+// GPU ASan Disabled Test Cases
// 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
@@ -56,9 +58,9 @@
// HOSTSAN: {{"[^"]*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".*}}
+// 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" "(gfx1200|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".*}}
-// SAN: {{"[^"]*clang-offload-packager[^"]*" "-o".*
"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx908(:xnack\-|:xnack\+)?,kind=openmp(,feature=(\-xnack|\+xnack))?"}}
+// SAN: {{"[^"]*clang-offload-packager[^"]*" "-o".*
"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=(gfx1200|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 8de0ee9e18426..f5fe1637963db 100644
--- a/clang/test/Driver/hip-sanitize-options.hip
+++ b/clang/test/Driver/hip-sanitize-options.hip
@@ -3,6 +3,11 @@
// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
// RUN: %s 2>&1 | FileCheck -check-prefixes=NORDC %s
+// RUN: %clang -### --target=x86_64-unknown-linux-gnu --offload-arch=gfx1200 \
+// RUN: -fsanitize=address \
+// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
+// RUN: %s 2>&1 | FileCheck -check-prefixes=NORDC %s
+
// RUN: %clang -### --target=x86_64-unknown-linux-gnu
--offload-arch=gfx900:xnack+ \
// RUN: -fsanitize=address -fno-gpu-sanitize \
// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \
diff --git a/clang/test/Driver/rocm-device-libs.cl
b/clang/test/Driver/rocm-device-libs.cl
index f9766e6fa4d99..e1ab31abbab07 100644
--- a/clang/test/Driver/rocm-device-libs.cl
+++ b/clang/test/Driver/rocm-device-libs.cl
@@ -138,6 +138,12 @@
// RUN: %s \
// RUN: 2>&1 | FileCheck --check-prefixes=ASAN,COMMON %s
+// RUN: %clang -### -target amdgcn-amd-amdhsa \
+// RUN: -x cl -mcpu=gfx1200 -fsanitize=address \
+// RUN: --rocm-path=%S/Inputs/rocm \
+// RUN: %s \
+// RUN: 2>&1 | FileCheck --check-prefixes=ASAN,COMMON %s
+
// RUN: %clang -### -target amdgcn-amd-amdhsa \
// RUN: -x cl -mcpu=gfx908:xnack+ \
// RUN: --rocm-path=%S/Inputs/rocm \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
