summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target
diff options
context:
space:
mode:
authorKonstantin Zhuravlyov <kzhuravl_dev@outlook.com>2017-07-11 17:57:41 +0000
committerKonstantin Zhuravlyov <kzhuravl_dev@outlook.com>2017-07-11 17:57:41 +0000
commit94b3b47c73c6c1191c27823a0a5bbb5a020767bf (patch)
tree62c8ef299bf5b155489098bcd8d38da8acbd4a3e /llvm/lib/Target
parent4b6d01a00831abaa765d1d050bb0a169bd23c2f3 (diff)
downloadbcm5719-llvm-94b3b47c73c6c1191c27823a0a5bbb5a020767bf.tar.gz
bcm5719-llvm-94b3b47c73c6c1191c27823a0a5bbb5a020767bf.zip
Revert "AMDGPU: Do not test for SI in getIsaVersion"
This reverts commit r307573. This breaks downstream test. llvm-svn: 307678
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r--llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
index ca7ae3f6a31..26515b27bb7 100644
--- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
@@ -142,7 +142,7 @@ IsaVersion getIsaVersion(const FeatureBitset &Features) {
if (Features.test(FeatureISAVersion9_0_3))
return {9, 0, 3};
- if (!Features.test(FeatureGCN))
+ if (!Features.test(FeatureGCN) || Features.test(FeatureSouthernIslands))
return {0, 0, 0};
return {7, 0, 0};
}
OpenPOWER on IntegriCloud