[llvm] r307678 - Revert "AMDGPU: Do not test for SI in getIsaVersion"

[Konstantin Zhuravlyov via llvm-commits]

Author: kzhuravl
Date: Tue Jul 11 10:57:41 2017
New Revision: 307678

URL: http://llvm.org/viewvc/llvm-project?rev=307678&view=rev
Log:
Revert "AMDGPU: Do not test for SI in getIsaVersion"

This reverts commit r307573.

This breaks downstream test.

Modified:
    llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Modified: llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp?rev=307678&r1=307677&r2=307678&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp Tue Jul 11 10:57:41 2017
@@ -142,7 +142,7 @@ IsaVersion getIsaVersion(const FeatureBi
   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};
 }