Skip to content

Commit 4db04af

Browse files
jinge90jinge90
authored
[SYCL][NFC] Clang format SYCL.cpp (#2891)
Signed-off-by: gejin <[email protected]>
1 parent 3d0caf2 commit 4db04af

File tree

1 file changed

+54
-58
lines changed

1 file changed

+54
-58
lines changed

‎clang/lib/Driver/ToolChains/SYCL.cpp

Lines changed: 54 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ using namespace clang::driver::tools;
2222
using namespace clang;
2323
using namespace llvm::opt;
2424

25-
const char *SYCL::Linker::constructLLVMSpirvCommand(Compilation &C,
26-
const JobAction &JA, const InputInfo &Output, StringRef OutputFilePrefix,
27-
bool ToBc, const char *InputFileName) const {
25+
const char *SYCL::Linker::constructLLVMSpirvCommand(
26+
Compilation &C, const JobAction &JA, const InputInfo &Output,
27+
StringRef OutputFilePrefix, bool ToBc, const char *InputFileName) const {
2828
// Construct llvm-spirv command.
2929
// The output is a bc file or vice versa depending on the -r option usage
3030
// llvm-spirv -r -o a_kernel.bc a_kernel.spv
@@ -33,7 +33,7 @@ const char *SYCL::Linker::constructLLVMSpirvCommand(Compilation &C,
3333
const char *OutputFileName = nullptr;
3434
if (ToBc) {
3535
std::string TmpName =
36-
C.getDriver().GetTemporaryPath(OutputFilePrefix.str() + "-spirv", "bc");
36+
C.getDriver().GetTemporaryPath(OutputFilePrefix.str() + "-spirv", "bc");
3737
OutputFileName = C.addTempFile(C.getArgs().MakeArgString(TmpName));
3838
CmdArgs.push_back("-r");
3939
CmdArgs.push_back("-o");
@@ -91,13 +91,13 @@ void SYCL::constructLLVMForeachCommand(Compilation &C, const JobAction &JA,
9191
SmallString<128> ForeachPath(C.getDriver().Dir);
9292
llvm::sys::path::append(ForeachPath, "llvm-foreach");
9393
const char *Foreach = C.getArgs().MakeArgString(ForeachPath);
94-
C.addCommand(std::make_unique<Command>(
95-
JA, *T, ResponseFileSupport::None(), Foreach, ForeachArgs, None));
94+
C.addCommand(std::make_unique<Command>(JA, *T, ResponseFileSupport::None(),
95+
Foreach, ForeachArgs, None));
9696
}
9797

98-
const char *SYCL::Linker::constructLLVMLinkCommand(Compilation &C,
99-
const JobAction &JA, const InputInfo &Output, const ArgList &Args,
100-
StringRef SubArchName, StringRef OutputFilePrefix,
98+
const char *SYCL::Linker::constructLLVMLinkCommand(
99+
Compilation &C, const JobAction &JA, const InputInfo &Output,
100+
const ArgList &Args, StringRef SubArchName, StringRef OutputFilePrefix,
101101
const InputInfoList &InputFiles) const {
102102
ArgStringList CmdArgs;
103103
// Add the input bc's created by compile step.
@@ -148,10 +148,11 @@ const char *SYCL::Linker::constructLLVMLinkCommand(Compilation &C,
148148
}
149149

150150
void SYCL::Linker::constructLlcCommand(Compilation &C, const JobAction &JA,
151-
const InputInfo &Output, const char *InputFileName) const {
151+
const InputInfo &Output,
152+
const char *InputFileName) const {
152153
// Construct llc command.
153154
// The output is an object file.
154-
ArgStringList LlcArgs{"-filetype=obj", "-o", Output.getFilename(),
155+
ArgStringList LlcArgs{"-filetype=obj", "-o", Output.getFilename(),
155156
InputFileName};
156157
SmallString<128> LlcPath(C.getDriver().Dir);
157158
llvm::sys::path::append(LlcPath, "llc");
@@ -164,12 +165,13 @@ void SYCL::Linker::constructLlcCommand(Compilation &C, const JobAction &JA,
164165
// a single SPIR-V binary. Input can also be bitcode when specified by
165166
// the user.
166167
void SYCL::Linker::ConstructJob(Compilation &C, const JobAction &JA,
167-
const InputInfo &Output,
168-
const InputInfoList &Inputs,
169-
const ArgList &Args,
170-
const char *LinkingOutput) const {
168+
const InputInfo &Output,
169+
const InputInfoList &Inputs,
170+
const ArgList &Args,
171+
const char *LinkingOutput) const {
171172

172-
assert((getToolChain().getTriple().isSPIR() || getToolChain().getTriple().isNVPTX()) &&
173+
assert((getToolChain().getTriple().isSPIR() ||
174+
getToolChain().getTriple().isNVPTX()) &&
173175
"Unsupported target");
174176

175177
std::string SubArchName =
@@ -205,9 +207,8 @@ void SYCL::Linker::ConstructJob(Compilation &C, const JobAction &JA,
205207
Args.hasArg(options::OPT_foffload_static_lib_EQ))
206208
SpirvInputs.push_back(II);
207209
else {
208-
const char *LLVMSpirvOutputFile =
209-
constructLLVMSpirvCommand(C, JA, Output, Prefix, true,
210-
II.getFilename());
210+
const char *LLVMSpirvOutputFile = constructLLVMSpirvCommand(
211+
C, JA, Output, Prefix, true, II.getFilename());
211212
SpirvInputs.push_back(InputInfo(types::TY_LLVM_BC, LLVMSpirvOutputFile,
212213
LLVMSpirvOutputFile));
213214
}
@@ -225,27 +226,24 @@ static const char *makeExeName(Compilation &C, StringRef Name) {
225226
return C.getArgs().MakeArgString(ExeName);
226227
}
227228

228-
void SYCL::fpga::BackendCompiler::ConstructJob(Compilation &C,
229-
const JobAction &JA,
230-
const InputInfo &Output,
231-
const InputInfoList &Inputs,
232-
const ArgList &Args,
233-
const char *LinkingOutput) const {
229+
void SYCL::fpga::BackendCompiler::ConstructJob(
230+
Compilation &C, const JobAction &JA, const InputInfo &Output,
231+
const InputInfoList &Inputs, const ArgList &Args,
232+
const char *LinkingOutput) const {
234233
assert((getToolChain().getTriple().getArch() == llvm::Triple::spir ||
235234
getToolChain().getTriple().getArch() == llvm::Triple::spir64) &&
236235
"Unsupported target");
237236

238237
InputInfoList ForeachInputs;
239238
InputInfoList FPGADepFiles;
240-
ArgStringList CmdArgs{"-o", Output.getFilename()};
239+
ArgStringList CmdArgs{"-o", Output.getFilename()};
241240
for (const auto &II : Inputs) {
242241
std::string Filename(II.getFilename());
243242
if (II.getType() == types::TY_Tempfilelist)
244243
ForeachInputs.push_back(II);
245244
if (II.getType() == types::TY_TempAOCOfilelist)
246245
// Add any FPGA library lists. These come in as special tempfile lists.
247-
CmdArgs.push_back(Args.MakeArgString(Twine("-library-list=") +
248-
Filename));
246+
CmdArgs.push_back(Args.MakeArgString(Twine("-library-list=") + Filename));
249247
else if (II.getType() == types::TY_FPGA_Dependencies ||
250248
II.getType() == types::TY_FPGA_Dependencies_List)
251249
FPGADepFiles.push_back(II);
@@ -311,10 +309,10 @@ void SYCL::fpga::BackendCompiler::ConstructJob(Compilation &C,
311309
// Depending on output file designations, set the report folder
312310
SmallString<128> ReportOptArg;
313311
if (Arg *FinalOutput = Args.getLastArg(options::OPT_o, options::OPT__SLASH_o,
314-
options::OPT__SLASH_Fe)) {
312+
options::OPT__SLASH_Fe)) {
315313
SmallString<128> FN(FinalOutput->getValue());
316314
llvm::sys::path::replace_extension(FN, "prj");
317-
const char * FolderName = Args.MakeArgString(FN);
315+
const char *FolderName = Args.MakeArgString(FN);
318316
ReportOptArg += FolderName;
319317
} else {
320318
// Output directory is based off of the first object name as captured
@@ -339,8 +337,8 @@ void SYCL::fpga::BackendCompiler::ConstructJob(Compilation &C,
339337
SmallString<128> ExecPath(
340338
getToolChain().GetProgramPath(makeExeName(C, "aoc")));
341339
const char *Exec = C.getArgs().MakeArgString(ExecPath);
342-
auto Cmd = std::make_unique<Command>(
343-
JA, *this, ResponseFileSupport::None(), Exec, CmdArgs, None);
340+
auto Cmd = std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
341+
Exec, CmdArgs, None);
344342
if (!ForeachInputs.empty())
345343
constructLLVMForeachCommand(C, JA, std::move(Cmd), ForeachInputs, Output,
346344
this, ForeachExt);
@@ -349,15 +347,15 @@ void SYCL::fpga::BackendCompiler::ConstructJob(Compilation &C,
349347
}
350348

351349
void SYCL::gen::BackendCompiler::ConstructJob(Compilation &C,
352-
const JobAction &JA,
353-
const InputInfo &Output,
354-
const InputInfoList &Inputs,
355-
const ArgList &Args,
356-
const char *LinkingOutput) const {
350+
const JobAction &JA,
351+
const InputInfo &Output,
352+
const InputInfoList &Inputs,
353+
const ArgList &Args,
354+
const char *LinkingOutput) const {
357355
assert((getToolChain().getTriple().getArch() == llvm::Triple::spir ||
358356
getToolChain().getTriple().getArch() == llvm::Triple::spir64) &&
359357
"Unsupported target");
360-
ArgStringList CmdArgs{"-output", Output.getFilename()};
358+
ArgStringList CmdArgs{"-output", Output.getFilename()};
361359
InputInfoList ForeachInputs;
362360
for (const auto &II : Inputs) {
363361
CmdArgs.push_back("-file");
@@ -377,21 +375,19 @@ void SYCL::gen::BackendCompiler::ConstructJob(Compilation &C,
377375
SmallString<128> ExecPath(
378376
getToolChain().GetProgramPath(makeExeName(C, "ocloc")));
379377
const char *Exec = C.getArgs().MakeArgString(ExecPath);
380-
auto Cmd = std::make_unique<Command>(
381-
JA, *this, ResponseFileSupport::None(), Exec, CmdArgs, None);
378+
auto Cmd = std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
379+
Exec, CmdArgs, None);
382380
if (!ForeachInputs.empty())
383381
constructLLVMForeachCommand(C, JA, std::move(Cmd), ForeachInputs, Output,
384382
this);
385383
else
386384
C.addCommand(std::move(Cmd));
387385
}
388386

389-
void SYCL::x86_64::BackendCompiler::ConstructJob(Compilation &C,
390-
const JobAction &JA,
391-
const InputInfo &Output,
392-
const InputInfoList &Inputs,
393-
const ArgList &Args,
394-
const char *LinkingOutput) const {
387+
void SYCL::x86_64::BackendCompiler::ConstructJob(
388+
Compilation &C, const JobAction &JA, const InputInfo &Output,
389+
const InputInfoList &Inputs, const ArgList &Args,
390+
const char *LinkingOutput) const {
395391
ArgStringList CmdArgs;
396392
CmdArgs.push_back(Args.MakeArgString(Twine("-o=") + Output.getFilename()));
397393
CmdArgs.push_back("--device=cpu");
@@ -411,8 +407,8 @@ void SYCL::x86_64::BackendCompiler::ConstructJob(Compilation &C,
411407
SmallString<128> ExecPath(
412408
getToolChain().GetProgramPath(makeExeName(C, "opencl-aot")));
413409
const char *Exec = C.getArgs().MakeArgString(ExecPath);
414-
auto Cmd = std::make_unique<Command>(
415-
JA, *this, ResponseFileSupport::None(), Exec, CmdArgs, None);
410+
auto Cmd = std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
411+
Exec, CmdArgs, None);
416412
if (!ForeachInputs.empty())
417413
constructLLVMForeachCommand(C, JA, std::move(Cmd), ForeachInputs, Output,
418414
this);
@@ -429,8 +425,7 @@ SYCLToolChain::SYCLToolChain(const Driver &D, const llvm::Triple &Triple,
429425
}
430426

431427
void SYCLToolChain::addClangTargetOptions(
432-
const llvm::opt::ArgList &DriverArgs,
433-
llvm::opt::ArgStringList &CC1Args,
428+
const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args,
434429
Action::OffloadKind DeviceOffloadingKind) const {
435430
HostTC.addClangTargetOptions(DriverArgs, CC1Args, DeviceOffloadingKind);
436431
}
@@ -471,8 +466,9 @@ static void parseTargetOpts(StringRef ArgString, const llvm::opt::ArgList &Args,
471466
// Expects a specific type of option (e.g. -Xsycl-target-backend) and will
472467
// extract the arguments.
473468
void SYCLToolChain::TranslateTargetOpt(const llvm::opt::ArgList &Args,
474-
llvm::opt::ArgStringList &CmdArgs, OptSpecifier Opt,
475-
OptSpecifier Opt_EQ) const {
469+
llvm::opt::ArgStringList &CmdArgs,
470+
OptSpecifier Opt,
471+
OptSpecifier Opt_EQ) const {
476472
for (auto *A : Args) {
477473
bool OptNoTriple;
478474
OptNoTriple = A->getOption().matches(Opt);
@@ -543,8 +539,8 @@ static void addImpliedArgs(const llvm::Triple &Triple,
543539
CmdArgs.push_back(Args.MakeArgString(BeOpt));
544540
}
545541

546-
void SYCLToolChain::TranslateBackendTargetArgs(const llvm::opt::ArgList &Args,
547-
llvm::opt::ArgStringList &CmdArgs) const {
542+
void SYCLToolChain::TranslateBackendTargetArgs(
543+
const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const {
548544
// Add any implied arguments before user defined arguments.
549545
addImpliedArgs(getTriple(), Args, CmdArgs);
550546

@@ -572,14 +568,14 @@ void SYCLToolChain::TranslateBackendTargetArgs(const llvm::opt::ArgList &Args,
572568
}
573569
// Handle -Xsycl-target-backend.
574570
TranslateTargetOpt(Args, CmdArgs, options::OPT_Xsycl_backend,
575-
options::OPT_Xsycl_backend_EQ);
571+
options::OPT_Xsycl_backend_EQ);
576572
}
577573

578-
void SYCLToolChain::TranslateLinkerTargetArgs(const llvm::opt::ArgList &Args,
579-
llvm::opt::ArgStringList &CmdArgs) const {
574+
void SYCLToolChain::TranslateLinkerTargetArgs(
575+
const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const {
580576
// Handle -Xsycl-target-linker.
581577
TranslateTargetOpt(Args, CmdArgs, options::OPT_Xsycl_linker,
582-
options::OPT_Xsycl_linker_EQ);
578+
options::OPT_Xsycl_linker_EQ);
583579
}
584580

585581
Tool *SYCLToolChain::buildBackendCompiler() const {

0 commit comments

Comments
 (0)