diff options
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPU.td | 9 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUFeatures.td | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/R600Processors.td | 11 |
4 files changed, 17 insertions, 10 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td index be7899d48df..18188494913 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPU.td +++ b/llvm/lib/Target/AMDGPU/AMDGPU.td @@ -431,22 +431,26 @@ def FeatureDisable : SubtargetFeature<"", >; class GCNSubtargetFeatureGeneration <string Value, - list<SubtargetFeature> Implies> : - SubtargetFeatureGeneration <Value, "GCNSubtarget", Implies>; + string FeatureName, + list<SubtargetFeature> Implies> : + SubtargetFeatureGeneration <Value, FeatureName, "GCNSubtarget", Implies>; def FeatureSouthernIslands : GCNSubtargetFeatureGeneration<"SOUTHERN_ISLANDS", + "southern-islands", [FeatureFP64, FeatureLocalMemorySize32768, FeatureMIMG_R128, FeatureWavefrontSize64, FeatureLDSBankCount32, FeatureMovrel, FeatureTrigReducedRange] >; def FeatureSeaIslands : GCNSubtargetFeatureGeneration<"SEA_ISLANDS", + "sea-islands", [FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128, FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureCIInsts, FeatureMovrel, FeatureTrigReducedRange] >; def FeatureVolcanicIslands : GCNSubtargetFeatureGeneration<"VOLCANIC_ISLANDS", + "volcanic-islands", [FeatureFP64, FeatureLocalMemorySize65536, FeatureMIMG_R128, FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts, @@ -458,6 +462,7 @@ def FeatureVolcanicIslands : GCNSubtargetFeatureGeneration<"VOLCANIC_ISLANDS", >; def FeatureGFX9 : GCNSubtargetFeatureGeneration<"GFX9", + "gfx9", [FeatureFP64, FeatureLocalMemorySize65536, FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN3Encoding, FeatureCIInsts, FeatureVIInsts, Feature16BitInsts, diff --git a/llvm/lib/Target/AMDGPU/AMDGPUFeatures.td b/llvm/lib/Target/AMDGPU/AMDGPUFeatures.td index 4e03ebce31c..ea3952c316e 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUFeatures.td +++ b/llvm/lib/Target/AMDGPU/AMDGPUFeatures.td @@ -49,9 +49,10 @@ def FeatureWavefrontSize16 : SubtargetFeatureWavefrontSize<16>; def FeatureWavefrontSize32 : SubtargetFeatureWavefrontSize<32>; def FeatureWavefrontSize64 : SubtargetFeatureWavefrontSize<64>; -class SubtargetFeatureGeneration <string Value, string Subtarget, +class SubtargetFeatureGeneration <string Value, string FeatureName, + string Subtarget, list<SubtargetFeature> Implies> : - SubtargetFeature <Value, "Gen", Subtarget#"::"#Value, + SubtargetFeature <FeatureName, "Gen", Subtarget#"::"#Value, Value#" GPU generation", Implies>; def FeaturePromoteAlloca : SubtargetFeature <"promote-alloca", diff --git a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp index 83f1ff8e97b..1cb29af00cb 100644 --- a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp +++ b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp @@ -932,7 +932,7 @@ public: if (getFeatureBits().none()) { // Set default features. - copySTI().ToggleFeature("SOUTHERN_ISLANDS"); + copySTI().ToggleFeature("southern-islands"); } setAvailableFeatures(ComputeAvailableFeatures(getFeatureBits())); diff --git a/llvm/lib/Target/AMDGPU/R600Processors.td b/llvm/lib/Target/AMDGPU/R600Processors.td index 12892840ecc..fff884e4848 100644 --- a/llvm/lib/Target/AMDGPU/R600Processors.td +++ b/llvm/lib/Target/AMDGPU/R600Processors.td @@ -40,23 +40,24 @@ def FeatureCFALUBug : SubtargetFeature<"cfalubug", "GPU has CF_ALU bug" >; -class R600SubtargetFeatureGeneration <string Value, +class R600SubtargetFeatureGeneration <string Value, string FeatureName, list<SubtargetFeature> Implies> : - SubtargetFeatureGeneration <Value, "R600Subtarget", Implies>; + SubtargetFeatureGeneration <Value, FeatureName, "R600Subtarget", Implies>; -def FeatureR600 : R600SubtargetFeatureGeneration<"R600", +def FeatureR600 : R600SubtargetFeatureGeneration<"R600", "r600", [FeatureR600ALUInst, FeatureFetchLimit8, FeatureLocalMemorySize0] >; -def FeatureR700 : R600SubtargetFeatureGeneration<"R700", +def FeatureR700 : R600SubtargetFeatureGeneration<"R700", "r700", [FeatureFetchLimit16, FeatureLocalMemorySize0] >; -def FeatureEvergreen : R600SubtargetFeatureGeneration<"EVERGREEN", +def FeatureEvergreen : R600SubtargetFeatureGeneration<"EVERGREEN", "evergreen", [FeatureFetchLimit16, FeatureLocalMemorySize32768] >; def FeatureNorthernIslands : R600SubtargetFeatureGeneration<"NORTHERN_ISLANDS", + "northern-islands", [FeatureFetchLimit16, FeatureWavefrontSize64, FeatureLocalMemorySize32768] >; |
