Skip to content

Commit 94a550d

Browse files
[AMDGPU][NFC] Rename Feature GFX11FullVGPRs to 1_5xVGPRs (#86468)
1 parent dbfc38e commit 94a550d

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.td

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -831,10 +831,12 @@ def FeatureNoDataDepHazard : SubtargetFeature<"no-data-dep-hazard",
831831
"Does not need SW waitstates"
832832
>;
833833

834-
def FeatureGFX11FullVGPRs : SubtargetFeature<"gfx11-full-vgprs",
835-
"HasGFX11FullVGPRs",
834+
// Allocate 1536 VGPRs for wave32 and 768 VGPRs for wave64
835+
// with allocation granularity 24 for wave32 and 12 for wave64
836+
def Feature1_5xVGPRs : SubtargetFeature<"allocate1_5xvgprs",
837+
"Has1_5xVGPRs",
836838
"true",
837-
"GFX11 with 50% more physical VGPRs and 50% larger allocation granule than GFX10"
839+
"Has 50% more physical VGPRs and 50% larger allocation granule"
838840
>;
839841

840842

@@ -1491,12 +1493,12 @@ def FeatureISAVersion11_0_Common : FeatureSet<
14911493

14921494
def FeatureISAVersion11_0_0 : FeatureSet<
14931495
!listconcat(FeatureISAVersion11_0_Common.Features,
1494-
[FeatureGFX11FullVGPRs,
1496+
[Feature1_5xVGPRs,
14951497
FeatureUserSGPRInit16Bug])>;
14961498

14971499
def FeatureISAVersion11_0_1 : FeatureSet<
14981500
!listconcat(FeatureISAVersion11_0_Common.Features,
1499-
[FeatureGFX11FullVGPRs])>;
1501+
[Feature1_5xVGPRs])>;
15001502

15011503
def FeatureISAVersion11_0_2 : FeatureSet<
15021504
!listconcat(FeatureISAVersion11_0_Common.Features,
@@ -1517,7 +1519,7 @@ def FeatureISAVersion11_5_1 : FeatureSet<
15171519
[FeatureSALUFloatInsts,
15181520
FeatureDPPSrc1SGPR,
15191521
FeatureVGPRSingleUseHintInsts,
1520-
FeatureGFX11FullVGPRs])>;
1522+
Feature1_5xVGPRs])>;
15211523

15221524
def FeatureISAVersion12 : FeatureSet<
15231525
[FeatureGFX12,

llvm/lib/Target/AMDGPU/GCNSubtarget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
223223
bool HasImageStoreD16Bug = false;
224224
bool HasImageGather4D16Bug = false;
225225
bool HasMSAALoadDstSelBug = false;
226-
bool HasGFX11FullVGPRs = false;
226+
bool Has1_5xVGPRs = false;
227227
bool HasMADIntraFwdBug = false;
228228
bool HasVOPDInsts = false;
229229
bool HasVALUTransUseHazard = false;
@@ -1202,7 +1202,7 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
12021202
/// target.
12031203
bool hasNullExportTarget() const { return !GFX11Insts; }
12041204

1205-
bool hasGFX11FullVGPRs() const { return HasGFX11FullVGPRs; }
1205+
bool has1_5xVGPRs() const { return Has1_5xVGPRs; }
12061206

12071207
bool hasVOPDInsts() const { return HasVOPDInsts; }
12081208

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ unsigned getVGPRAllocGranule(const MCSubtargetInfo *STI,
10871087
*EnableWavefrontSize32 :
10881088
STI->getFeatureBits().test(FeatureWavefrontSize32);
10891089

1090-
if (STI->getFeatureBits().test(FeatureGFX11FullVGPRs))
1090+
if (STI->getFeatureBits().test(Feature1_5xVGPRs))
10911091
return IsWave32 ? 24 : 12;
10921092

10931093
if (hasGFX10_3Insts(*STI))
@@ -1114,7 +1114,7 @@ unsigned getTotalNumVGPRs(const MCSubtargetInfo *STI) {
11141114
if (!isGFX10Plus(*STI))
11151115
return 256;
11161116
bool IsWave32 = STI->getFeatureBits().test(FeatureWavefrontSize32);
1117-
if (STI->getFeatureBits().test(FeatureGFX11FullVGPRs))
1117+
if (STI->getFeatureBits().test(Feature1_5xVGPRs))
11181118
return IsWave32 ? 1536 : 768;
11191119
return IsWave32 ? 1024 : 512;
11201120
}

0 commit comments

Comments
 (0)