Skip to content

Commit 396f677

Browse files
authored
[AMDGPU] Remove unused VGPRSingleUseHintInsts feature (#109769)
1 parent bfd8f7e commit 396f677

25 files changed

+34
-1848
lines changed

llvm/docs/AMDGPUUsage.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,9 +611,7 @@ Generic processor code objects are versioned. See :ref:`amdgpu-generic-processor
611611
- ``gfx1152``
612612

613613
SALU floating point instructions
614-
and single-use VGPR hint
615-
instructions are not available
616-
on:
614+
are not available on:
617615

618616
- ``gfx1150``
619617
- ``gfx1151``

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,6 @@ extern char &SIModeRegisterID;
405405
void initializeAMDGPUInsertDelayAluPass(PassRegistry &);
406406
extern char &AMDGPUInsertDelayAluID;
407407

408-
void initializeAMDGPUInsertSingleUseVDSTPass(PassRegistry &);
409-
extern char &AMDGPUInsertSingleUseVDSTID;
410-
411408
void initializeSIInsertHardClausesPass(PassRegistry &);
412409
extern char &SIInsertHardClausesID;
413410

llvm/lib/Target/AMDGPU/AMDGPU.td

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -929,12 +929,6 @@ def FeatureSALUFloatInsts : SubtargetFeature<"salu-float",
929929
"Has SALU floating point instructions"
930930
>;
931931

932-
def FeatureVGPRSingleUseHintInsts : SubtargetFeature<"vgpr-singleuse-hint",
933-
"HasVGPRSingleUseHintInsts",
934-
"true",
935-
"Has single-use VGPR hint instructions"
936-
>;
937-
938932
def FeaturePseudoScalarTrans : SubtargetFeature<"pseudo-scalar-trans",
939933
"HasPseudoScalarTrans",
940934
"true",
@@ -1615,22 +1609,19 @@ def FeatureISAVersion11_5_0 : FeatureSet<
16151609
!listconcat(FeatureISAVersion11_Common.Features,
16161610
[FeatureSALUFloatInsts,
16171611
FeatureDPPSrc1SGPR,
1618-
FeatureVGPRSingleUseHintInsts,
16191612
FeatureRequiredExportPriority])>;
16201613

16211614
def FeatureISAVersion11_5_1 : FeatureSet<
16221615
!listconcat(FeatureISAVersion11_Common.Features,
16231616
[FeatureSALUFloatInsts,
16241617
FeatureDPPSrc1SGPR,
1625-
FeatureVGPRSingleUseHintInsts,
16261618
Feature1_5xVGPRs,
16271619
FeatureRequiredExportPriority])>;
16281620

16291621
def FeatureISAVersion11_5_2 : FeatureSet<
16301622
!listconcat(FeatureISAVersion11_Common.Features,
16311623
[FeatureSALUFloatInsts,
16321624
FeatureDPPSrc1SGPR,
1633-
FeatureVGPRSingleUseHintInsts,
16341625
FeatureRequiredExportPriority])>;
16351626

16361627
def FeatureISAVersion12 : FeatureSet<
@@ -1663,7 +1654,6 @@ def FeatureISAVersion12 : FeatureSet<
16631654
FeatureSALUFloatInsts,
16641655
FeaturePseudoScalarTrans,
16651656
FeatureHasRestrictedSOffset,
1666-
FeatureVGPRSingleUseHintInsts,
16671657
FeatureScalarDwordx3Loads,
16681658
FeatureDPPSrc1SGPR,
16691659
FeatureMaxHardClauseLength32,
@@ -2271,9 +2261,6 @@ def HasNotMADIntraFwdBug : Predicate<"!Subtarget->hasMADIntraFwdBug()">;
22712261
def HasSALUFloatInsts : Predicate<"Subtarget->hasSALUFloatInsts()">,
22722262
AssemblerPredicate<(all_of FeatureSALUFloatInsts)>;
22732263

2274-
def HasVGPRSingleUseHintInsts : Predicate<"Subtarget->hasVGPRSingleUseHintInsts()">,
2275-
AssemblerPredicate<(all_of FeatureVGPRSingleUseHintInsts)>;
2276-
22772264
def HasPseudoScalarTrans : Predicate<"Subtarget->hasPseudoScalarTrans()">,
22782265
AssemblerPredicate<(all_of FeaturePseudoScalarTrans)>;
22792266

llvm/lib/Target/AMDGPU/AMDGPUInsertSingleUseVDST.cpp

Lines changed: 0 additions & 245 deletions
This file was deleted.

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,6 @@ static cl::opt<bool> EnableSIModeRegisterPass(
311311
cl::init(true),
312312
cl::Hidden);
313313

314-
// Enable GFX11.5+ s_singleuse_vdst insertion
315-
static cl::opt<bool>
316-
EnableInsertSingleUseVDST("amdgpu-enable-single-use-vdst",
317-
cl::desc("Enable s_singleuse_vdst insertion"),
318-
cl::init(false), cl::Hidden);
319-
320314
// Enable GFX11+ s_delay_alu insertion
321315
static cl::opt<bool>
322316
EnableInsertDelayAlu("amdgpu-enable-delay-alu",
@@ -450,7 +444,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
450444
initializeAMDGPURewriteUndefForPHILegacyPass(*PR);
451445
initializeAMDGPUUnifyMetadataPass(*PR);
452446
initializeSIAnnotateControlFlowLegacyPass(*PR);
453-
initializeAMDGPUInsertSingleUseVDSTPass(*PR);
454447
initializeAMDGPUInsertDelayAluPass(*PR);
455448
initializeSIInsertHardClausesPass(*PR);
456449
initializeSIInsertWaitcntsPass(*PR);
@@ -1518,9 +1511,6 @@ void GCNPassConfig::addPreEmitPass() {
15181511
// cases.
15191512
addPass(&PostRAHazardRecognizerID);
15201513

1521-
if (isPassEnabled(EnableInsertSingleUseVDST, CodeGenOptLevel::Less))
1522-
addPass(&AMDGPUInsertSingleUseVDSTID);
1523-
15241514
if (isPassEnabled(EnableInsertDelayAlu, CodeGenOptLevel::Less))
15251515
addPass(&AMDGPUInsertDelayAluID);
15261516

llvm/lib/Target/AMDGPU/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ add_llvm_target(AMDGPUCodeGen
8181
AMDGPUMCInstLower.cpp
8282
AMDGPUMemoryUtils.cpp
8383
AMDGPUIGroupLP.cpp
84-
AMDGPUInsertSingleUseVDST.cpp
8584
AMDGPUMarkLastScratchLoad.cpp
8685
AMDGPUMIRFormatter.cpp
8786
AMDGPUOpenCLEnqueuedBlockLowering.cpp

llvm/lib/Target/AMDGPU/GCNSubtarget.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
215215
bool HasPackedTID = false;
216216
bool ScalarizeGlobal = false;
217217
bool HasSALUFloatInsts = false;
218-
bool HasVGPRSingleUseHintInsts = false;
219218
bool HasPseudoScalarTrans = false;
220219
bool HasRestrictedSOffset = false;
221220

@@ -1280,8 +1279,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
12801279

12811280
bool hasSALUFloatInsts() const { return HasSALUFloatInsts; }
12821281

1283-
bool hasVGPRSingleUseHintInsts() const { return HasVGPRSingleUseHintInsts; }
1284-
12851282
bool hasPseudoScalarTrans() const { return HasPseudoScalarTrans; }
12861283

12871284
bool hasRestrictedSOffset() const { return HasRestrictedSOffset; }

llvm/lib/Target/AMDGPU/SIInstrInfo.td

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2409,8 +2409,6 @@ class VOPProfile <list<ValueType> _ArgVT, bit _EnableClamp = 0> {
24092409
field bit EnableClamp = _EnableClamp;
24102410
field bit IsTrue16 = 0;
24112411
field bit IsRealTrue16 = 0;
2412-
field bit IsInvalidSingleUseConsumer = 0;
2413-
field bit IsInvalidSingleUseProducer = 0;
24142412

24152413
field ValueType DstVT = ArgVT[0];
24162414
field ValueType Src0VT = ArgVT[1];

0 commit comments

Comments
 (0)