[llvm] r258922 - AMDGPU/SI: Stoney has only 16 LDS banks

[Tom Stellard via llvm-commits]

Hi Hans,

Is this patch OK to merge to the 3.8 branch?  It fixes a bug specific to
Stoney GPUs where LLVM was incorrectly allowing one kind of instruction
to read and write the same register.  I'm the code owner and I approve
this patch.

-Tom

On Wed, Jan 27, 2016 at 11:19:46AM -0000, Marek Olsak via llvm-commits wrote:
> Author: mareko
> Date: Wed Jan 27 05:19:45 2016
> New Revision: 258922
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=258922&view=rev
> Log:
> AMDGPU/SI: Stoney has only 16 LDS banks
> 
> Summary:
> This is a candidate for stable, along with all patches that add the "stoney"
> processor.
> 
> Reviewers: tstellarAMD
> 
> Subscribers: arsenm
> 
> Differential Revision: http://reviews.llvm.org/D16485
> 
> Modified:
>     llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
>     llvm/trunk/lib/Target/AMDGPU/Processors.td
>     llvm/trunk/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPU.td?rev=258922&r1=258921&r2=258922&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/AMDGPU.td (original)
> +++ llvm/trunk/lib/Target/AMDGPU/AMDGPU.td Wed Jan 27 05:19:45 2016
> @@ -290,7 +290,7 @@ def FeatureSeaIslands : SubtargetFeature
>  def FeatureVolcanicIslands : SubtargetFeatureGeneration<"VOLCANIC_ISLANDS",
>    [FeatureFP64, FeatureLocalMemorySize65536,
>     FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN,
> -   FeatureGCN3Encoding, FeatureCIInsts, FeatureLDSBankCount32]
> +   FeatureGCN3Encoding, FeatureCIInsts]
>  >;
>  
>  //===----------------------------------------------------------------------===//
> 
> Modified: llvm/trunk/lib/Target/AMDGPU/Processors.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/Processors.td?rev=258922&r1=258921&r2=258922&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AMDGPU/Processors.td (original)
> +++ llvm/trunk/lib/Target/AMDGPU/Processors.td Wed Jan 27 05:19:45 2016
> @@ -128,21 +128,23 @@ def : ProcessorModel<"mullins",    SIQua
>  //===----------------------------------------------------------------------===//
>  
>  def : ProcessorModel<"tonga",   SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureSGPRInitBug, FeatureISAVersion8_0_0]
> +  [FeatureVolcanicIslands, FeatureSGPRInitBug, FeatureISAVersion8_0_0,
> +   FeatureLDSBankCount32]
>  >;
>  
>  def : ProcessorModel<"iceland", SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureSGPRInitBug, FeatureISAVersion8_0_0]
> +  [FeatureVolcanicIslands, FeatureSGPRInitBug, FeatureISAVersion8_0_0,
> +   FeatureLDSBankCount32]
>  >;
>  
>  def : ProcessorModel<"carrizo", SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureISAVersion8_0_1]
> +  [FeatureVolcanicIslands, FeatureISAVersion8_0_1, FeatureLDSBankCount32]
>  >;
>  
>  def : ProcessorModel<"fiji", SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureISAVersion8_0_3]
> +  [FeatureVolcanicIslands, FeatureISAVersion8_0_3, FeatureLDSBankCount32]
>  >;
>  
>  def : ProcessorModel<"stoney", SIQuarterSpeedModel,
> -  [FeatureVolcanicIslands, FeatureISAVersion8_0_1]
> +  [FeatureVolcanicIslands, FeatureISAVersion8_0_1, FeatureLDSBankCount16]
>  >;
> 
> Modified: llvm/trunk/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll?rev=258922&r1=258921&r2=258922&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll (original)
> +++ llvm/trunk/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll Wed Jan 27 05:19:45 2016
> @@ -1,5 +1,6 @@
>  ;RUN: llc < %s -march=amdgcn -mcpu=verde -verify-machineinstrs | FileCheck --check-prefix=GCN %s
>  ;RUN: llc < %s -march=amdgcn -mcpu=kabini -verify-machineinstrs | FileCheck --check-prefix=GCN --check-prefix=16BANK %s
> +;RUN: llc < %s -march=amdgcn -mcpu=stoney -verify-machineinstrs | FileCheck --check-prefix=GCN --check-prefix=16BANK %s
>  ;RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs | FileCheck --check-prefix=GCN %s
>  
>  ;GCN-LABEL: {{^}}main:
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits