Author: tstellar
Date: Fri Jan 29 10:45:52 2016
New Revision: 259206
URL: http://llvm.org/viewvc/llvm-project?rev=259206&view=rev
Log:
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
------------------------------------------------------------------------
Modified:
llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td
llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h
llvm/branches/release_38/lib/Target/AMDGPU/Processors.td
llvm/branches/release_38/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
llvm/branches/release_38/test/CodeGen/AMDGPU/hsa-note-no-func.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=259206&r1=259205&r2=259206&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:52
2016
@@ -183,6 +183,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/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h?rev=259206&r1=259205&r2=259206&view=diff
==============================================================================
--- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h (original)
+++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h Fri Jan 29
10:45:52 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/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=259206&r1=259205&r2=259206&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:52 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/branches/release_38/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp?rev=259206&r1=259205&r2=259206&view=diff
==============================================================================
--- llvm/branches/release_38/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
(original)
+++ llvm/branches/release_38/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp Fri Jan
29 10:45:52 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/branches/release_38/test/CodeGen/AMDGPU/hsa-note-no-func.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/CodeGen/AMDGPU/hsa-note-no-func.ll?rev=259206&r1=259205&r2=259206&view=diff
==============================================================================
--- llvm/branches/release_38/test/CodeGen/AMDGPU/hsa-note-no-func.ll (original)
+++ llvm/branches/release_38/test/CodeGen/AMDGPU/hsa-note-no-func.ll Fri Jan 29
10:45:52 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-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
