https://github.com/chinmaydd updated https://github.com/llvm/llvm-project/pull/220051
>From e9b8a8a50fa3270b23ac9a52a9ded6b993f95d0d Mon Sep 17 00:00:00 2001 From: Chinmay Deshpande <[email protected]> Date: Thu, 3 Sep 2026 01:36:06 -0400 Subject: [PATCH] [AMDGPU] Add getLDSAllocGranule to TargetParser Expose the LDS allocation granule from GPUKind and subarch without an MCSubtargetInfo. Consolidate backend users on the byte-valued query while preserving the existing feature-based mapping. Change-Id: Ic0c9345e7657ec3c6978a646628598cb7608b390 --- .../llvm/TargetParser/AMDGPUTargetParser.h | 4 +++ llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp | 7 +++-- llvm/lib/Target/AMDGPU/GCNSubtarget.cpp | 4 +-- .../Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 14 ---------- llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h | 5 ---- llvm/lib/TargetParser/AMDGPUTargetParser.cpp | 28 +++++++++++++++++++ .../TargetParser/TargetParserTest.cpp | 16 +++++++++++ 7 files changed, 54 insertions(+), 24 deletions(-) diff --git a/llvm/include/llvm/TargetParser/AMDGPUTargetParser.h b/llvm/include/llvm/TargetParser/AMDGPUTargetParser.h index 2d383d9ddd92a..fabc9e59aeb6a 100644 --- a/llvm/include/llvm/TargetParser/AMDGPUTargetParser.h +++ b/llvm/include/llvm/TargetParser/AMDGPUTargetParser.h @@ -226,6 +226,10 @@ getMaxHWAddressableLocalMemorySize(Triple::SubArchType SubArch); LLVM_ABI unsigned getLDSBankCount(GPUKind AK); LLVM_ABI unsigned getLDSBankCount(Triple::SubArchType SubArch); +/// \returns LDS allocation granularity in bytes. +LLVM_ABI unsigned getLDSAllocGranule(GPUKind AK); +LLVM_ABI unsigned getLDSAllocGranule(Triple::SubArchType SubArch); + /// \returns Number of SIMDs a work-group's waves run on. All four SIMDs of the /// functional block in full-SIMD mode, half of them otherwise. constexpr unsigned getNumWorkGroupSIMDs(bool FullSIMDMode) { diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp index 7afda107a59bc..6c0691105c8e2 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp @@ -1421,7 +1421,8 @@ void AMDGPUAsmPrinter::getSIProgramInfo(SIProgramInfo &ProgInfo, ProgInfo.LDSSize = MFI->getLDSSize(); - unsigned LDSGranularityBytes = getLdsDwGranularity(STM) * 4; + unsigned LDSGranularityBytes = + AMDGPU::getLDSAllocGranule(STM.getTargetID().getGPUKind()); ProgInfo.LDSBlocks = alignTo(ProgInfo.LDSSize, LDSGranularityBytes) / LDSGranularityBytes; @@ -1660,8 +1661,8 @@ static void EmitPALMetadataCommon(AMDGPUPALMetadata *MD, MD->updateHwStageMaximum( CC, ".lds_size", - (unsigned)(CurrentProgramInfo.LdsSize * getLdsDwGranularity(ST) * - sizeof(uint32_t))); + (unsigned)(CurrentProgramInfo.LdsSize * + AMDGPU::getLDSAllocGranule(ST.getTargetID().getGPUKind()))); } // This is the equivalent of EmitProgramInfoSI above, but for when the OS type diff --git a/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp b/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp index 9443420c3d424..e97f2114098b8 100644 --- a/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp +++ b/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp @@ -184,9 +184,9 @@ GCNSubtarget &GCNSubtarget::initializeSubtargetDependencies(const Triple &TT, LocalMemorySize = AMDGPU::IsaInfo::getLocalMemorySize(*this); AddressableLocalMemorySize = AMDGPU::IsaInfo::getAddressableLocalMemorySize(*this); - // LDS Allocation Granularity calculated in bytes from dwords + // LDS allocation granularity is in bytes. LDSAllocationGranularity = - AMDGPU::getLdsDwGranularity(*this) * sizeof(uint32_t); + AMDGPU::getLDSAllocGranule(getTargetID().getGPUKind()); HasFminFmaxLegacy = getGeneration() < AMDGPUSubtarget::VOLCANIC_ISLANDS; HasSMulHi = getGeneration() >= AMDGPUSubtarget::GFX9; diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp index 7c61e458c4abf..e901a6016a001 100644 --- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp +++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp @@ -3724,20 +3724,6 @@ bool isDPALU_DPP(const MCInstrDesc &OpDesc, const MCInstrInfo &MII, return hasAny64BitVGPROperands(OpDesc, MII, ST); } -unsigned getLdsDwGranularity(const MCSubtargetInfo &ST) { - if (ST.getFeatureBits().test(FeatureAddressableLocalMemorySize32768)) - return 64; - if (ST.getFeatureBits().test(FeatureAddressableLocalMemorySize65536)) - return 128; - if (ST.getFeatureBits().test(FeatureAddressableLocalMemorySize196608)) - return 256; - if (ST.getFeatureBits().test(FeatureAddressableLocalMemorySize163840)) - return 320; - if (ST.getFeatureBits().test(FeatureAddressableLocalMemorySize327680)) - return 512; - return 64; // In sync with getAddressableLocalMemorySize -} - bool isPackedSingleSGPRFP32Inst(unsigned Opc) { switch (Opc) { case AMDGPU::V_PK_ADD_F32_gfx1250: diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h index 957868ef64c32..fb4cf2075cbdc 100644 --- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h +++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h @@ -1784,11 +1784,6 @@ getVGPRLoweringOperandTables(const MCInstrDesc &Desc); /// \returns true if a memory instruction supports scale_offset modifier. bool supportsScaleOffset(const MCInstrInfo &MII, unsigned Opcode); -/// \returns lds block size in terms of dwords. \p -/// This is used to calculate the lds size encoded for PAL metadata 3.0+ which -/// must be defined in terms of bytes. -unsigned getLdsDwGranularity(const MCSubtargetInfo &ST); - class ClusterDimsAttr { public: enum class Kind { Unknown, NoCluster, VariableDims, FixedDims }; diff --git a/llvm/lib/TargetParser/AMDGPUTargetParser.cpp b/llvm/lib/TargetParser/AMDGPUTargetParser.cpp index 184ce88dc5f87..5c2ff44d307ee 100644 --- a/llvm/lib/TargetParser/AMDGPUTargetParser.cpp +++ b/llvm/lib/TargetParser/AMDGPUTargetParser.cpp @@ -470,6 +470,34 @@ unsigned AMDGPU::getLDSBankCount(Triple::SubArchType SubArch) { return getLDSBankCount(getGPUKindFromSubArch(SubArch)); } +unsigned AMDGPU::getLDSAllocGranule(GPUKind AK) { + const AMDGPUFeatureBitset &Features = getFeatureBitset(AK); + if (Features.none()) + return 256; + assert((Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE32768) || + Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE65536) || + Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE163840) || + Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE196608) || + Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE327680)) && + "missing addressable LDS size feature"); + if (Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE32768)) + return 256; + if (Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE65536)) + return 512; + if (Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE196608)) + return 1024; + if (Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE163840)) + return 1280; + if (Features.test(FEAT_ADDRESSABLELOCALMEMORYSIZE327680)) + return 2048; + + return 256; +} + +unsigned AMDGPU::getLDSAllocGranule(Triple::SubArchType SubArch) { + return getLDSAllocGranule(getGPUKindFromSubArch(SubArch)); +} + unsigned AMDGPU::getMaxWavesPerEU(GPUKind AK) { const GPUInfo *Info = getAMDGPUInfo(AK); return Info ? Info->MaxWavesPerEU : 10; diff --git a/llvm/unittests/TargetParser/TargetParserTest.cpp b/llvm/unittests/TargetParser/TargetParserTest.cpp index 1693c8d1e3736..5682f0e473fa4 100644 --- a/llvm/unittests/TargetParser/TargetParserTest.cpp +++ b/llvm/unittests/TargetParser/TargetParserTest.cpp @@ -3223,6 +3223,22 @@ TEST(TargetParserTest, testAMDGPUgetMaxHWAddressableLocalMemorySize) { 327680u); } +TEST(TargetParserTest, testAMDGPUgetLDSAllocGranule) { + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX600), 256u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX900), 512u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX950), 1280u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX1310), 1024u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX1250), 2048u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_GFX9_4_GENERIC), 512u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(AMDGPU::GK_NONE), 256u); + + EXPECT_EQ(AMDGPU::getLDSAllocGranule(Triple::AMDGPUSubArch600), 256u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(Triple::AMDGPUSubArch900), 512u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(Triple::AMDGPUSubArch950), 1280u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(Triple::AMDGPUSubArch1310), 1024u); + EXPECT_EQ(AMDGPU::getLDSAllocGranule(Triple::AMDGPUSubArch1250), 2048u); +} + TEST(TargetParserTest, testAMDGPUgetNumWorkGroupSIMDs) { EXPECT_EQ(AMDGPU::getNumWorkGroupSIMDs(true), 4u); EXPECT_EQ(AMDGPU::getNumWorkGroupSIMDs(false), 2u); _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
