diff options
| author | Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> | 2018-11-15 02:32:43 +0000 |
|---|---|---|
| committer | Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> | 2018-11-15 02:32:43 +0000 |
| commit | a25e0524c0a7db6cdb17bc1771c49eefad89dfd3 (patch) | |
| tree | d90af45dbb09d48ee5198c4a94f089f79d0afd1c /llvm/lib/Target/AMDGPU | |
| parent | acaffc5c97a908d3cac1f25cdbd8987d1c176d41 (diff) | |
| download | bcm5719-llvm-a25e0524c0a7db6cdb17bc1771c49eefad89dfd3.tar.gz bcm5719-llvm-a25e0524c0a7db6cdb17bc1771c49eefad89dfd3.zip | |
AMDGPU: Enable code object v3 for AMDHSA only
Differential Revision: https://reviews.llvm.org/D54186
llvm-svn: 346923
Diffstat (limited to 'llvm/lib/Target/AMDGPU')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPU.td | 48 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h | 3 |
2 files changed, 34 insertions, 17 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td index 96a8029773d..23470c7a4d2 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPU.td +++ b/llvm/lib/Target/AMDGPU/AMDGPU.td @@ -465,34 +465,41 @@ def FeatureISAVersion6_0_0 : SubtargetFeatureISAVersion <6,0,0, [FeatureSouthernIslands, FeatureFastFMAF32, HalfRate64Ops, - FeatureLDSBankCount32]>; + FeatureLDSBankCount32, + FeatureCodeObjectV3]>; def FeatureISAVersion6_0_1 : SubtargetFeatureISAVersion <6,0,1, [FeatureSouthernIslands, - FeatureLDSBankCount32]>; + FeatureLDSBankCount32, + FeatureCodeObjectV3]>; def FeatureISAVersion7_0_0 : SubtargetFeatureISAVersion <7,0,0, [FeatureSeaIslands, - FeatureLDSBankCount32]>; + FeatureLDSBankCount32, + FeatureCodeObjectV3]>; def FeatureISAVersion7_0_1 : SubtargetFeatureISAVersion <7,0,1, [FeatureSeaIslands, HalfRate64Ops, FeatureLDSBankCount32, - FeatureFastFMAF32]>; + FeatureFastFMAF32, + FeatureCodeObjectV3]>; def FeatureISAVersion7_0_2 : SubtargetFeatureISAVersion <7,0,2, [FeatureSeaIslands, FeatureLDSBankCount16, - FeatureFastFMAF32]>; + FeatureFastFMAF32, + FeatureCodeObjectV3]>; def FeatureISAVersion7_0_3 : SubtargetFeatureISAVersion <7,0,3, [FeatureSeaIslands, - FeatureLDSBankCount16]>; + FeatureLDSBankCount16, + FeatureCodeObjectV3]>; def FeatureISAVersion7_0_4 : SubtargetFeatureISAVersion <7,0,4, [FeatureSeaIslands, - FeatureLDSBankCount32]>; + FeatureLDSBankCount32, + FeatureCodeObjectV3]>; def FeatureISAVersion8_0_1 : SubtargetFeatureISAVersion <8,0,1, [FeatureVolcanicIslands, @@ -500,39 +507,46 @@ def FeatureISAVersion8_0_1 : SubtargetFeatureISAVersion <8,0,1, HalfRate64Ops, FeatureLDSBankCount32, FeatureXNACK, - FeatureUnpackedD16VMem]>; + FeatureUnpackedD16VMem, + FeatureCodeObjectV3]>; def FeatureISAVersion8_0_2 : SubtargetFeatureISAVersion <8,0,2, [FeatureVolcanicIslands, FeatureLDSBankCount32, FeatureSGPRInitBug, - FeatureUnpackedD16VMem]>; + FeatureUnpackedD16VMem, + FeatureCodeObjectV3]>; def FeatureISAVersion8_0_3 : SubtargetFeatureISAVersion <8,0,3, [FeatureVolcanicIslands, FeatureLDSBankCount32, - FeatureUnpackedD16VMem]>; + FeatureUnpackedD16VMem, + FeatureCodeObjectV3]>; def FeatureISAVersion8_1_0 : SubtargetFeatureISAVersion <8,1,0, [FeatureVolcanicIslands, FeatureLDSBankCount16, - FeatureXNACK]>; + FeatureXNACK, + FeatureCodeObjectV3]>; def FeatureISAVersion9_0_0 : SubtargetFeatureISAVersion <9,0,0, [FeatureGFX9, FeatureMadMixInsts, - FeatureLDSBankCount32]>; + FeatureLDSBankCount32, + FeatureCodeObjectV3]>; def FeatureISAVersion9_0_2 : SubtargetFeatureISAVersion <9,0,2, [FeatureGFX9, FeatureMadMixInsts, FeatureLDSBankCount32, - FeatureXNACK]>; + FeatureXNACK, + FeatureCodeObjectV3]>; def FeatureISAVersion9_0_4 : SubtargetFeatureISAVersion <9,0,4, [FeatureGFX9, FeatureLDSBankCount32, - FeatureFmaMixInsts]>; + FeatureFmaMixInsts, + FeatureCodeObjectV3]>; def FeatureISAVersion9_0_6 : SubtargetFeatureISAVersion <9,0,6, [FeatureGFX9, @@ -540,13 +554,15 @@ def FeatureISAVersion9_0_6 : SubtargetFeatureISAVersion <9,0,6, FeatureFmaMixInsts, FeatureLDSBankCount32, FeatureDLInsts, - FeatureSRAMECC]>; + FeatureSRAMECC, + FeatureCodeObjectV3]>; def FeatureISAVersion9_0_9 : SubtargetFeatureISAVersion <9,0,9, [FeatureGFX9, FeatureMadMixInsts, FeatureLDSBankCount32, - FeatureXNACK]>; + FeatureXNACK, + FeatureCodeObjectV3]>; //===----------------------------------------------------------------------===// // Debugger related subtarget features. diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h index 8b1cb23c672..886aca42b6c 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h @@ -581,7 +581,8 @@ public: } bool hasCodeObjectV3() const { - return CodeObjectV3; + // FIXME: Need to add code object v3 support for mesa and pal. + return isAmdHsaOS() ? CodeObjectV3 : false; } bool hasUnalignedBufferAccess() const { |
