This is an archive of the discontinued LLVM Phabricator instance.

Differential D60142

AMDGPU: Fix names for generation features
ClosedPublic

Authored by arsenm on Apr 2 2019, 11:02 AM.

Details

Reviewers
rampitec
kzhuravl
Summary

We should overall stop using these, but the uppercase name didn't
work. Any feature string is converted to lowercase, so these
could never be found in the table.

Diff Detail

Event Timeline

arsenm created this revision.Apr 2 2019, 11:02 AM
Herald added subscribers: t-tye, tpr, dstuttard and 4 others. · View Herald TranscriptApr 2 2019, 11:02 AM
rampitec accepted this revision.Apr 2 2019, 11:06 AM

LGTM

This revision is now accepted and ready to land.Apr 2 2019, 11:06 AM
arsenm closed this revision.Apr 2 2019, 5:13 PM

r357541

Revision Contents

PathSize
lib/
Target/
AMDGPU/
9 lines
5 lines
11 lines

Diff 193329

lib/Target/AMDGPU/AMDGPU.td

Show First 20 Lines • Show All 425 Lines • ▼ Show 20 Lines
// Dummy feature used to disable assembler instructions. // Dummy feature used to disable assembler instructions.
def FeatureDisable : SubtargetFeature<"", def FeatureDisable : SubtargetFeature<"",
"FeatureDisable","true", "FeatureDisable","true",
"Dummy feature to disable assembler instructions" "Dummy feature to disable assembler instructions"
>; >;
class GCNSubtargetFeatureGeneration <string Value, class GCNSubtargetFeatureGeneration <string Value,
string FeatureName,
list<SubtargetFeature> Implies> : list<SubtargetFeature> Implies> :
SubtargetFeatureGeneration <Value, "GCNSubtarget", Implies>; SubtargetFeatureGeneration <Value, FeatureName, "GCNSubtarget", Implies>;
def FeatureSouthernIslands : GCNSubtargetFeatureGeneration<"SOUTHERN_ISLANDS", def FeatureSouthernIslands : GCNSubtargetFeatureGeneration<"SOUTHERN_ISLANDS",
"southern-islands",
[FeatureFP64, FeatureLocalMemorySize32768, FeatureMIMG_R128, [FeatureFP64, FeatureLocalMemorySize32768, FeatureMIMG_R128,
FeatureWavefrontSize64, FeatureWavefrontSize64,
FeatureLDSBankCount32, FeatureMovrel, FeatureTrigReducedRange] FeatureLDSBankCount32, FeatureMovrel, FeatureTrigReducedRange]
>; >;
def FeatureSeaIslands : GCNSubtargetFeatureGeneration<"SEA_ISLANDS", def FeatureSeaIslands : GCNSubtargetFeatureGeneration<"SEA_ISLANDS",
"sea-islands",
[FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128, [FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128,
FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureWavefrontSize64, FeatureFlatAddressSpace,
FeatureCIInsts, FeatureMovrel, FeatureTrigReducedRange] FeatureCIInsts, FeatureMovrel, FeatureTrigReducedRange]
>; >;
def FeatureVolcanicIslands : GCNSubtargetFeatureGeneration<"VOLCANIC_ISLANDS", def FeatureVolcanicIslands : GCNSubtargetFeatureGeneration<"VOLCANIC_ISLANDS",
"volcanic-islands",
[FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128, [FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128,
FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureWavefrontSize64, FeatureFlatAddressSpace,
FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts, FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts,
FeatureSMemRealTime, FeatureVGPRIndexMode, FeatureMovrel, FeatureSMemRealTime, FeatureVGPRIndexMode, FeatureMovrel,
FeatureScalarStores, FeatureInv2PiInlineImm, FeatureScalarStores, FeatureInv2PiInlineImm,
FeatureSDWA, FeatureSDWAOutModsVOPC, FeatureSDWAMac, FeatureDPP, FeatureSDWA, FeatureSDWAOutModsVOPC, FeatureSDWAMac, FeatureDPP,
FeatureIntClamp, FeatureTrigReducedRange FeatureIntClamp, FeatureTrigReducedRange
] ]
>; >;
def FeatureGFX9 : GCNSubtargetFeatureGeneration<"GFX9", def FeatureGFX9 : GCNSubtargetFeatureGeneration<"GFX9",
"gfx9",
[FeatureFP64, FeatureLocalMemorySize65536, [FeatureFP64, FeatureLocalMemorySize65536,
FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureWavefrontSize64, FeatureFlatAddressSpace,
FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts, FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts,
FeatureSMemRealTime, FeatureScalarStores, FeatureInv2PiInlineImm, FeatureSMemRealTime, FeatureScalarStores, FeatureInv2PiInlineImm,
FeatureApertureRegs, FeatureGFX9Insts, FeatureVOP3P, FeatureVGPRIndexMode, FeatureApertureRegs, FeatureGFX9Insts, FeatureVOP3P, FeatureVGPRIndexMode,
FeatureFastFMAF32, FeatureDPP, FeatureIntClamp, FeatureFastFMAF32, FeatureDPP, FeatureIntClamp,
FeatureSDWA, FeatureSDWAOmod, FeatureSDWAScalar, FeatureSDWASdst, FeatureSDWA, FeatureSDWAOmod, FeatureSDWAScalar, FeatureSDWASdst,
FeatureFlatInstOffsets, FeatureFlatGlobalInsts, FeatureFlatScratchInsts, FeatureFlatInstOffsets, FeatureFlatGlobalInsts, FeatureFlatScratchInsts,
▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines

lib/Target/AMDGPU/AMDGPUFeatures.td

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Linesclass SubtargetFeatureWavefrontSize <int Value> : SubtargetFeature<
!cast<string>(Value), !cast<string>(Value),
"The number of threads per wavefront" "The number of threads per wavefront"
>; >;
def FeatureWavefrontSize16 : SubtargetFeatureWavefrontSize<16>; def FeatureWavefrontSize16 : SubtargetFeatureWavefrontSize<16>;
def FeatureWavefrontSize32 : SubtargetFeatureWavefrontSize<32>; def FeatureWavefrontSize32 : SubtargetFeatureWavefrontSize<32>;
def FeatureWavefrontSize64 : SubtargetFeatureWavefrontSize<64>; def FeatureWavefrontSize64 : SubtargetFeatureWavefrontSize<64>;
class SubtargetFeatureGeneration <string Value, string Subtarget, class SubtargetFeatureGeneration <string Value, string FeatureName,
string Subtarget,
list<SubtargetFeature> Implies> : list<SubtargetFeature> Implies> :
SubtargetFeature <Value, "Gen", Subtarget#"::"#Value, SubtargetFeature <FeatureName, "Gen", Subtarget#"::"#Value,
Value#" GPU generation", Implies>; Value#" GPU generation", Implies>;
def FeaturePromoteAlloca : SubtargetFeature <"promote-alloca", def FeaturePromoteAlloca : SubtargetFeature <"promote-alloca",
"EnablePromoteAlloca", "EnablePromoteAlloca",
"true", "true",
"Enable promote alloca pass" "Enable promote alloca pass"
>; >;

lib/Target/AMDGPU/R600Processors.td

Show All 34 Lines
>; >;
def FeatureCFALUBug : SubtargetFeature<"cfalubug", def FeatureCFALUBug : SubtargetFeature<"cfalubug",
"CFALUBug", "CFALUBug",
"true", "true",
"GPU has CF_ALU bug" "GPU has CF_ALU bug"
>; >;
class R600SubtargetFeatureGeneration <string Value, class R600SubtargetFeatureGeneration <string Value, string FeatureName,
list<SubtargetFeature> Implies> : list<SubtargetFeature> Implies> :
SubtargetFeatureGeneration <Value, "R600Subtarget", Implies>; SubtargetFeatureGeneration <Value, FeatureName, "R600Subtarget", Implies>;
def FeatureR600 : R600SubtargetFeatureGeneration<"R600", def FeatureR600 : R600SubtargetFeatureGeneration<"R600", "r600",
[FeatureR600ALUInst, FeatureFetchLimit8, FeatureLocalMemorySize0] [FeatureR600ALUInst, FeatureFetchLimit8, FeatureLocalMemorySize0]
>; >;
def FeatureR700 : R600SubtargetFeatureGeneration<"R700", def FeatureR700 : R600SubtargetFeatureGeneration<"R700", "r700",
[FeatureFetchLimit16, FeatureLocalMemorySize0] [FeatureFetchLimit16, FeatureLocalMemorySize0]
>; >;
def FeatureEvergreen : R600SubtargetFeatureGeneration<"EVERGREEN", def FeatureEvergreen : R600SubtargetFeatureGeneration<"EVERGREEN", "evergreen",
[FeatureFetchLimit16, FeatureLocalMemorySize32768] [FeatureFetchLimit16, FeatureLocalMemorySize32768]
>; >;
def FeatureNorthernIslands : R600SubtargetFeatureGeneration<"NORTHERN_ISLANDS", def FeatureNorthernIslands : R600SubtargetFeatureGeneration<"NORTHERN_ISLANDS",
"northern-islands",
[FeatureFetchLimit16, FeatureWavefrontSize64, [FeatureFetchLimit16, FeatureWavefrontSize64,
FeatureLocalMemorySize32768] FeatureLocalMemorySize32768]
>; >;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Radeon HD 2000/3000 Series (R600). // Radeon HD 2000/3000 Series (R600).
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines