Skip to content

Commit b03552a

Browse files
jinge90mdtoguchi
andauthored
[SYCL][NFC] Fix clang format in SYCL.h and ClangLinkerWrapper.cpp (#16066)
Signed-off-by: jinge90 <[email protected]> Co-authored-by: Michael Toguchi <[email protected]>
1 parent c2dab05 commit b03552a

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

clang/lib/Driver/ToolChains/SYCL.h

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- SYCL.h - SYCL ToolChain Implementations -----------------*- C++ -*-===//
1+
//===--- SYCL.h - SYCL ToolChain Implementations ----------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -158,8 +158,8 @@ SmallVector<std::string, 8> getDeviceLibraries(const Compilation &C,
158158
bool IsSpirvAOT);
159159

160160
// Populates the SYCL device traits macros.
161-
void populateSYCLDeviceTraitsMacrosArgs(Compilation &C,
162-
const llvm::opt::ArgList &Args,
161+
void populateSYCLDeviceTraitsMacrosArgs(
162+
Compilation &C, const llvm::opt::ArgList &Args,
163163
const SmallVectorImpl<std::pair<const ToolChain *, StringRef>> &Targets);
164164

165165
bool shouldDoPerObjectFileLinking(const Compilation &C);
@@ -180,11 +180,11 @@ class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
180180
private:
181181
/// \return llvm-link output file name.
182182
const char *constructLLVMLinkCommand(Compilation &C, const JobAction &JA,
183-
const InputInfo &Output,
184-
const llvm::opt::ArgList &Args,
185-
llvm::StringRef SubArchName,
186-
llvm::StringRef OutputFilePrefix,
187-
const InputInfoList &InputFiles) const;
183+
const InputInfo &Output,
184+
const llvm::opt::ArgList &Args,
185+
llvm::StringRef SubArchName,
186+
llvm::StringRef OutputFilePrefix,
187+
const InputInfoList &InputFiles) const;
188188
};
189189

190190
/// Directly call FPGA Compiler and Linker
@@ -241,7 +241,7 @@ template <auto GPUArh> std::optional<StringRef> isGPUTarget(StringRef Target) {
241241
if (Target.starts_with(GPUArh)) {
242242
return resolveGenDevice(Target);
243243
}
244-
return std::nullopt;
244+
return std::nullopt;
245245
}
246246

247247
} // end namespace gen
@@ -280,9 +280,10 @@ class LLVM_LIBRARY_VISIBILITY SYCLToolChain : public ToolChain {
280280
llvm::opt::DerivedArgList *
281281
TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,
282282
Action::OffloadKind DeviceOffloadKind) const override;
283-
void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
284-
llvm::opt::ArgStringList &CC1Args,
285-
Action::OffloadKind DeviceOffloadKind) const override;
283+
void
284+
addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
285+
llvm::opt::ArgStringList &CC1Args,
286+
Action::OffloadKind DeviceOffloadKind) const override;
286287
void AddImpliedTargetArgs(const llvm::Triple &Triple,
287288
const llvm::opt::ArgList &Args,
288289
llvm::opt::ArgStringList &CmdArgs,
@@ -324,7 +325,8 @@ class LLVM_LIBRARY_VISIBILITY SYCLToolChain : public ToolChain {
324325
CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override;
325326
void AddSYCLIncludeArgs(const llvm::opt::ArgList &DriverArgs,
326327
llvm::opt::ArgStringList &CC1Args) const override;
327-
void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
328+
void
329+
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
328330
llvm::opt::ArgStringList &CC1Args) const override;
329331
void AddClangCXXStdlibIncludeArgs(
330332
const llvm::opt::ArgList &Args,
@@ -357,7 +359,8 @@ inline bool isSYCLNativeCPU(const llvm::opt::ArgList &Args) {
357359
return false;
358360
}
359361

360-
inline bool isSYCLNativeCPU(const llvm::Triple &HostT, const llvm::Triple &DevT) {
362+
inline bool isSYCLNativeCPU(const llvm::Triple &HostT,
363+
const llvm::Triple &DevT) {
361364
return HostT == DevT;
362365
}
363366

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,10 @@ wrapSYCLBinariesFromFile(std::vector<module_split::SplitModule> &SplitModules,
11121112
if (!MBOrDesc)
11131113
return createFileError(SI.ModuleFilePath, MBOrDesc.getError());
11141114

1115-
StringRef ImageTarget = IsEmbeddedIR ? StringRef(EmbeddedIRTarget) : StringRef(RegularTarget);
1116-
Images.emplace_back(std::move(*MBOrDesc), SI.Properties, SI.Symbols, ImageTarget);
1115+
StringRef ImageTarget =
1116+
IsEmbeddedIR ? StringRef(EmbeddedIRTarget) : StringRef(RegularTarget);
1117+
Images.emplace_back(std::move(*MBOrDesc), SI.Properties, SI.Symbols,
1118+
ImageTarget);
11171119
}
11181120

11191121
LLVMContext C;
@@ -1198,7 +1200,8 @@ static Expected<StringRef> runCompile(StringRef &InputFile,
11981200
static Expected<StringRef>
11991201
runWrapperAndCompile(std::vector<module_split::SplitModule> &SplitModules,
12001202
const ArgList &Args, bool IsEmbeddedIR = false) {
1201-
auto OutputFile = sycl::wrapSYCLBinariesFromFile(SplitModules, Args, IsEmbeddedIR);
1203+
auto OutputFile =
1204+
sycl::wrapSYCLBinariesFromFile(SplitModules, Args, IsEmbeddedIR);
12021205
if (!OutputFile)
12031206
return OutputFile.takeError();
12041207
// call to clang
@@ -2417,8 +2420,8 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
24172420
// of sycl-post-link (filetable referencing LLVM Bitcode + symbols)
24182421
// through the offload wrapper and link the resulting object to the
24192422
// application.
2420-
auto OutputFile =
2421-
sycl::runWrapperAndCompile(SplitModules, LinkerArgs, /* IsEmbeddedIR */ true);
2423+
auto OutputFile = sycl::runWrapperAndCompile(SplitModules, LinkerArgs,
2424+
/* IsEmbeddedIR */ true);
24222425
if (!OutputFile)
24232426
return OutputFile.takeError();
24242427
WrappedOutput.push_back(*OutputFile);

0 commit comments

Comments
 (0)