Author: Artem Belevich Date: 2021-07-13T11:09:14-07:00 New Revision: 01d3a3dcabaf862581b1d1aee604fcee6a18b240
URL: https://github.com/llvm/llvm-project/commit/01d3a3dcabaf862581b1d1aee604fcee6a18b240 DIFF: https://github.com/llvm/llvm-project/commit/01d3a3dcabaf862581b1d1aee604fcee6a18b240.diff LOG: [CUDA] Only allow NVIDIA offload-arch during CUDA compilation. Otherwise, if someone specifies a valid AMD arch, we may end up triggering an assertion on unexpected arch later on. Differential Revision: https://reviews.llvm.org/D105295 Added: Modified: clang/lib/Driver/Driver.cpp clang/test/Driver/cuda-bad-arch.cu Removed: ################################################################################ diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 6ea6e2e47e639..cbc853370e89d 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -2785,7 +2785,7 @@ class OffloadingActionBuilder final { StringRef getCanonicalOffloadArch(StringRef ArchStr) override { CudaArch Arch = StringToCudaArch(ArchStr); - if (Arch == CudaArch::UNKNOWN) { + if (Arch == CudaArch::UNKNOWN || !IsNVIDIAGpuArch(Arch)) { C.getDriver().Diag(clang::diag::err_drv_cuda_bad_gpu_arch) << ArchStr; return StringRef(); } diff --git a/clang/test/Driver/cuda-bad-arch.cu b/clang/test/Driver/cuda-bad-arch.cu index 22a7be1e7d839..b60a04162b2e8 100644 --- a/clang/test/Driver/cuda-bad-arch.cu +++ b/clang/test/Driver/cuda-bad-arch.cu @@ -10,6 +10,8 @@ // RUN: | FileCheck -check-prefix BAD %s // RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_19 -c %s 2>&1 \ // RUN: | FileCheck -check-prefix BAD %s +// RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=gfx900 -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix BAD %s // BAD: error: Unsupported CUDA gpu architecture _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
