[AMDGPU][clang] Fix clang driver check for multiple sanitizer arguments

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -133,6 +133,9 @@ def warn_drv_unsupported_option_for_offload_arch_req_feature : Warning<
 def warn_drv_unsupported_option_for_target : Warning<
  "ignoring '%0' option as it is not currently supported for target '%1'">,
  InGroup<OptionIgnored>;
+def warn_drv_unsupported_option_part_for_target : Warning<
+ "ignoring '%0' in '%1' option as it is not currently supported for target '%2'">,
+ InGroup<OptionIgnored>;
 def warn_drv_invalid_argument_for_flang : Warning<
  "'%0' is not valid for Fortran">,
  InGroup<OptionIgnored>;

clang/lib/Driver/ToolChains/AMDGPU.cpp

@@ -1074,27 +1074,32 @@ ROCMToolChain::getCommonDeviceLibNames(
  getSanitizerArgs(DriverArgs).needsAsanRt());
 }
 
-bool AMDGPUToolChain::shouldSkipSanitizeOption(
+std::optional<std::string> AMDGPUToolChain::filterSanitizeOption(
  const ToolChain &TC, const llvm::opt::ArgList &DriverArgs,
  StringRef TargetID, const llvm::opt::Arg *A) const {
  // For actions without targetID, do nothing.
  if (TargetID.empty())
- return false;
+ return std::nullopt;
  Option O = A->getOption();
 
  if (!O.matches(options::OPT_fsanitize_EQ))
- return false;
+ return std::nullopt;
 
  if (!DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
  options::OPT_fno_gpu_sanitize, true))
- return true;
+ return "";
 
  auto &Diags = TC.getDriver().getDiags();
 
- // For simplicity, we only allow -fsanitize=address
- SanitizerMask K = parseSanitizerValue(A->getValue(), /*AllowGroups=*/false);
- if (K != SanitizerKind::Address)
- return true;
+ // We only allow the address sanitizer and ignore all other sanitizers.
+ SmallVector<std::string, 4> SupportedSanitizers;
+ for (const char *Value : A->getValues()) {
+ SanitizerMask K = parseSanitizerValue(Value, /*AllowGroups=*/false);
+ if (K == SanitizerKind::Address)
+ SupportedSanitizers.push_back(std::string(Value));
+ }
+ if (SupportedSanitizers.empty())
+ return "";
 
  // Check 'xnack+' availability by default
  llvm::StringRef Processor =
@@ -1106,7 +1111,7 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
  ? llvm::AMDGPU::getArchAttrAMDGCN(ProcKind)
  : llvm::AMDGPU::getArchAttrR600(ProcKind);
  if (Features & llvm::AMDGPU::FEATURE_XNACK_ALWAYS)
- return false;
+ return std::nullopt;
 
  // Look for the xnack feature in TargetID
  llvm::StringMap<bool> FeatureMap;
@@ -1118,7 +1123,8 @@ bool AMDGPUToolChain::shouldSkipSanitizeOption(
  Diags.Report(
  clang::diag::warn_drv_unsupported_option_for_offload_arch_req_feature)
  << A->getAsString(DriverArgs) << TargetID << "xnack+";
- return true;
+ return "";
  }
- return false;
+
+ return llvm::join(SupportedSanitizers, ",");
 }

clang/lib/Driver/ToolChains/AMDGPU.h

@@ -101,11 +101,13 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUToolChain : public Generic_ELF {
  /// Needed for translating LTO options.
  const char *getDefaultLinker() const override { return "ld.lld"; }
 
- /// Should skip sanitize options.
- bool shouldSkipSanitizeOption(const ToolChain &TC,
- const llvm::opt::ArgList &DriverArgs,
- StringRef TargetID,
- const llvm::opt::Arg *A) const;
+ /// Filter supported sanitizers from the sanitize option and return them. If
+ /// there should be no filtering and Arg should be kept as-is, return
+ /// std::nullopt. If no sanitizers are supported, return an empty string.
+ std::optional<std::string>
+ filterSanitizeOption(const ToolChain &TC,
+ const llvm::opt::ArgList &DriverArgs, StringRef TargetID,
+ const llvm::opt::Arg *A) const;
 
  /// Uses amdgpu-arch tool to get arch of the system GPU. Will return error
  /// if unable to find one.
@@ -161,11 +163,12 @@ class LLVM_LIBRARY_VISIBILITY ROCMToolChain : public AMDGPUToolChain {
  return;
  auto &Diags = getDriver().getDiags();
  for (auto *A : Args.filtered(options::OPT_fsanitize_EQ)) {
- SanitizerMask K =
- parseSanitizerValue(A->getValue(), /*Allow Groups*/ false);
- if (K != SanitizerKind::Address)
- Diags.Report(clang::diag::warn_drv_unsupported_option_for_target)
- << A->getAsString(Args) << getTriple().str();
+ for (const char *Value : A->getValues()) {
+ SanitizerMask K = parseSanitizerValue(Value, /*Allow Groups*/ false);
+ if (K != SanitizerKind::Address)
+ Diags.Report(clang::diag::warn_drv_unsupported_option_part_for_target)
+ << Value << A->getAsString(Args) << getTriple().str();
+ }
  }
  }
 };

clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp

@@ -66,16 +66,20 @@ llvm::opt::DerivedArgList *AMDGPUOpenMPToolChain::TranslateArgs(
 
  const OptTable &Opts = getDriver().getOpts();
 
- // Skip sanitize options passed from the HostTC. Claim them early.
+ // Skip sanitize options passed from the HostTC. Remove them early.
  // The decision to sanitize device code is computed only by
  // 'shouldSkipSanitizeOption'.
  if (DAL->hasArg(options::OPT_fsanitize_EQ))
- DAL->claimAllArgs(options::OPT_fsanitize_EQ);
+ DAL->eraseArg(options::OPT_fsanitize_EQ);
 
- for (Arg *A : Args)
- if (!shouldSkipSanitizeOption(*this, Args, BoundArch, A) &&
- !llvm::is_contained(*DAL, A))
+ for (Arg *A : Args) {
+ std::optional<std::string> SupportedSanitizers =
+ filterSanitizeOption(*this, Args, BoundArch, A);
+ if (!SupportedSanitizers)
  DAL->append(A);
+ else if (!SupportedSanitizers->empty())
+ DAL->AddJoinedArg(A, A->getOption(), *SupportedSanitizers);
+ }
 
  if (!BoundArch.empty()) {
  DAL->eraseArg(options::OPT_march_EQ);

clang/lib/Driver/ToolChains/HIPAMD.cpp

@@ -291,9 +291,19 @@ HIPAMDToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
 
  const OptTable &Opts = getDriver().getOpts();
 
+ // Skip sanitize options passed from the HostTC. Remove them early.
+ // The decision to sanitize device code is computed only by
+ // 'shouldSkipSanitizeOption'.
+ if (DAL->hasArg(options::OPT_fsanitize_EQ))
+ DAL->eraseArg(options::OPT_fsanitize_EQ);
+
  for (Arg *A : Args) {
- if (!shouldSkipSanitizeOption(*this, Args, BoundArch, A))
+ std::optional<std::string> SupportedSanitizers =
+ filterSanitizeOption(*this, Args, BoundArch, A);
+ if (!SupportedSanitizers)
  DAL->append(A);
+ else if (!SupportedSanitizers->empty())
+ DAL->AddJoinedArg(A, A->getOption(), *SupportedSanitizers);
  }
 
  if (!BoundArch.empty()) {

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

@@ -52,13 +52,27 @@
 // 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=HOSTSAN,NOGPUSAN,SAN %s
 
+// Catch invalid combination of sanitizers regardless of their order and ignore
+// them selectively.
+// (The address sanitizer enables the device sanitizer pipeline. The fuzzer
+// implicitly turns on LLVMs SanitizerCoverage, which the driver then forwards
+// to the device cc1. SanitizerCoverage is not supported on amdgcn.)
+// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=address,fuzzer --rocm-path=%S/Inputs/rocm %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=HOSTSANCOMBINATION,INVALIDCOMBINATION1 %s
+// RUN: %clang -no-canonical-prefixes -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp --offload-arch=gfx908:xnack+ -fsanitize=fuzzer,address --rocm-path=%S/Inputs/rocm %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=HOSTSANCOMBINATION,INVALIDCOMBINATION2 %s
+
+// INVALIDCOMBINATION1: warning: ignoring 'fuzzer' in '-fsanitize=address,fuzzer' option as it is not currently supported for target 'amdgcn-amd-amdhsa' [-Woption-ignored]
+// INVALIDCOMBINATION2: warning: ignoring 'fuzzer' in '-fsanitize=fuzzer,address' option as it is not currently supported for target 'amdgcn-amd-amdhsa' [-Woption-ignored]
+
 // 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'
+// NOTSUPPORTED-DAG: warning: ignoring 'leak' in '-fsanitize=leak' option as it is not currently supported for target 'amdgcn-amd-amdhsa'
 
 // 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
 
 // HOSTSAN: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address".* "--offload-targets=amdgcn-amd-amdhsa".* "-x" "c".*}}
+// HOSTSANCOMBINATION: {{"[^"]*clang[^"]*" "-cc1" "-triple" "x86_64-unknown-linux-gnu".* "-fopenmp".* "-fsanitize=address,fuzzer,fuzzer-no-link".* "--offload-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|gfx1250|gfx1251)".* "-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".*}}

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

@@ -52,6 +52,18 @@
 // RUN: -fsanitize=leak -nogpuinc --rocm-path=%S/Inputs/rocm \
 // RUN: %s 2>&1 | FileCheck -check-prefixes=NOGPUNEG %s
 
+// Catch invalid combination of sanitizers regardless of their order and ignore
+// them selectively.
+// (The address sanitizer enables the device sanitizer pipeline. The fuzzer
+// implicitly turns on LLVMs SanitizerCoverage, which the driver then forwards
+// to the device cc1. SanitizerCoverage is not supported on amdgcn.)
+// RUN: %clang -### --target=x86_64-unknown-linux-gnu --offload-arch=gfx900:xnack+ \
+// RUN: -fsanitize=address,fuzzer --rocm-path=%S/Inputs/rocm %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=INVALIDCOMBINATION,INVALIDCOMBINATION1 %s
+// RUN: %clang -### --target=x86_64-unknown-linux-gnu --offload-arch=gfx900:xnack+ \
+// RUN: -fsanitize=fuzzer,address --rocm-path=%S/Inputs/rocm %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=INVALIDCOMBINATION,INVALIDCOMBINATION2 %s
+
 // CHECK-NOT: {{"[^"]*clang[^"]*".* "-fcuda-is-device".* "-fsanitize=address"}}
 // CHECK-NOT: {{"[^"]*clang[^"]*".* "-fcuda-is-device".* "-mlink-bitcode-file" ".*asanrtl.bc"}}
 // CHECK-NOT: {{"[^"]*lld(\.exe){0,1}".* ".*hip.bc"}}
@@ -67,7 +79,7 @@
 
 // FAIL: 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
 
-// XNACK-DAG: warning: ignoring '-fsanitize=leak' option as it is not currently supported for target 'amdgcn-amd-amdhsa'
+// XNACK-DAG: warning: ignoring 'leak' in '-fsanitize=leak' option as it is not currently supported for target 'amdgcn-amd-amdhsa'
 // XNACK-DAG: warning: ignoring '-fsanitize=address' option for offload arch 'gfx900:xnack-' as it is not currently supported there. Use it with an offload arch containing 'xnack+' instead
 // XNACK-DAG: warning: ignoring '-fsanitize=address' option for offload arch 'gfx906' as it is not currently supported there. Use it with an offload arch containing 'xnack+' instead
 // XNACK-DAG: {{"[^"]*clang[^"]*".* "-mlink-bitcode-file" ".*asanrtl.bc".* "-target-cpu" "gfx900".* "-target-feature" "\+xnack".* "-fsanitize=address"}}
@@ -101,3 +113,8 @@
 // NOGPUNEG-NOT: {{"[^"]*clang[^"]*".* "-mlink-bitcode-file" ".*asanrtl.bc".* "-target-cpu" "gfx900".* "-target-feature" "-xnack"}}
 // NOGPUNEG-NOT: {{"[^"]*clang[^"]*".* "-mlink-bitcode-file" ".*asanrtl.bc".* "-target-cpu" "gfx906"}}
 // NOGPUNEG-NOT: {{"[^"]*lld(\.exe){0,1}".* ".*hip.bc"}}
+
+// INVALIDCOMBINATION1-DAG: warning: ignoring 'fuzzer' in '-fsanitize=address,fuzzer' option as it is not currently supported for target 'amdgcn-amd-amdhsa' [-Woption-ignored]
+// INVALIDCOMBINATION2-DAG: warning: ignoring 'fuzzer' in '-fsanitize=fuzzer,address' option as it is not currently supported for target 'amdgcn-amd-amdhsa' [-Woption-ignored]
+// INVALIDCOMBINATION-DAG: {{"[^"]*clang[^"]*".* "-mlink-bitcode-file" ".*asanrtl.bc".* "-target-cpu" "gfx900".* "-target-feature" "\+xnack".* "-fsanitize=address"}}
+// INVALIDCOMBINATION-DAG: {{"[^"]*clang[^"]*".* "-triple" "x86_64-unknown-linux-gnu".* "-fsanitize=address,fuzzer,fuzzer-no-link"}}