commit af7b5d7092a897baa05e18736e106d2890a54d11
author Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Thu Nov 15 23:14:23 2018 +0000
committer Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Thu Nov 15 23:14:23 2018 +0000
tree 786bf3836553997d9c27cdf7f399a4c4befa2d89
parent 20cd5f2e208ac9f047da6680a21c24acbc66aac4

AMDHSA: More code object v3 fixes:

  - Make sure IsaInfo::hasCodeObjectV3 returns true only
    for AMDHSA
  - Update assembler metadata tests to use v2 by default

llvm-svn: 347001

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 634ec8f..fc1e712 100644
--- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
@@ -159,7 +159,8 @@
 }
 
 bool hasCodeObjectV3(const MCSubtargetInfo *STI) {
-  return STI->getFeatureBits().test(FeatureCodeObjectV3);
+  return STI->getTargetTriple().getOS() == Triple::AMDHSA &&
+             STI->getFeatureBits().test(FeatureCodeObjectV3);
 }
 
 unsigned getWavefrontSize(const MCSubtargetInfo *STI) {