[llvm] r257666 - AMDGPU/SI: Update ISA version for FIJI

[Tom Stellard via llvm-commits]

Hi Hans,

Is this patch OK for the 3.8 branch?  If fixes a bug where we were
emitting the wrong ISA version into binary files.  I am the code owner
and I approve this commit.

-Tom

On Wed, Jan 13, 2016 at 08:39:25PM -0000, Changpeng Fang via llvm-commits wrote:
> Author: chfang
> Date: Wed Jan 13 14:39:25 2016
> New Revision: 257666
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=257666&view=rev
> Log:
> AMDGPU/SI: Update ISA version for FIJI
> 
> Modified:
>     llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
>     llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h
>     llvm/trunk/lib/Target/AMDGPU/Processors.td
>     llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
>     llvm/trunk/test/CodeGen/AMDGPU/hsa-note-no-func.ll
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPU.td?rev=257666&r1=257665&r2=257666&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/AMDGPU.td (original)
> +++ llvm/trunk/lib/Target/AMDGPU/AMDGPU.td Wed Jan 13 14:39:25 2016
> @@ -178,6 +178,7 @@ def FeatureISAVersion7_0_0 : SubtargetFe
>  def FeatureISAVersion7_0_1 : SubtargetFeatureISAVersion <7,0,1>;
>  def FeatureISAVersion8_0_0 : SubtargetFeatureISAVersion <8,0,0>;
>  def FeatureISAVersion8_0_1 : SubtargetFeatureISAVersion <8,0,1>;
> +def FeatureISAVersion8_0_3 : SubtargetFeatureISAVersion <8,0,3>;
>  
>  class SubtargetFeatureLocalMemorySize <int Value> : SubtargetFeature<
>          "localmemorysize"#Value,
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h?rev=257666&r1=257665&r2=257666&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h (original)
> +++ llvm/trunk/lib/Target/AMDGPU/AMDGPUSubtarget.h Wed Jan 13 14:39:25 2016
> @@ -53,7 +53,8 @@ public:
>      ISAVersion7_0_0,
>      ISAVersion7_0_1,
>      ISAVersion8_0_0,
> -    ISAVersion8_0_1
> +    ISAVersion8_0_1,
> +    ISAVersion8_0_3
>    };
>  
>  private:
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/Processors.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/Processors.td?rev=257666&r1=257665&r2=257666&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/Processors.td (original)
> +++ llvm/trunk/lib/Target/AMDGPU/Processors.td Wed Jan 13 14:39:25 2016
> @@ -140,7 +140,7 @@ def : ProcessorModel<"carrizo", SIQuarte
>  >;
>  
>  def : ProcessorModel<"fiji", SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureISAVersion8_0_1]
> +  [FeatureVolcanicIslands, FeatureISAVersion8_0_3]
>  >;
>  
>  def : ProcessorModel<"stoney", SIQuarterSpeedModel,
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp?rev=257666&r1=257665&r2=257666&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp (original)
> +++ llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp Wed Jan 13 14:39:25 2016
> @@ -41,6 +41,9 @@ IsaVersion getIsaVersion(const FeatureBi
>    if (Features.test(FeatureISAVersion8_0_1))
>      return {8, 0, 1};
>  
> +  if (Features.test(FeatureISAVersion8_0_3))
> +    return {8, 0, 3};
> +
>    return {0, 0, 0};
>  }
>  
> 
> Modified: llvm/trunk/test/CodeGen/AMDGPU/hsa-note-no-func.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/hsa-note-no-func.ll?rev=257666&r1=257665&r2=257666&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AMDGPU/hsa-note-no-func.ll (original)
> +++ llvm/trunk/test/CodeGen/AMDGPU/hsa-note-no-func.ll Wed Jan 13 14:39:25 2016
> @@ -1,6 +1,8 @@
>  ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=kaveri | FileCheck --check-prefix=HSA --check-prefix=HSA-CI %s
>  ; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=carrizo | FileCheck --check-prefix=HSA --check-prefix=HSA-VI %s
> +; RUN: llc < %s -mtriple=amdgcn--amdhsa -mcpu=fiji | FileCheck --check-prefix=HSA --check-prefix=HSA-FIJI %s
>  
>  ; HSA: .hsa_code_object_version 1,0
>  ; HSA-CI: .hsa_code_object_isa 7,0,0,"AMD","AMDGPU"
>  ; HSA-VI: .hsa_code_object_isa 8,0,1,"AMD","AMDGPU"
> +; HSA-FIJI: .hsa_code_object_isa 8,0,3,"AMD","AMDGPU"
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits