[AMDGPU] Common up two local memory size calculations. NFCI. (#154784)

jayfoad · web-flow · commit cf5243619ab2 · 2025-08-22T08:44:11.000+01:00
diff --git a/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp b/llvm/lib/Target/AMDGPU/GCNSubtarget.cpp
@@ -140,10 +140,7 @@ GCNSubtarget &GCNSubtarget::initializeSubtargetDependencies(const Triple &TT,
   if (AddressableLocalMemorySize == 0)
     AddressableLocalMemorySize = 32768;
 
-  LocalMemorySize = AddressableLocalMemorySize;
-  if (AMDGPU::isGFX10Plus(*this) &&
-      !getFeatureBits().test(AMDGPU::FeatureCuMode))
-    LocalMemorySize *= 2;
+  LocalMemorySize = AMDGPU::IsaInfo::getLocalMemorySize(this);
 
   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
@@ -1163,7 +1163,7 @@ unsigned getAddressableLocalMemorySize(const MCSubtargetInfo *STI) {
     return 163840;
   if (STI->getFeatureBits().test(FeatureAddressableLocalMemorySize327680))
     return 327680;
-  return 0;
+  return 32768;
 }
 
 unsigned getEUsPerCU(const MCSubtargetInfo *STI) {

Original file line number	Diff line number	Diff line change
`@@ -1163,7 +1163,7 @@ unsigned getAddressableLocalMemorySize(const MCSubtargetInfo *STI) {`
`1163`	`1163`	`return 163840;`
`1164`	`1164`	`if (STI->getFeatureBits().test(FeatureAddressableLocalMemorySize327680))`
`1165`	`1165`	`return 327680;`
`1166`		`- return 0;`
	`1166`	`+ return 32768;`
`1167`	`1167`	`}`
`1168`	`1168`
`1169`	`1169`	`unsigned getEUsPerCU(const MCSubtargetInfo *STI) {`