Commit 92b4e31b authored by Tom Stellard's avatar Tom Stellard
Browse files

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

------------------------------------------------------------------------

llvm-svn: 259207
parent 5b2e85b5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ def FeatureSeaIslands : SubtargetFeatureGeneration<"SEA_ISLANDS",
def FeatureVolcanicIslands : SubtargetFeatureGeneration<"VOLCANIC_ISLANDS",
        [Feature64BitPtr, FeatureFP64, FeatureLocalMemorySize65536,
         FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN,
         FeatureGCN3Encoding, FeatureCIInsts, FeatureLDSBankCount32]>;
         FeatureGCN3Encoding, FeatureCIInsts]>;

//===----------------------------------------------------------------------===//

+7 −5
Original line number Diff line number Diff line
@@ -128,21 +128,23 @@ def : ProcessorModel<"mullins", SIQuarterSpeedModel,
//===----------------------------------------------------------------------===//

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]
>;
+1 −0
Original line number Diff line number Diff line
;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: