From 2e59a45f80e5323bcc5c5c811a1aae86584daef2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 13 Jun 2014 01:32:00 +0000 Subject: R600: Move AMDGPUInstrInfo from AMDGPUTargetMachine into AMDGPUSubtarget llvm-svn: 210869 --- llvm/lib/Target/R600/AMDGPUSubtarget.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'llvm/lib/Target/R600/AMDGPUSubtarget.cpp') diff --git a/llvm/lib/Target/R600/AMDGPUSubtarget.cpp b/llvm/lib/Target/R600/AMDGPUSubtarget.cpp index f3b993204a5..348d50f93f4 100644 --- a/llvm/lib/Target/R600/AMDGPUSubtarget.cpp +++ b/llvm/lib/Target/R600/AMDGPUSubtarget.cpp @@ -13,6 +13,8 @@ //===----------------------------------------------------------------------===// #include "AMDGPUSubtarget.h" +#include "R600InstrInfo.h" +#include "SIInstrInfo.h" using namespace llvm; @@ -41,6 +43,12 @@ AMDGPUSubtarget::AMDGPUSubtarget(StringRef TT, StringRef CPU, StringRef FS) : CFALUBug = false; ParseSubtargetFeatures(GPU, FS); DevName = GPU; + + if (getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS) { + InstrInfo.reset(new R600InstrInfo(*this)); + } else { + InstrInfo.reset(new SIInstrInfo(*this)); + } } bool -- cgit v1.2.3