diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2014-06-13 01:32:00 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2014-06-13 01:32:00 +0000 |
| commit | 2e59a45f80e5323bcc5c5c811a1aae86584daef2 (patch) | |
| tree | 9f4e11fd3eb46b7abbddfb4b39b7bf54c595d26f /llvm/lib/Target/R600/AMDGPUSubtarget.cpp | |
| parent | d881e9195a7f612b08bf8e8c7f7a0a6040b2fee2 (diff) | |
| download | bcm5719-llvm-2e59a45f80e5323bcc5c5c811a1aae86584daef2.tar.gz bcm5719-llvm-2e59a45f80e5323bcc5c5c811a1aae86584daef2.zip | |
R600: Move AMDGPUInstrInfo from AMDGPUTargetMachine into AMDGPUSubtarget
llvm-svn: 210869
Diffstat (limited to 'llvm/lib/Target/R600/AMDGPUSubtarget.cpp')
| -rw-r--r-- | llvm/lib/Target/R600/AMDGPUSubtarget.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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 |
