Author: jlebar Date: Thu Dec 15 12:44:57 2016 New Revision: 289847 URL: http://llvm.org/viewvc/llvm-project?rev=289847&view=rev Log: [CUDA] Add --ptxas-path= flag.
Summary: This lets you build with one CUDA installation but use ptxas from another install. This is useful e.g. if you want to avoid bugs in an old ptxas without actually upgrading wholesale to a newer CUDA version. Reviewers: tra Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D27788 Added: cfe/trunk/test/Driver/cuda-ptxas-path.cu Modified: cfe/trunk/include/clang/Driver/Options.td cfe/trunk/lib/Driver/Tools.cpp Modified: cfe/trunk/include/clang/Driver/Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=289847&r1=289846&r2=289847&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Thu Dec 15 12:44:57 2016 @@ -425,6 +425,8 @@ def no_cuda_version_check : Flag<["--"], def no_cuda_noopt_device_debug : Flag<["--"], "no-cuda-noopt-device-debug">; def cuda_path_EQ : Joined<["--"], "cuda-path=">, Group<i_Group>, HelpText<"CUDA installation path">; +def ptxas_path_EQ : Joined<["--"], "ptxas-path=">, Group<i_Group>, + HelpText<"Path to ptxas (used for compiling CUDA code)">; def fcuda_flush_denormals_to_zero : Flag<["-"], "fcuda-flush-denormals-to-zero">, Flags<[CC1Option]>, HelpText<"Flush denormal floating point values to zero in CUDA device mode.">; def fno_cuda_flush_denormals_to_zero : Flag<["-"], "fno-cuda-flush-denormals-to-zero">; Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=289847&r1=289846&r2=289847&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Thu Dec 15 12:44:57 2016 @@ -12105,7 +12105,11 @@ void NVPTX::Assembler::ConstructJob(Comp for (const auto& A : Args.getAllArgValues(options::OPT_Xcuda_ptxas)) CmdArgs.push_back(Args.MakeArgString(A)); - const char *Exec = Args.MakeArgString(TC.GetProgramPath("ptxas")); + const char *Exec; + if (Arg *A = Args.getLastArg(options::OPT_ptxas_path_EQ)) + Exec = A->getValue(); + else + Exec = Args.MakeArgString(TC.GetProgramPath("ptxas")); C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); } Added: cfe/trunk/test/Driver/cuda-ptxas-path.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda-ptxas-path.cu?rev=289847&view=auto ============================================================================== --- cfe/trunk/test/Driver/cuda-ptxas-path.cu (added) +++ cfe/trunk/test/Driver/cuda-ptxas-path.cu Thu Dec 15 12:44:57 2016 @@ -0,0 +1,12 @@ +// REQUIRES: clang-driver +// REQUIRES: x86-registered-target +// REQUIRES: nvptx-registered-target + +// RUN: %clang -### --target=i386-unknown-linux \ +// RUN: --cuda-path=%S/Inputs/CUDA_80/usr/local/cuda \ +// RUN: --ptxas-path=/some/path/to/ptxas %s 2>&1 \ +// RUN: | FileCheck %s + +// CHECK-NOT: "ptxas" +// CHECK: "/some/path/to/ptxas" +// CHECK-SAME: "--gpu-name" "sm_20" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
