From 6d2c0950205f50f926ba5e362e845faff22582b7 Mon Sep 17 00:00:00 2001 From: "Yaxun (Sam) Liu" Date: Sat, 22 May 2021 23:45:15 -0400 Subject: [PATCH] [HIP] Check compatibility of -fgpu-sanitize with offload arch -fgpu-sanitize is incompatible with offload arch containing xnack-. This patch checks that. Reviewed by: Artem Belevich Differential Revision: https://reviews.llvm.org/D102975 --- clang/lib/Driver/ToolChains/AMDGPU.cpp | 20 +++++++++++++++----- clang/lib/Driver/ToolChains/AMDGPU.h | 14 +++++++++++++- clang/lib/Driver/ToolChains/HIP.cpp | 25 +++++++++++++++++++++++++ clang/lib/Driver/ToolChains/HIP.h | 1 + clang/test/Driver/hip-sanitize-options.hip | 7 +++++++ 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index 639f359..09ee3b2 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -707,16 +707,26 @@ AMDGPUToolChain::getGPUArch(const llvm::opt::ArgList &DriverArgs) const { getTriple(), DriverArgs.getLastArgValue(options::OPT_mcpu_EQ)); } -void AMDGPUToolChain::checkTargetID( - const llvm::opt::ArgList &DriverArgs) const { +AMDGPUToolChain::ParsedTargetIDType +AMDGPUToolChain::getParsedTargetID(const llvm::opt::ArgList &DriverArgs) const { StringRef TargetID = DriverArgs.getLastArgValue(options::OPT_mcpu_EQ); if (TargetID.empty()) - return; + return {None, None, None}; llvm::StringMap FeatureMap; auto OptionalGpuArch = parseTargetID(getTriple(), TargetID, &FeatureMap); - if (!OptionalGpuArch) { - getDriver().Diag(clang::diag::err_drv_bad_target_id) << TargetID; + if (!OptionalGpuArch) + return {TargetID.str(), None, None}; + + return {TargetID.str(), OptionalGpuArch.getValue().str(), FeatureMap}; +} + +void AMDGPUToolChain::checkTargetID( + const llvm::opt::ArgList &DriverArgs) const { + auto PTID = getParsedTargetID(DriverArgs); + if (PTID.OptionalTargetID && !PTID.OptionalGPUArch) { + getDriver().Diag(clang::diag::err_drv_bad_target_id) + << PTID.OptionalTargetID.getValue(); } } diff --git a/clang/lib/Driver/ToolChains/AMDGPU.h b/clang/lib/Driver/ToolChains/AMDGPU.h index cb95db6..50ed3b3 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.h +++ b/clang/lib/Driver/ToolChains/AMDGPU.h @@ -107,7 +107,19 @@ public: protected: /// Check and diagnose invalid target ID specified by -mcpu. - void checkTargetID(const llvm::opt::ArgList &DriverArgs) const; + virtual void checkTargetID(const llvm::opt::ArgList &DriverArgs) const; + + /// The struct type returned by getParsedTargetID. + struct ParsedTargetIDType { + Optional OptionalTargetID; + Optional OptionalGPUArch; + Optional> OptionalFeatures; + }; + + /// Get target ID, GPU arch, and target ID features if the target ID is + /// specified and valid. + ParsedTargetIDType + getParsedTargetID(const llvm::opt::ArgList &DriverArgs) const; /// Get GPU arch from -mcpu without checking. StringRef getGPUArch(const llvm::opt::ArgList &DriverArgs) const; diff --git a/clang/lib/Driver/ToolChains/HIP.cpp b/clang/lib/Driver/ToolChains/HIP.cpp index 80df246..28d4e5d 100644 --- a/clang/lib/Driver/ToolChains/HIP.cpp +++ b/clang/lib/Driver/ToolChains/HIP.cpp @@ -459,3 +459,28 @@ HIPToolChain::getHIPDeviceLibs(const llvm::opt::ArgList &DriverArgs) const { return BCLibs; } + +void HIPToolChain::checkTargetID(const llvm::opt::ArgList &DriverArgs) const { + auto PTID = getParsedTargetID(DriverArgs); + if (PTID.OptionalTargetID && !PTID.OptionalGPUArch) { + getDriver().Diag(clang::diag::err_drv_bad_target_id) + << PTID.OptionalTargetID.getValue(); + return; + } + + assert(PTID.OptionalFeatures && "Invalid return from getParsedTargetID"); + auto &FeatureMap = PTID.OptionalFeatures.getValue(); + // Sanitizer is not supported with xnack-. + if (DriverArgs.hasFlag(options::OPT_fgpu_sanitize, + options::OPT_fno_gpu_sanitize, false)) { + auto Loc = FeatureMap.find("xnack"); + if (Loc != FeatureMap.end() && !Loc->second) { + auto &Diags = getDriver().getDiags(); + auto DiagID = Diags.getCustomDiagID( + DiagnosticsEngine::Error, + "'-fgpu-sanitize' is not compatible with offload arch '%0'. " + "Use an offload arch without 'xnack-' instead"); + Diags.Report(DiagID) << PTID.OptionalTargetID.getValue(); + } + } +} diff --git a/clang/lib/Driver/ToolChains/HIP.h b/clang/lib/Driver/ToolChains/HIP.h index a9e1ed9..3cced0a 100644 --- a/clang/lib/Driver/ToolChains/HIP.h +++ b/clang/lib/Driver/ToolChains/HIP.h @@ -95,6 +95,7 @@ public: unsigned GetDefaultDwarfVersion() const override { return 4; } const ToolChain &HostTC; + void checkTargetID(const llvm::opt::ArgList &DriverArgs) const override; protected: Tool *buildLinker() const override; diff --git a/clang/test/Driver/hip-sanitize-options.hip b/clang/test/Driver/hip-sanitize-options.hip index 19b0986..3b0328b 100644 --- a/clang/test/Driver/hip-sanitize-options.hip +++ b/clang/test/Driver/hip-sanitize-options.hip @@ -25,6 +25,11 @@ // RUN: -nogpuinc --rocm-path=%S/Inputs/rocm-invalid \ // RUN: %s 2>&1 | FileCheck -check-prefixes=FAIL %s +// RUN: %clang -### -target x86_64-unknown-linux-gnu --offload-arch=gfx900:xnack- \ +// RUN: -fsanitize=address -fgpu-sanitize \ +// RUN: -nogpuinc --rocm-path=%S/Inputs/rocm \ +// RUN: %s 2>&1 | FileCheck -check-prefix=XNACK %s + // CHECK-NOT: {{"[^"]*clang[^"]*".* "-fcuda-is-device".* "-fsanitize=address"}} // CHECK-NOT: {{"[^"]*lld(\.exe){0,1}".* ".*hip.bc"}} // CHECK: {{"[^"]*clang[^"]*".* "-triple" "x86_64-unknown-linux-gnu".* "-fsanitize=address"}} @@ -38,3 +43,5 @@ // RDC: {{"[^"]*lld(\.exe){0,1}".*}} "[[OUT]]" {{".*asanrtl.bc" ".*hip.bc"}} // FAIL: AMDGPU address sanitizer runtime library (asanrtl) is not found. Please install ROCm device library which supports address sanitizer + +// XNACK: error: '-fgpu-sanitize' is not compatible with offload arch 'gfx900:xnack-'. Use an offload arch without 'xnack-' instead -- 2.7.4