commit 95066496d08011c70b1dd6208deb17511f3000d0
author Ilya Biryukov <ibiryukov@google.com> Wed Sep 12 07:05:30 2018 +0000
committer Ilya Biryukov <ibiryukov@google.com> Wed Sep 12 07:05:30 2018 +0000
tree 71a56db87cad62cdac1878a77e4b76fee9031528
parent 26a37998588f673ef1e3fc4a126f2a0963dad6bb

Revert "AMDGPU: Move isa version and EF_AMDGPU_MACH_* determination into TargetParser."

This reverts commit r341982.

The change introduced a layering violation. Reverting to unbreak
our integrate.

llvm-svn: 342023

llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp

diff --git a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
index 819b1b9..b6dab35 100644
--- a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
+++ b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
@@ -369,7 +369,7 @@
   const SIRegisterInfo *TRI = nullptr;
   const MachineRegisterInfo *MRI = nullptr;
   const MachineLoopInfo *MLI = nullptr;
-  AMDGPU::IsaVersion IV;
+  AMDGPU::IsaInfo::IsaVersion IV;
 
   DenseSet<MachineBasicBlock *> BlockVisitedSet;
   DenseSet<MachineInstr *> TrackedWaitcntSet;
@@ -1841,7 +1841,7 @@
   TRI = &TII->getRegisterInfo();
   MRI = &MF.getRegInfo();
   MLI = &getAnalysis<MachineLoopInfo>();
-  IV = AMDGPU::getIsaVersion(ST->getCPU());
+  IV = AMDGPU::IsaInfo::getIsaVersion(ST->getFeatureBits());
   const SIMachineFunctionInfo *MFI = MF.getInfo<SIMachineFunctionInfo>();
 
   ForceEmitZeroWaitcnts = ForceEmitZeroFlag;