Skip to content

Commit

Permalink
Fix format issues
Browse files Browse the repository at this point in the history
Signed-off-by: Arvind Sudarsanam <[email protected]>
  • Loading branch information
asudarsa committed Jul 25, 2024
1 parent 8fdc107 commit 47c3185
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
3 changes: 2 additions & 1 deletion clang/lib/Driver/ToolChains/Clang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11065,7 +11065,8 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
ArgStringList CmdArgs;

// Pass the CUDA path to the linker wrapper tool.
for (Action::OffloadKind Kind : {Action::OFK_Cuda, Action::OFK_OpenMP, Action::OFK_SYCL}) {
for (Action::OffloadKind Kind :
{Action::OFK_Cuda, Action::OFK_OpenMP, Action::OFK_SYCL}) {
auto TCRange = C.getOffloadToolChains(Kind);
for (auto &I : llvm::make_range(TCRange.first, TCRange.second)) {
const ToolChain *TC = I.second;
Expand Down
20 changes: 12 additions & 8 deletions clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ fatbinary(ArrayRef<std::pair<StringRef, StringRef>> InputFiles,
}

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

namespace generic {
Expected<StringRef> clang(ArrayRef<StringRef> InputFiles, const ArgList &Args, bool IsSYCLKind = false) {
Expected<StringRef> clang(ArrayRef<StringRef> InputFiles, const ArgList &Args,
bool IsSYCLKind = false) {
llvm::TimeTraceScope TimeScope("Clang");
// Use `clang` to invoke the appropriate device tools.
Expected<std::string> ClangPath =
Expand Down Expand Up @@ -2132,20 +2133,23 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
if (!ClangOutputOrErr)
return ClangOutputOrErr.takeError();
if (Triple.isNVPTX()) {
auto VirtualArch =
StringRef(clang::CudaArchToVirtualArchString(clang::StringToCudaArch(Arch)));
auto PtxasOutputOrErr = nvptx::ptxas(*ClangOutputOrErr, LinkerArgs, Arch);
auto VirtualArch = StringRef(clang::CudaArchToVirtualArchString(
clang::StringToCudaArch(Arch)));
auto PtxasOutputOrErr =
nvptx::ptxas(*ClangOutputOrErr, LinkerArgs, Arch);
if (!PtxasOutputOrErr)
return PtxasOutputOrErr.takeError();
BundlerInputFiles.emplace_back(*ClangOutputOrErr, VirtualArch);
BundlerInputFiles.emplace_back(*PtxasOutputOrErr, Arch);
auto BundledFileOrErr = nvptx::fatbinary(BundlerInputFiles, LinkerArgs);
auto BundledFileOrErr =
nvptx::fatbinary(BundlerInputFiles, LinkerArgs);
if (!BundledFileOrErr)
return BundledFileOrErr.takeError();
SplitModules[I].ModuleFilePath = *BundledFileOrErr;
} else if (Triple.isAMDGCN()) {
BundlerInputFiles.emplace_back(*ClangOutputOrErr, Arch);
auto BundledFileOrErr = amdgcn::fatbinary(BundlerInputFiles, LinkerArgs);
auto BundledFileOrErr =
amdgcn::fatbinary(BundlerInputFiles, LinkerArgs);
if (!BundledFileOrErr)
return BundledFileOrErr.takeError();
SplitModules[I].ModuleFilePath = *BundledFileOrErr;
Expand Down

0 comments on commit 47c3185

Please sign in to comment.