Skip to content

Commit 91c3fae

Browse files
committed
Fix format issues
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
1 parent d667c63 commit 91c3fae

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11066,7 +11066,8 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
1106611066
ArgStringList CmdArgs;
1106711067

1106811068
// Pass the CUDA path to the linker wrapper tool.
11069-
for (Action::OffloadKind Kind : {Action::OFK_Cuda, Action::OFK_OpenMP, Action::OFK_SYCL}) {
11069+
for (Action::OffloadKind Kind :
11070+
{Action::OFK_Cuda, Action::OFK_OpenMP, Action::OFK_SYCL}) {
1107011071
auto TCRange = C.getOffloadToolChains(Kind);
1107111072
for (auto &I : llvm::make_range(TCRange.first, TCRange.second)) {
1107211073
const ToolChain *TC = I.second;

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ fatbinary(ArrayRef<std::pair<StringRef, StringRef>> InputFiles,
412412
}
413413

414414
// ptxas binary
415-
Expected<StringRef>
416-
ptxas(StringRef InputFile, const ArgList &Args, StringRef Arch) {
415+
Expected<StringRef> ptxas(StringRef InputFile, const ArgList &Args,
416+
StringRef Arch) {
417417
llvm::TimeTraceScope TimeScope("NVPTX ptxas");
418418
// NVPTX uses the ptxas program to process assembly files.
419419
Expected<std::string> PtxasPath =
@@ -1281,7 +1281,8 @@ static Expected<StringRef> linkDevice(ArrayRef<StringRef> InputFiles,
12811281
} // namespace sycl
12821282

12831283
namespace generic {
1284-
Expected<StringRef> clang(ArrayRef<StringRef> InputFiles, const ArgList &Args, bool IsSYCLKind = false) {
1284+
Expected<StringRef> clang(ArrayRef<StringRef> InputFiles, const ArgList &Args,
1285+
bool IsSYCLKind = false) {
12851286
llvm::TimeTraceScope TimeScope("Clang");
12861287
// Use `clang` to invoke the appropriate device tools.
12871288
Expected<std::string> ClangPath =
@@ -2132,20 +2133,23 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
21322133
if (!ClangOutputOrErr)
21332134
return ClangOutputOrErr.takeError();
21342135
if (Triple.isNVPTX()) {
2135-
auto VirtualArch =
2136-
StringRef(clang::CudaArchToVirtualArchString(clang::StringToCudaArch(Arch)));
2137-
auto PtxasOutputOrErr = nvptx::ptxas(*ClangOutputOrErr, LinkerArgs, Arch);
2136+
auto VirtualArch = StringRef(clang::CudaArchToVirtualArchString(
2137+
clang::StringToCudaArch(Arch)));
2138+
auto PtxasOutputOrErr =
2139+
nvptx::ptxas(*ClangOutputOrErr, LinkerArgs, Arch);
21382140
if (!PtxasOutputOrErr)
21392141
return PtxasOutputOrErr.takeError();
21402142
BundlerInputFiles.emplace_back(*ClangOutputOrErr, VirtualArch);
21412143
BundlerInputFiles.emplace_back(*PtxasOutputOrErr, Arch);
2142-
auto BundledFileOrErr = nvptx::fatbinary(BundlerInputFiles, LinkerArgs);
2144+
auto BundledFileOrErr =
2145+
nvptx::fatbinary(BundlerInputFiles, LinkerArgs);
21432146
if (!BundledFileOrErr)
21442147
return BundledFileOrErr.takeError();
21452148
SplitModules[I].ModuleFilePath = *BundledFileOrErr;
21462149
} else if (Triple.isAMDGCN()) {
21472150
BundlerInputFiles.emplace_back(*ClangOutputOrErr, Arch);
2148-
auto BundledFileOrErr = amdgcn::fatbinary(BundlerInputFiles, LinkerArgs);
2151+
auto BundledFileOrErr =
2152+
amdgcn::fatbinary(BundlerInputFiles, LinkerArgs);
21492153
if (!BundledFileOrErr)
21502154
return BundledFileOrErr.takeError();
21512155
SplitModules[I].ModuleFilePath = *BundledFileOrErr;

0 commit comments

Comments
 (0)