From: Joseph Huber Date: Wed, 18 Jan 2023 23:07:02 +0000 (-0600) Subject: [Clang][NFC] Clang-format CUDA toolchain file X-Git-Tag: upstream/17.0.6~20508 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=debfa43117f458cd75e3d0a7b37f7622c7c67d40;p=platform%2Fupstream%2Fllvm.git [Clang][NFC] Clang-format CUDA toolchain file Summary: This file is not formatted, which makes further changes to it more difficult. Format it. --- diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index f2e575c..b5e45ae 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -445,10 +445,10 @@ void NVPTX::Assembler::ConstructJob(Compilation &C, const JobAction &JA, if (std::string(OutputFileName) != std::string(Output.getFilename())) C.addTempFile(OutputFileName); CmdArgs.push_back(OutputFileName); - for (const auto& II : Inputs) + for (const auto &II : Inputs) CmdArgs.push_back(Args.MakeArgString(II.getFilename())); - for (const auto& A : Args.getAllArgValues(options::OPT_Xcuda_ptxas)) + for (const auto &A : Args.getAllArgValues(options::OPT_Xcuda_ptxas)) CmdArgs.push_back(Args.MakeArgString(A)); bool Relocatable = false; @@ -458,8 +458,8 @@ void NVPTX::Assembler::ConstructJob(Compilation &C, const JobAction &JA, options::OPT_fnoopenmp_relocatable_target, /*Default=*/true); else if (JA.isOffloading(Action::OFK_Cuda)) - Relocatable = Args.hasFlag(options::OPT_fgpu_rdc, - options::OPT_fno_gpu_rdc, /*Default=*/false); + Relocatable = Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, + /*Default=*/false); if (Relocatable) CmdArgs.push_back("-c"); @@ -513,7 +513,7 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (mustEmitDebugInfo(Args) == EmitSameDebugInfoAsHost) CmdArgs.push_back("-g"); - for (const auto& II : Inputs) { + for (const auto &II : Inputs) { auto *A = II.getAction(); assert(A->getInputs().size() == 1 && "Device offload action is expected to have a single input"); @@ -535,7 +535,7 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA, ",file=" + getToolChain().getInputFilename(II))); } - for (const auto& A : Args.getAllArgValues(options::OPT_Xcuda_fatbinary)) + for (const auto &A : Args.getAllArgValues(options::OPT_Xcuda_fatbinary)) CmdArgs.push_back(Args.MakeArgString(A)); const char *Exec = Args.MakeArgString(TC.GetProgramPath("fatbinary")); @@ -619,8 +619,7 @@ std::string CudaToolChain::getInputFilename(const InputInfo &Input) const { } void CudaToolChain::addClangTargetOptions( - const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args, + const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadingKind) const { HostTC.addClangTargetOptions(DriverArgs, CC1Args, DeviceOffloadingKind); @@ -781,7 +780,8 @@ CudaToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args, if (!BoundArch.empty()) { DAL->eraseArg(options::OPT_march_EQ); - DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_march_EQ), BoundArch); + DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_march_EQ), + BoundArch); } return DAL; } diff --git a/clang/lib/Driver/ToolChains/Cuda.h b/clang/lib/Driver/ToolChains/Cuda.h index 8ee99d4..e34a6dd 100644 --- a/clang/lib/Driver/ToolChains/Cuda.h +++ b/clang/lib/Driver/ToolChains/Cuda.h @@ -82,29 +82,29 @@ namespace NVPTX { // Run ptxas, the NVPTX assembler. class LLVM_LIBRARY_VISIBILITY Assembler : public Tool { - public: - Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {} +public: + Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {} - bool hasIntegratedCPP() const override { return false; } + bool hasIntegratedCPP() const override { return false; } - void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const override; + void ConstructJob(Compilation &C, const JobAction &JA, + const InputInfo &Output, const InputInfoList &Inputs, + const llvm::opt::ArgList &TCArgs, + const char *LinkingOutput) const override; }; // Runs fatbinary, which combines GPU object files ("cubin" files) and/or PTX // assembly into a single output file. class LLVM_LIBRARY_VISIBILITY Linker : public Tool { - public: - Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {} +public: + Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {} - bool hasIntegratedCPP() const override { return false; } + bool hasIntegratedCPP() const override { return false; } - void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const override; + void ConstructJob(Compilation &C, const JobAction &JA, + const InputInfo &Output, const InputInfoList &Inputs, + const llvm::opt::ArgList &TCArgs, + const char *LinkingOutput) const override; }; void getNVPTXTargetFeatures(const Driver &D, const llvm::Triple &Triple, @@ -130,9 +130,10 @@ public: llvm::opt::DerivedArgList * TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch, Action::OffloadKind DeviceOffloadKind) const override; - void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args, - Action::OffloadKind DeviceOffloadKind) const override; + void + addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + Action::OffloadKind DeviceOffloadKind) const override; llvm::DenormalMode getDefaultDenormalModeForType( const llvm::opt::ArgList &DriverArgs, const JobAction &JA, @@ -186,8 +187,8 @@ public: getSystemGPUArchs(const llvm::opt::ArgList &Args) const override; protected: - Tool *buildAssembler() const override; // ptxas - Tool *buildLinker() const override; // fatbinary (ok, not really a linker) + Tool *buildAssembler() const override; // ptxas + Tool *buildLinker() const override; // fatbinary (ok, not really a linker) }; } // end namespace toolchains