Unverified Commit bcd75cb4 authored by Matt Arsenault's avatar Matt Arsenault Committed by GitHub
Browse files

clang: Fix using sm_52 as default subtarget for cuda spirv (#195369) 

Copy what the HIP path does, except use "Unused" instead of "Generic".
Avoids assertions in future patch.
parent c7b967a3

clang/lib/Driver/Driver.cpp

+3 −1
Original line number Diff line number Diff line
@@ -4922,7 +4922,9 @@ Driver::getOffloadArchs(Compilation &C, const llvm::opt::DerivedArgList &Args, 
  // Fill in the default architectures if not provided explicitly.

  if (Archs.empty()) {

    if (Kind == Action::OFK_Cuda) {

      Archs.insert(OffloadArchToString(OffloadArch::CudaDefault));

      Archs.insert(OffloadArchToString(TC.getTriple().isSPIRV()

                                           ? OffloadArch::Unused

                                           : OffloadArch::CudaDefault));

    } else if (Kind == Action::OFK_HIP) {

      Archs.insert(OffloadArchToString(TC.getTriple().isSPIRV()

                                           ? OffloadArch::Generic

clang/test/Driver/cuda-device-triple.cu

+2 −2
Original line number Diff line number Diff line 


// RUN: %clang -### -emit-llvm --cuda-device-only \

// RUN:   -nocudalib -nocudainc --offload=spirv32-unknown-unknown -c %s 2>&1 | FileCheck %s



// CHECK: "-cc1" "-triple" "spirv32-unknown-unknown" {{.*}} "-fcuda-is-device" {{.*}}
 
// Make sure there's no sm_* suffix on the output name

// CHECK: "-cc1" "-triple" "spirv32-unknown-unknown" {{.*}} "-fcuda-is-device" {{.*}} "-o" "cuda-device-triple-cuda-spirv32-unknown-unknown.bc"