Skip to content

Commit 7dc7d0e

Browse files
authored
AMDGPU: Remove subtarget feature hacking in AsmParser (#159227)
The wavesize hacking part was already done in createAMDGPUMCSubtargetInfo, and we can move the default target hack there too.
1 parent f7f7abc commit 7dc7d0e

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,20 +1442,6 @@ class AMDGPUAsmParser : public MCTargetAsmParser {
14421442
: MCTargetAsmParser(Options, STI, MII), Parser(_Parser) {
14431443
MCAsmParserExtension::Initialize(Parser);
14441444

1445-
if (getFeatureBits().none()) {
1446-
// Set default features.
1447-
copySTI().ToggleFeature("southern-islands");
1448-
}
1449-
1450-
FeatureBitset FB = getFeatureBits();
1451-
if (!FB[AMDGPU::FeatureWavefrontSize64] &&
1452-
!FB[AMDGPU::FeatureWavefrontSize32]) {
1453-
// If there is no default wave size it must be a generation before gfx10,
1454-
// these have FeatureWavefrontSize64 in their definition already. For
1455-
// gfx10+ set wave32 as a default.
1456-
copySTI().ToggleFeature(AMDGPU::FeatureWavefrontSize32);
1457-
}
1458-
14591445
setAvailableFeatures(ComputeAvailableFeatures(getFeatureBits()));
14601446

14611447
AMDGPU::IsaVersion ISA = AMDGPU::getIsaVersion(getSTI().getCPU());

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ createAMDGPUMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) {
8383
createAMDGPUMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS);
8484

8585
// FIXME: We should error for the default target.
86+
if (STI->getFeatureBits().none())
87+
STI->ToggleFeature(AMDGPU::FeatureSouthernIslands);
88+
8689
if (!STI->hasFeature(AMDGPU::FeatureWavefrontSize64) &&
8790
!STI->hasFeature(AMDGPU::FeatureWavefrontSize32)) {
8891
// If there is no default wave size it must be a generation before gfx10,

0 commit comments

Comments
 (0)