diff options
| author | Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> | 2018-02-16 21:26:25 +0000 |
|---|---|---|
| committer | Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> | 2018-02-16 21:26:25 +0000 |
| commit | 331f97e171f36ceaf25cdb6c573510cd7c45d358 (patch) | |
| tree | b1f67c47c7c91ae2593d4fc8dea395925d4acff7 /llvm/lib | |
| parent | 4f2b1189d562e36b5573ccf76bd5f603375b6b5b (diff) | |
| download | bcm5719-llvm-331f97e171f36ceaf25cdb6c573510cd7c45d358.tar.gz bcm5719-llvm-331f97e171f36ceaf25cdb6c573510cd7c45d358.zip | |
AMDGPU: Bring processors and features in sync with the spec
- Remove gfx800
- Make iceland gfx802
- Add xnack to gfx902
Differential Revision: https://reviews.llvm.org/D43355
llvm-svn: 325393
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPU.td | 9 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h | 1 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/GCNProcessors.td | 12 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 2 |
4 files changed, 6 insertions, 18 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td index c12a7182e7b..c7b3b6dcbf5 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPU.td +++ b/llvm/lib/Target/AMDGPU/AMDGPU.td @@ -556,12 +556,6 @@ def FeatureISAVersion7_0_4 : SubtargetFeatureISAVersion <7,0,4, [FeatureSeaIslands, FeatureLDSBankCount32]>; -def FeatureISAVersion8_0_0 : SubtargetFeatureISAVersion <8,0,0, - [FeatureVolcanicIslands, - FeatureLDSBankCount32, - FeatureSGPRInitBug, - FeatureUnpackedD16VMem]>; - def FeatureISAVersion8_0_1 : SubtargetFeatureISAVersion <8,0,1, [FeatureVolcanicIslands, FeatureFastFMAF32, @@ -595,7 +589,8 @@ def FeatureISAVersion9_0_0 : SubtargetFeatureISAVersion <9,0,0, def FeatureISAVersion9_0_2 : SubtargetFeatureISAVersion <9,0,2, [FeatureGFX9, FeatureMadMixInsts, - FeatureLDSBankCount32 + FeatureLDSBankCount32, + FeatureXNACK ]>; //===----------------------------------------------------------------------===// diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h index 700be80cd5c..5b4f8fc1261 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h @@ -67,7 +67,6 @@ public: ISAVersion7_0_2, ISAVersion7_0_3, ISAVersion7_0_4, - ISAVersion8_0_0, ISAVersion8_0_1, ISAVersion8_0_2, ISAVersion8_0_3, diff --git a/llvm/lib/Target/AMDGPU/GCNProcessors.td b/llvm/lib/Target/AMDGPU/GCNProcessors.td index b2a3f652abd..c4f585d5140 100644 --- a/llvm/lib/Target/AMDGPU/GCNProcessors.td +++ b/llvm/lib/Target/AMDGPU/GCNProcessors.td @@ -93,14 +93,6 @@ def : ProcessorModel<"bonaire", SIQuarterSpeedModel, // GCN GFX8 (Volcanic Islands (VI)). //===----------------------------------------------------------------------===// -def : ProcessorModel<"gfx800", SIQuarterSpeedModel, - [FeatureISAVersion8_0_0] ->; - -def : ProcessorModel<"iceland", SIQuarterSpeedModel, - [FeatureISAVersion8_0_0] ->; - def : ProcessorModel<"gfx801", SIQuarterSpeedModel, [FeatureISAVersion8_0_1] >; @@ -113,6 +105,10 @@ def : ProcessorModel<"gfx802", SIQuarterSpeedModel, [FeatureISAVersion8_0_2] >; +def : ProcessorModel<"iceland", SIQuarterSpeedModel, + [FeatureISAVersion8_0_2] +>; + def : ProcessorModel<"tonga", SIQuarterSpeedModel, [FeatureISAVersion8_0_2] >; diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp index 38b72c3321f..08ecf4fc907 100644 --- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp +++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp @@ -207,8 +207,6 @@ IsaVersion getIsaVersion(const FeatureBitset &Features) { return {7, 0, 4}; // GCN GFX8 (Volcanic Islands (VI)). - if (Features.test(FeatureISAVersion8_0_0)) - return {8, 0, 0}; if (Features.test(FeatureISAVersion8_0_1)) return {8, 0, 1}; if (Features.test(FeatureISAVersion8_0_2)) |
