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 c,h,cpp --
clang/lib/CodeGen/CodeGenModule.cpp clang/test/CodeGen/target-data.c
llvm/lib/IR/Type.cpp llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp
llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
llvm/lib/Target/SPIRV/SPIRVISelLowering.cpp
llvm/lib/Target/SPIRV/SPIRVISelLowering.h
llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp
llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.h
llvm/lib/Target/SPIRV/SPIRVPreLegalizer.cpp
llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp
llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp llvm/lib/Target/SPIRV/SPIRVUtils.cpp
llvm/lib/Target/SPIRV/SPIRVUtils.h llvm/lib/TargetParser/TargetDataLayout.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/CodeGen/CodeGenModule.cpp
b/clang/lib/CodeGen/CodeGenModule.cpp
index 3afeb5e4c..1b80a3b62 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -418,7 +418,7 @@ static void checkDataLayoutConsistency(const TargetInfo
&Target,
Check("void*",
llvm::PointerType::get(Context,
Target.getTargetAddressSpace(LangAS::Default)),
- Target.PointerAlign);
+ Target.PointerAlign);
if (Target.vectorsAreElementAligned() != DL.vectorsAreElementAligned()) {
llvm::errs() << "Datalayout for target " << Triple.str()
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
index 06ab77566..be529c3bf 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -2109,7 +2109,8 @@ SPIRVGlobalRegistry::getRegClass(SPIRVTypeInst SpvType)
const {
inline unsigned getAS(SPIRVTypeInst SpvType, const Triple &TT) {
return storageClassToAddressSpace(
static_cast<SPIRV::StorageClass::StorageClass>(
- SpvType->getOperand(1).getImm()), TT);
+ SpvType->getOperand(1).getImm()),
+ TT);
}
LLT SPIRVGlobalRegistry::getRegType(SPIRVTypeInst SpvType) const {
diff --git a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
index df03b0cf6..7a90d95a9 100644
--- a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
@@ -6946,9 +6946,8 @@ bool SPIRVInstructionSelector::loadBuiltinInputID(
MIRBuilder.getMRI()->createVirtualRegister(GR.getRegClass(PtrType));
unsigned AS = storageClassToAddressSpace(SPIRV::StorageClass::Input,
STI.getTargetTriple());
- MIRBuilder.getMRI()->setType(
- NewRegister,
- LLT::pointer(AS, GR.getPointerSize(AS)));
+ MIRBuilder.getMRI()->setType(NewRegister,
+ LLT::pointer(AS, GR.getPointerSize(AS)));
GR.assignSPIRVTypeToVReg(PtrType, NewRegister, MIRBuilder.getMF());
// Build global variable with the necessary decorations for the input ID
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp
b/llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp
index bfd937d47..6a5521d24 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp
@@ -84,23 +84,51 @@ SPIRVLegalizerInfo::SPIRVLegalizerInfo(const SPIRVSubtarget
&ST,
const LLT v2s1 = LLT::fixed_vector(2, 1);
const Triple &TT = TM.getTargetTriple();
- const LLT p0 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Function, TT),
TM.getPointerSizeInBits(0)); // Function
- const LLT p1 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::CrossWorkgroup,
TT), TM.getPointerSizeInBits(1)); // CrossWorkgroup
- const LLT p2 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::UniformConstant,
TT), TM.getPointerSizeInBits(2)); // UniformConstant
- const LLT p3 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Workgroup, TT),
TM.getPointerSizeInBits(3)); // Workgroup
- const LLT p4 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Generic, TT),
TM.getPointerSizeInBits(4)); // Generic
+ const LLT p0 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::Function, TT),
+ TM.getPointerSizeInBits(0)); // Function
+ const LLT p1 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::CrossWorkgroup, TT),
+ TM.getPointerSizeInBits(1)); // CrossWorkgroup
+ const LLT p2 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::UniformConstant, TT),
+ TM.getPointerSizeInBits(2)); // UniformConstant
+ const LLT p3 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::Workgroup, TT),
+ TM.getPointerSizeInBits(3)); // Workgroup
+ const LLT p4 =
+ LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Generic,
TT),
+ TM.getPointerSizeInBits(4)); // Generic
// Input, SPV_INTEL_usm_storage_classes (Device)
- const LLT p5 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::DeviceOnlyINTEL,
TT), TM.getPointerSizeInBits(5));
- // SPV_INTEL_usm_storage_classes (Host)
- const LLT p6 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::HostOnlyINTEL,
TT), TM.getPointerSizeInBits(6));
- const LLT p7 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Input, TT),
TM.getPointerSizeInBits(7)); // Input
- const LLT p8 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Output, TT),
TM.getPointerSizeInBits(8)); // Output
+ const LLT p5 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::DeviceOnlyINTEL, TT),
+ TM.getPointerSizeInBits(5));
+ // SPV_INTEL_usm_storage_classes (Host)
+ const LLT p6 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::HostOnlyINTEL, TT),
+ TM.getPointerSizeInBits(6));
+ const LLT p7 =
+ LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Input, TT),
+ TM.getPointerSizeInBits(7)); // Input
+ const LLT p8 =
+ LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Output, TT),
+ TM.getPointerSizeInBits(8)); // Output
// CodeSectionINTEL, SPV_INTEL_function_pointers
- const LLT p9 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::CodeSectionINTEL,
TT), TM.getPointerSizeInBits(9));
- const LLT p10 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Private, TT),
TM.getPointerSizeInBits(10)); // Private
- const LLT p11 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::StorageBuffer,
TT), TM.getPointerSizeInBits(11)); // StorageBuffer
- const LLT p12 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Uniform, TT),
TM.getPointerSizeInBits(12)); // Uniform
- const LLT p13 =
LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::PushConstant, TT),
TM.getPointerSizeInBits(13)); // PushConstant
+ const LLT p9 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::CodeSectionINTEL, TT),
+ TM.getPointerSizeInBits(9));
+ const LLT p10 =
+ LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Private,
TT),
+ TM.getPointerSizeInBits(10)); // Private
+ const LLT p11 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::StorageBuffer, TT),
+ TM.getPointerSizeInBits(11)); // StorageBuffer
+ const LLT p12 =
+ LLT::pointer(storageClassToAddressSpace(SPIRV::StorageClass::Uniform,
TT),
+ TM.getPointerSizeInBits(12)); // Uniform
+ const LLT p13 = LLT::pointer(
+ storageClassToAddressSpace(SPIRV::StorageClass::PushConstant, TT),
+ TM.getPointerSizeInBits(13)); // PushConstant
// TODO: remove copy-pasting here by using concatenation in some way.
auto allPtrsScalarsAndVectors = {
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
index 64503d1d7..67d87b396 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
@@ -821,11 +821,10 @@ static inline bool isTargetSpecificASCast(unsigned SrcAS,
unsigned DstAS,
storageClassToAddressSpace(SPIRV::StorageClass::UniformConstant, TT);
static const std::pair<unsigned, unsigned> Casts[] = {
- {GenericAS, BufferFatPointerAS}, {GenericAS, BufferResourceAS},
- {BufferFatPointerAS, GenericAS}, {BufferFatPointerAS, BufferResourceAS},
- {BufferResourceAS, GenericAS}, {BufferResourceAS, BufferFatPointerAS},
- {GenericAS, UniformConstAS}, {UniformConstAS, GenericAS}
- };
+ {GenericAS, BufferFatPointerAS}, {GenericAS, BufferResourceAS},
+ {BufferFatPointerAS, GenericAS}, {BufferFatPointerAS, BufferResourceAS},
+ {BufferResourceAS, GenericAS}, {BufferResourceAS, BufferFatPointerAS},
+ {GenericAS, UniformConstAS}, {UniformConstAS, GenericAS}};
return find(Casts, std::make_pair(SrcAS, DstAS));
}
@@ -858,9 +857,8 @@ static bool substituteInvalidAddrSpaceCasts(Function *F) {
auto &ASC = I.get();
B.SetInsertPoint(&ASC);
- CallInst *TASC = B.CreateIntrinsic(ASC.getType(),
- Intrinsic::spv_opaque_ptr_cast,
- {ASC.getOperand(0)});
+ CallInst *TASC = B.CreateIntrinsic(
+ ASC.getType(), Intrinsic::spv_opaque_ptr_cast, {ASC.getOperand(0)});
ASC.replaceAllUsesWith(TASC);
ASC.eraseFromParent();
diff --git a/llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp
b/llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp
index f80d02c0d..00838079a 100644
--- a/llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp
@@ -191,8 +191,8 @@ void SPIRVSubtarget::setEnv(SPIRVEnvType E) {
// Reinitialize Env-dependent state aka ExtInstSet and legalizer info.
initAvailableExtInstSets();
- Legalizer = std::make_unique<SPIRVLegalizerInfo>(*this,
- TLInfo.getTargetMachine());
+ Legalizer =
+ std::make_unique<SPIRVLegalizerInfo>(*this, TLInfo.getTargetMachine());
}
void SPIRVSubtarget::resolveEnvFromModule(const Module &M) {
diff --git a/llvm/lib/Target/SPIRV/SPIRVUtils.h
b/llvm/lib/Target/SPIRV/SPIRVUtils.h
index c5c3be94c..ff728566f 100644
--- a/llvm/lib/Target/SPIRV/SPIRVUtils.h
+++ b/llvm/lib/Target/SPIRV/SPIRVUtils.h
@@ -248,7 +248,7 @@ constexpr bool
isGenericCastablePtr(SPIRV::StorageClass::StorageClass SC) {
// to allow for different OpenCL vs Vulkan handling.
constexpr unsigned
storageClassToAddressSpace(SPIRV::StorageClass::StorageClass SC,
- const Triple& TT) {
+ const Triple &TT) {
switch (SC) {
case SPIRV::StorageClass::Function:
return 0;
diff --git a/llvm/lib/TargetParser/TargetDataLayout.cpp
b/llvm/lib/TargetParser/TargetDataLayout.cpp
index 22fec2f2e..d6e4178ea 100644
--- a/llvm/lib/TargetParser/TargetDataLayout.cpp
+++ b/llvm/lib/TargetParser/TargetDataLayout.cpp
@@ -489,10 +489,10 @@ static std::string computeSPIRVDataLayout(const Triple
&TT) {
if (TT.getVendor() == Triple::VendorType::AMD &&
TT.getOS() == Triple::OSType::AMDHSA) {
auto DL = computeAMDDataLayout(TT);
- DL.replace(DL.find("p:64:64"), 7, "p:32:32"); // AS0 is Function
+ DL.replace(DL.find("p:64:64"), 7, "p:32:32"); // AS0 is Function
DL.replace(DL.find("p2:32:32"), 8, "p2:64:64"); // AS2 is UniformConstant
- DL.replace(DL.find("A5"), 2, "A0"); // AllocaAS is Function
- DL.insert(DL.find_last_of('-') + 1, "P4-"); // ProgramAS is Generic
+ DL.replace(DL.find("A5"), 2, "A0"); // AllocaAS is Function
+ DL.insert(DL.find_last_of('-') + 1, "P4-"); // ProgramAS is Generic
return DL;
}
if (TT.getVendor() == Triple::VendorType::Intel)
``````````
</details>
https://github.com/llvm/llvm-project/pull/199376
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
