Skip to content

Commit debfa43

Browse files
committed
[Clang][NFC] Clang-format CUDA toolchain file
Summary: This file is not formatted, which makes further changes to it more difficult. Format it.
1 parent 237ca43 commit debfa43

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

clang/lib/Driver/ToolChains/Cuda.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,10 @@ void NVPTX::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
445445
if (std::string(OutputFileName) != std::string(Output.getFilename()))
446446
C.addTempFile(OutputFileName);
447447
CmdArgs.push_back(OutputFileName);
448-
for (const auto& II : Inputs)
448+
for (const auto &II : Inputs)
449449
CmdArgs.push_back(Args.MakeArgString(II.getFilename()));
450450

451-
for (const auto& A : Args.getAllArgValues(options::OPT_Xcuda_ptxas))
451+
for (const auto &A : Args.getAllArgValues(options::OPT_Xcuda_ptxas))
452452
CmdArgs.push_back(Args.MakeArgString(A));
453453

454454
bool Relocatable = false;
@@ -458,8 +458,8 @@ void NVPTX::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
458458
options::OPT_fnoopenmp_relocatable_target,
459459
/*Default=*/true);
460460
else if (JA.isOffloading(Action::OFK_Cuda))
461-
Relocatable = Args.hasFlag(options::OPT_fgpu_rdc,
462-
options::OPT_fno_gpu_rdc, /*Default=*/false);
461+
Relocatable = Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
462+
/*Default=*/false);
463463

464464
if (Relocatable)
465465
CmdArgs.push_back("-c");
@@ -513,7 +513,7 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA,
513513
if (mustEmitDebugInfo(Args) == EmitSameDebugInfoAsHost)
514514
CmdArgs.push_back("-g");
515515

516-
for (const auto& II : Inputs) {
516+
for (const auto &II : Inputs) {
517517
auto *A = II.getAction();
518518
assert(A->getInputs().size() == 1 &&
519519
"Device offload action is expected to have a single input");
@@ -535,7 +535,7 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA,
535535
",file=" + getToolChain().getInputFilename(II)));
536536
}
537537

538-
for (const auto& A : Args.getAllArgValues(options::OPT_Xcuda_fatbinary))
538+
for (const auto &A : Args.getAllArgValues(options::OPT_Xcuda_fatbinary))
539539
CmdArgs.push_back(Args.MakeArgString(A));
540540

541541
const char *Exec = Args.MakeArgString(TC.GetProgramPath("fatbinary"));
@@ -619,8 +619,7 @@ std::string CudaToolChain::getInputFilename(const InputInfo &Input) const {
619619
}
620620

621621
void CudaToolChain::addClangTargetOptions(
622-
const llvm::opt::ArgList &DriverArgs,
623-
llvm::opt::ArgStringList &CC1Args,
622+
const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args,
624623
Action::OffloadKind DeviceOffloadingKind) const {
625624
HostTC.addClangTargetOptions(DriverArgs, CC1Args, DeviceOffloadingKind);
626625

@@ -781,7 +780,8 @@ CudaToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
781780

782781
if (!BoundArch.empty()) {
783782
DAL->eraseArg(options::OPT_march_EQ);
784-
DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_march_EQ), BoundArch);
783+
DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_march_EQ),
784+
BoundArch);
785785
}
786786
return DAL;
787787
}

clang/lib/Driver/ToolChains/Cuda.h

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,29 @@ namespace NVPTX {
8282

8383
// Run ptxas, the NVPTX assembler.
8484
class LLVM_LIBRARY_VISIBILITY Assembler : public Tool {
85-
public:
86-
Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {}
85+
public:
86+
Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {}
8787

88-
bool hasIntegratedCPP() const override { return false; }
88+
bool hasIntegratedCPP() const override { return false; }
8989

90-
void ConstructJob(Compilation &C, const JobAction &JA,
91-
const InputInfo &Output, const InputInfoList &Inputs,
92-
const llvm::opt::ArgList &TCArgs,
93-
const char *LinkingOutput) const override;
90+
void ConstructJob(Compilation &C, const JobAction &JA,
91+
const InputInfo &Output, const InputInfoList &Inputs,
92+
const llvm::opt::ArgList &TCArgs,
93+
const char *LinkingOutput) const override;
9494
};
9595

9696
// Runs fatbinary, which combines GPU object files ("cubin" files) and/or PTX
9797
// assembly into a single output file.
9898
class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
99-
public:
100-
Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {}
99+
public:
100+
Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {}
101101

102-
bool hasIntegratedCPP() const override { return false; }
102+
bool hasIntegratedCPP() const override { return false; }
103103

104-
void ConstructJob(Compilation &C, const JobAction &JA,
105-
const InputInfo &Output, const InputInfoList &Inputs,
106-
const llvm::opt::ArgList &TCArgs,
107-
const char *LinkingOutput) const override;
104+
void ConstructJob(Compilation &C, const JobAction &JA,
105+
const InputInfo &Output, const InputInfoList &Inputs,
106+
const llvm::opt::ArgList &TCArgs,
107+
const char *LinkingOutput) const override;
108108
};
109109

110110
void getNVPTXTargetFeatures(const Driver &D, const llvm::Triple &Triple,
@@ -130,9 +130,10 @@ class LLVM_LIBRARY_VISIBILITY CudaToolChain : public ToolChain {
130130
llvm::opt::DerivedArgList *
131131
TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,
132132
Action::OffloadKind DeviceOffloadKind) const override;
133-
void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
134-
llvm::opt::ArgStringList &CC1Args,
135-
Action::OffloadKind DeviceOffloadKind) const override;
133+
void
134+
addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
135+
llvm::opt::ArgStringList &CC1Args,
136+
Action::OffloadKind DeviceOffloadKind) const override;
136137

137138
llvm::DenormalMode getDefaultDenormalModeForType(
138139
const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
@@ -186,8 +187,8 @@ class LLVM_LIBRARY_VISIBILITY CudaToolChain : public ToolChain {
186187
getSystemGPUArchs(const llvm::opt::ArgList &Args) const override;
187188

188189
protected:
189-
Tool *buildAssembler() const override; // ptxas
190-
Tool *buildLinker() const override; // fatbinary (ok, not really a linker)
190+
Tool *buildAssembler() const override; // ptxas
191+
Tool *buildLinker() const override; // fatbinary (ok, not really a linker)
191192
};
192193

193194
} // end namespace toolchains

0 commit comments

Comments
 (0)