[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGc5e5b54350fe: [CUDA] Add driver support for compiling CUDA with the new driver (authored by jhuber6). Changed prior to commit:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

rnk added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra accepted this revision. tra added a comment. This revision is now accepted and ready to land. In D120272#3475155 , @jhuber6 wrote: > Changing this to simply require that the user manually passes `-fgpu-rdc` in > order to use the new driver. I think

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 425261. jhuber6 added a comment. Changing this to simply require that the user manually passes `-fgpu-rdc` in order to use the new driver. I think this makes more sense in the short term and we can move to make the new driver the default rdc approach later.

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 424543. jhuber6 added a comment. Making suggested changes. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/Cuda.h

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6225 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasArg(options::OPT_fno_gpu_rdc) && IsCudaDevice && +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added a subscriber: rnk. tra added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6225 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasArg(options::OPT_fno_gpu_rdc) && IsCudaDevice

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 424537. jhuber6 added a comment. Adding warning for using both -fno-gpu-rdc and -foffload-new-driver. I think this is a good warning to have for now while this is being worked in as opt-in. Once this has matured I plan on adding the necessary logic to

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6224 if (IsCuda || IsHIP) { -if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) +if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false) || +

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added a comment. Ping Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 ___ cfe-commits mailing list cfe-commits@lists.llvm.org

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 423685. jhuber6 added a comment. Making suggested changes. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/Cuda.h

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added a comment. Thank you for adding the compilation pipeline tests. LGTM overall. Comment at: clang/lib/Driver/ToolChains/Clang.cpp:6223-6226 if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) CmdArgs.push_back("-fgpu-rdc"); +if

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 423645. jhuber6 added a comment. Herald added a subscriber: mattd. Adding new test for CUDA phases. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 421270. jhuber6 added a comment. Make `-foffload-new-driver` imply GPU-RDC mode, it won't work otherwise. Also adjust tests. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

MaskRay added inline comments. Comment at: clang/test/Driver/cuda-openmp-driver.cu:1 +// REQUIRES: clang-driver +// REQUIRES: x86-registered-target clang-driver is unneeded. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

MaskRay added inline comments. Comment at: clang/test/Driver/cuda-openmp-driver.cu:10 +// CHECK: "nvptx64-nvidia-cuda" - "clang", inputs: ["[[INPUT:.+]]"], output: "[[PTX_SM_35:.+]]" +// CHECK: "nvptx64-nvidia-cuda" - "NVPTX::Assembler", inputs: ["[[PTX_SM_35]]"], output:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 421232. jhuber6 added a comment. Update with the more generic clang argument handling. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 416292. jhuber6 added a comment. Addressing comments Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/Cuda.h

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/include/clang/Basic/Cuda.h:105-107 +constexpr CudaArch DefaultCudaArch = CudaArch::SM_35; +constexpr CudaArch DefaultHIPArch = CudaArch::GFX803; + tra wrote: > Nit: those could be just enum values. > ``` > ... >

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/include/clang/Basic/Cuda.h:105-107 +constexpr CudaArch DefaultCudaArch = CudaArch::SM_35; +constexpr CudaArch DefaultHIPArch = CudaArch::GFX803; + Nit: those could be just enum values. ``` ... LAST,

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 415622. jhuber6 added a comment. Fix wrong condition for picking up input. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/Cuda.h

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 415460. jhuber6 added a comment. Accidentally clang formatted an entire file. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 415439. jhuber6 added a comment. We shouldn't need to restrict this to RDC only if implemented properly. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 414371. jhuber6 added a comment. Herald added subscribers: abrachet, phosek. Fix architecture parsing and still include the GPU binary so cuobjcopy can use them. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4132-4134 + Archs.insert(CudaArchToString(CudaArch::SM_35)); +else if (Kind == Action::OFK_HIP) + Archs.insert(CudaArchToString(CudaArch::GFX803)); tra wrote: > JonChesterfield

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 413087. jhuber6 added a comment. Herald added a subscriber: dexonsmith. Addressing nits. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4132-4134 + Archs.insert(CudaArchToString(CudaArch::SM_35)); +else if (Kind == Action::OFK_HIP) + Archs.insert(CudaArchToString(CudaArch::GFX803)); JonChesterfield wrote: > tra

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

JonChesterfield added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4132-4134 + Archs.insert(CudaArchToString(CudaArch::SM_35)); +else if (Kind == Action::OFK_HIP) + Archs.insert(CudaArchToString(CudaArch::GFX803)); tra wrote: > If we do

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

tra added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4107 + options::OPT_no_offload_arch_EQ)) { +C.getDriver().Diag(diag::err_opt_not_valid_with_opt) << "--offload-arch" + <<

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 412996. jhuber6 added a comment. Fix Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/DiagnosticDriverKinds.td

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 412908. jhuber6 added a comment. Correctly handle offloading architecture options. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files:

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4099-4102 + for (auto : Args.getAllArgValues(options::OPT_offload_arch_EQ)) +Archs.insert(getCanonicalArchString(C, Args, Arg, Kind)); + for (auto :

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

yaxunl added inline comments. Comment at: clang/lib/Driver/Driver.cpp:4099-4102 + for (auto : Args.getAllArgValues(options::OPT_offload_arch_EQ)) +Archs.insert(getCanonicalArchString(C, Args, Arg, Kind)); + for (auto :

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 412821. jhuber6 added a comment. Adding test Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/DiagnosticDriverKinds.td

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 412816. jhuber6 added a comment. Adding comments Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/ https://reviews.llvm.org/D120272 Files: clang/include/clang/Basic/DiagnosticDriverKinds.td

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 updated this revision to Diff 412812. jhuber6 added a comment. Herald added a subscriber: dang. Herald added a project: All. Updating, embed fatbinaries now and small changes. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120272/new/

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jdoerfert added a comment. Tests? Comment at: clang/lib/Driver/Driver.cpp:3956 LA = C.MakeAction(LinkerInputs, types::TY_Image); - LA->propagateHostOffloadInfo(OffloadKinds, + LA->propagateHostOffloadInfo(C.getActiveOffloadKinds(),

[PATCH] D120272: [CUDA] Add driver support for compiling CUDA with the new driver

jhuber6 created this revision. jhuber6 added reviewers: jdoerfert, JonChesterfield, tra, yaxunl. Herald added a subscriber: carlosgalvezp. jhuber6 requested review of this revision. Herald added subscribers: cfe-commits, sstefan1. Herald added a project: clang. This patch adds the basic support