commit 94b3b47c73c6c1191c27823a0a5bbb5a020767bf
author Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Tue Jul 11 17:57:41 2017 +0000
committer Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Tue Jul 11 17:57:41 2017 +0000
tree 62c8ef299bf5b155489098bcd8d38da8acbd4a3e
parent 4b6d01a00831abaa765d1d050bb0a169bd23c2f3

Revert "AMDGPU: Do not test for SI in getIsaVersion"

This reverts commit r307573.

This breaks downstream test.

llvm-svn: 307678

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

diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
index ca7ae3f..26515b2 100644
--- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
@@ -142,7 +142,7 @@
   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};
 }