Commit 5b2e85b5 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r257666: 

------------------------------------------------------------------------
r257666 | changpeng.fang | 2016-01-13 15:39:25 -0500 (Wed, 13 Jan 2016) | 2 lines

AMDGPU/SI: Update ISA version for FIJI

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

llvm-svn: 259206
parent e3b69230

llvm/lib/Target/AMDGPU/AMDGPU.td

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ def FeatureISAVersion7_0_0 : SubtargetFeatureISAVersion <7,0,0>; 
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,

llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ public: 
    ISAVersion7_0_0,

    ISAVersion7_0_1,

    ISAVersion8_0_0,

    ISAVersion8_0_1

    ISAVersion8_0_1,

    ISAVersion8_0_3

  };



private:

llvm/lib/Target/AMDGPU/Processors.td

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ def : ProcessorModel<"carrizo", SIQuarterSpeedModel, 
>;



def : ProcessorModel<"fiji", SIQuarterSpeedModel,

  [FeatureVolcanicIslands, FeatureISAVersion8_0_1]

  [FeatureVolcanicIslands, FeatureISAVersion8_0_3]

>;



def : ProcessorModel<"stoney", SIQuarterSpeedModel,

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ IsaVersion getIsaVersion(const FeatureBitset &Features) { 
  if (Features.test(FeatureISAVersion8_0_1))

    return {8, 0, 1};



  if (Features.test(FeatureISAVersion8_0_3))

    return {8, 0, 3};



  return {0, 0, 0};

}

llvm/test/CodeGen/AMDGPU/hsa-note-no-func.ll

+2 −0
Original line number Diff line number Diff line 
; 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"