llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Joseph Huber (jhuber6) <details> <summary>Changes</summary> Summary: These commands both do the same thing and behave like the same tool. Now, the `nvptx-arch` and `amdgpu-arch` tools cause it to only emit architectures for that name. --- Full diff: https://github.com/llvm/llvm-project/pull/147558.diff 3 Files Affected: - (modified) clang/include/clang/Driver/Options.td (+4-2) - (modified) clang/lib/Driver/ToolChains/AMDGPU.cpp (+1-1) - (modified) clang/lib/Driver/ToolChains/Cuda.cpp (+1-1) ``````````diff diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 4f453aa8b7732..242a6a9a83514 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1173,10 +1173,12 @@ def offload_host_device : Flag<["--"], "offload-host-device">, def gpu_use_aux_triple_only : Flag<["--"], "gpu-use-aux-triple-only">, InternalDriverOpt, HelpText<"Prepare '-aux-triple' only without populating " "'-aux-target-cpu' and '-aux-target-feature'.">; +def offload_arch_tool_EQ : Joined<["--"], "offload-arch-tool=">, + HelpText<"Tool used for detecting offloading architectures in the system.">; def amdgpu_arch_tool_EQ : Joined<["--"], "amdgpu-arch-tool=">, - HelpText<"Tool used for detecting AMD GPU arch in the system.">; + Alias<offload_arch_tool_EQ>; def nvptx_arch_tool_EQ : Joined<["--"], "nvptx-arch-tool=">, - HelpText<"Tool used for detecting NVIDIA GPU arch in the system.">; + Alias<offload_arch_tool_EQ>; defm gpu_rdc : BoolFOption<"gpu-rdc", LangOpts<"GPURelocatableDeviceCode">, DefaultFalse, diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index b7564a0495da8..7fc34f451f183 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -836,7 +836,7 @@ Expected<SmallVector<std::string>> AMDGPUToolChain::getSystemGPUArchs(const ArgList &Args) const { // Detect AMD GPUs availible on the system. std::string Program; - if (Arg *A = Args.getLastArg(options::OPT_amdgpu_arch_tool_EQ)) + if (Arg *A = Args.getLastArg(options::OPT_offload_arch_tool_EQ)) Program = A->getValue(); else Program = GetProgramPath("amdgpu-arch"); diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index b92c18f1b60f5..2373d945ae509 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -810,7 +810,7 @@ Expected<SmallVector<std::string>> NVPTXToolChain::getSystemGPUArchs(const ArgList &Args) const { // Detect NVIDIA GPUs availible on the system. std::string Program; - if (Arg *A = Args.getLastArg(options::OPT_nvptx_arch_tool_EQ)) + if (Arg *A = Args.getLastArg(options::OPT_offload_arch_tool_EQ)) Program = A->getValue(); else Program = GetProgramPath("nvptx-arch"); `````````` </details> https://github.com/llvm/llvm-project/pull/147558 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
