Skip to content

Commit 05da561

Browse files
committed
[AMDGPU] Remove FeatureForceStoreSC0SC1
This was only used for gfx940 and gfx941, which have since been removed. For SWDEV-512631
1 parent 6856e05 commit 05da561

File tree

3 files changed

+0
-29
lines changed

3 files changed

+0
-29
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.td

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,12 +1040,6 @@ def FeatureVALUTransUseHazard : SubtargetFeature<"valu-trans-use-hazard",
10401040
"Hazard when TRANS instructions are closely followed by a use of the result"
10411041
>;
10421042

1043-
def FeatureForceStoreSC0SC1 : SubtargetFeature<"force-store-sc0-sc1",
1044-
"HasForceStoreSC0SC1",
1045-
"true",
1046-
"Has SC0 and SC1 on stores"
1047-
>;
1048-
10491043
def FeatureSALUFloatInsts : SubtargetFeature<"salu-float",
10501044
"HasSALUFloatInsts",
10511045
"true",

llvm/lib/Target/AMDGPU/GCNSubtarget.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
246246
bool HasMADIntraFwdBug = false;
247247
bool HasVOPDInsts = false;
248248
bool HasVALUTransUseHazard = false;
249-
bool HasForceStoreSC0SC1 = false;
250249
bool HasRequiredExportPriority = false;
251250
bool HasVmemWriteVgprInOrder = false;
252251
bool HasAshrPkInsts = false;
@@ -1264,8 +1263,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
12641263

12651264
bool hasCvtScaleForwardingHazard() const { return GFX950Insts; }
12661265

1267-
bool hasForceStoreSC0SC1() const { return HasForceStoreSC0SC1; }
1268-
12691266
bool requiresCodeObjectV6() const { return RequiresCOV6; }
12701267

12711268
bool hasVALUMaskWriteHazard() const { return getGeneration() == GFX11; }

llvm/lib/Target/AMDGPU/SIMemoryLegalizer.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,6 @@ class SICacheControl {
359359

360360
/// Virtual destructor to allow derivations to be deleted.
361361
virtual ~SICacheControl() = default;
362-
363-
virtual bool tryForceStoreSC0SC1(const SIMemOpInfo &MOI,
364-
MachineBasicBlock::iterator &MI) const {
365-
return false;
366-
}
367362
};
368363

369364
class SIGfx6CacheControl : public SICacheControl {
@@ -517,20 +512,6 @@ class SIGfx940CacheControl : public SIGfx90ACacheControl {
517512
bool insertRelease(MachineBasicBlock::iterator &MI, SIAtomicScope Scope,
518513
SIAtomicAddrSpace AddrSpace, bool IsCrossAddrSpaceOrdering,
519514
Position Pos) const override;
520-
521-
bool tryForceStoreSC0SC1(const SIMemOpInfo &MOI,
522-
MachineBasicBlock::iterator &MI) const override {
523-
bool Changed = false;
524-
if (ST.hasForceStoreSC0SC1() &&
525-
(MOI.getInstrAddrSpace() & (SIAtomicAddrSpace::SCRATCH |
526-
SIAtomicAddrSpace::GLOBAL |
527-
SIAtomicAddrSpace::OTHER)) !=
528-
SIAtomicAddrSpace::NONE) {
529-
Changed |= enableSC0Bit(MI);
530-
Changed |= enableSC1Bit(MI);
531-
}
532-
return Changed;
533-
}
534515
};
535516

536517
class SIGfx10CacheControl : public SIGfx7CacheControl {
@@ -2820,7 +2801,6 @@ bool SIMemoryLegalizer::runOnMachineFunction(MachineFunction &MF) {
28202801
Changed |= expandLoad(*MOI, MI);
28212802
else if (const auto &MOI = MOA.getStoreInfo(MI)) {
28222803
Changed |= expandStore(*MOI, MI);
2823-
Changed |= CC->tryForceStoreSC0SC1(*MOI, MI);
28242804
} else if (const auto &MOI = MOA.getAtomicFenceInfo(MI))
28252805
Changed |= expandAtomicFence(*MOI, MI);
28262806
else if (const auto &MOI = MOA.getAtomicCmpxchgOrRmwInfo(MI))

0 commit comments

Comments
 (0)