Author: tstellar Date: Fri Jan 29 10:45:55 2016 New Revision: 259207 URL: http://llvm.org/viewvc/llvm-project?rev=259207&view=rev Log: Merging r258922:
------------------------------------------------------------------------ r258922 | marek.olsak | 2016-01-27 06:19:45 -0500 (Wed, 27 Jan 2016) | 12 lines 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/branches/release_38/lib/Target/AMDGPU/AMDGPU.td llvm/branches/release_38/lib/Target/AMDGPU/Processors.td llvm/branches/release_38/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td?rev=259207&r1=259206&r2=259207&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td Fri Jan 29 10:45:55 2016 @@ -253,7 +253,7 @@ def FeatureSeaIslands : SubtargetFeature def FeatureVolcanicIslands : SubtargetFeatureGeneration<"VOLCANIC_ISLANDS", [Feature64BitPtr, FeatureFP64, FeatureLocalMemorySize65536, FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN, - FeatureGCN3Encoding, FeatureCIInsts, FeatureLDSBankCount32]>; + FeatureGCN3Encoding, FeatureCIInsts]>; //===----------------------------------------------------------------------===// Modified: llvm/branches/release_38/lib/Target/AMDGPU/Processors.td URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/Processors.td?rev=259207&r1=259206&r2=259207&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/Processors.td (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/Processors.td Fri Jan 29 10:45:55 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/branches/release_38/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll?rev=259207&r1=259206&r2=259207&view=diff ============================================================================== --- llvm/branches/release_38/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll (original) +++ llvm/branches/release_38/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll Fri Jan 29 10:45:55 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-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
