github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp --
clang/include/clang/Basic/AlignedAllocation.h
clang/lib/Driver/ToolChains/HIPSPV.cpp clang/lib/Driver/ToolChains/SPIRV.cpp
clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/lib/Driver/ToolChains/HIPSPV.cpp
b/clang/lib/Driver/ToolChains/HIPSPV.cpp
index 70f831c3a..f8497198c 100644
--- a/clang/lib/Driver/ToolChains/HIPSPV.cpp
+++ b/clang/lib/Driver/ToolChains/HIPSPV.cpp
@@ -89,9 +89,9 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(
"-o", OptOutput};
const char *Opt =
Args.MakeArgString(getToolChain().GetProgramPath("opt"));
- C.addCommand(std::make_unique<Command>(
- JA, *this, ResponseFileSupport::None(), Opt, OptArgs, Inputs,
- Output));
+ C.addCommand(std::make_unique<Command>(JA, *this,
+ ResponseFileSupport::None(), Opt,
+ OptArgs, Inputs, Output));
TempFile = OptOutput;
}
@@ -99,8 +99,7 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(
ArgStringList ClangArgs;
ClangArgs.push_back("--no-default-config");
ClangArgs.push_back("-c");
- ClangArgs.push_back(
- C.getArgs().MakeArgString("--target=" + T.getTriple()));
+ ClangArgs.push_back(C.getArgs().MakeArgString("--target=" +
T.getTriple()));
ClangArgs.push_back("-mllvm");
ClangArgs.push_back("-spirv-ext=+SPV_INTEL_function_pointers"
@@ -115,9 +114,9 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand(
const char *Clang =
C.getArgs().MakeArgString(C.getDriver().getClangProgramPath());
- C.addCommand(std::make_unique<Command>(
- JA, *this, ResponseFileSupport::None(), Clang, ClangArgs, Inputs,
- Output));
+ C.addCommand(std::make_unique<Command>(JA, *this,
+ ResponseFileSupport::None(), Clang,
+ ClangArgs, Inputs, Output));
return;
}
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index 2522d0ac7..ff1aa3d7b 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -492,12 +492,12 @@ fatbinary(ArrayRef<std::tuple<StringRef, StringRef,
StringRef>> InputFiles,
if (EffectiveArch == "amdgcnspirv") {
BundleID = Saver.save("hip-spirv64-amd-amdhsa--" + EffectiveArch);
} else if (T.isSPIRV()) {
- // ChipStar and other SPIR-V HIP targets: use
hip-spirv64-<vendor>-<os>--<arch>
+ // ChipStar and other SPIR-V HIP targets: use
+ // hip-spirv64-<vendor>-<os>--<arch>
BundleID = Saver.save("hip-spirv64-" + T.getVendorName() + "-" +
T.getOSName() + "--" + EffectiveArch);
} else {
- std::string NormalizedTriple =
- normalizeForBundler(T, !Arch.empty());
+ std::string NormalizedTriple = normalizeForBundler(T, !Arch.empty());
BundleID = Saver.save("hip-" + NormalizedTriple + "-" + Arch);
}
Targets.push_back(BundleID);
@@ -620,8 +620,7 @@ Expected<StringRef> clang(ArrayRef<StringRef> InputFiles,
const ArgList &Args,
sys::path::append(PluginPath, "lib", "libLLVMHipSpvPasses.so");
if (!sys::fs::exists(PluginPath)) {
PluginPath.assign(HipPath);
- sys::path::append(PluginPath, "lib", "llvm",
- "libLLVMHipSpvPasses.so");
+ sys::path::append(PluginPath, "lib", "llvm", "libLLVMHipSpvPasses.so");
}
if (!sys::fs::exists(PluginPath))
PluginPath.clear();
@@ -663,8 +662,8 @@ Expected<StringRef> clang(ArrayRef<StringRef> InputFiles,
const ArgList &Args,
bool UseLLVMSpirvTranslator = false;
std::string LLVMSpirvPathStr;
{
- ErrorOr<std::string> LLVMSpirvPath =
- sys::findProgramByName("llvm-spirv",
{getExecutableDir("llvm-spirv")});
+ ErrorOr<std::string> LLVMSpirvPath = sys::findProgramByName(
+ "llvm-spirv", {getExecutableDir("llvm-spirv")});
if (!LLVMSpirvPath)
LLVMSpirvPath = sys::findProgramByName("llvm-spirv");
if (LLVMSpirvPath) {
``````````
</details>
https://github.com/llvm/llvm-project/pull/186972
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
