Move the R600 intrinsic support back to the target machine - there's

nothing subtarget dependent about the intrinsic support in any
backend as far as I can tell.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214738 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/R600/AMDGPUSubtarget.cpp b/lib/Target/R600/AMDGPUSubtarget.cpp
index 6a09d4eb54739cf982a4df153178caebdd1c4ae3..e5fbfac460ba1f53a27d85952a36255355f66924 100644 (file)
--- a/lib/Target/R600/AMDGPUSubtarget.cpp
+++ b/lib/Target/R600/AMDGPUSubtarget.cpp
@@ -83,7 +83,7 @@ AMDGPUSubtarget::AMDGPUSubtarget(StringRef TT, StringRef GPU, StringRef FS,
       FrameLowering(TargetFrameLowering::StackGrowsUp,
                     64 * 16, // Maximum stack alignment (long16)
                     0),
       FrameLowering(TargetFrameLowering::StackGrowsUp,
                     64 * 16, // Maximum stack alignment (long16)
                     0),

-      IntrinsicInfo(), InstrItins(getInstrItineraryForCPU(GPU)) {
+      InstrItins(getInstrItineraryForCPU(GPU)) {

 
   if (getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS) {
     InstrInfo.reset(new R600InstrInfo(*this));
 
   if (getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS) {
     InstrInfo.reset(new R600InstrInfo(*this));

diff --git a/lib/Target/R600/AMDGPUSubtarget.h b/lib/Target/R600/AMDGPUSubtarget.h
index c6d097b1ff59350977bd3b5ceaf76c9efa72d6af..cd951908e8877eb05d39f17e2a9038c859753f62 100644 (file)
--- a/lib/Target/R600/AMDGPUSubtarget.h
+++ b/lib/Target/R600/AMDGPUSubtarget.h
@@ -65,7 +65,6 @@ private:
 
   const DataLayout DL;
   AMDGPUFrameLowering FrameLowering;
 
   const DataLayout DL;
   AMDGPUFrameLowering FrameLowering;

-  AMDGPUIntrinsicInfo IntrinsicInfo;

   std::unique_ptr<AMDGPUTargetLowering> TLInfo;
   std::unique_ptr<AMDGPUInstrInfo> InstrInfo;
   InstrItineraryData InstrItins;
   std::unique_ptr<AMDGPUTargetLowering> TLInfo;
   std::unique_ptr<AMDGPUInstrInfo> InstrInfo;
   InstrItineraryData InstrItins;


@@ -75,7 +74,6 @@ public:
   AMDGPUSubtarget &initializeSubtargetDependencies(StringRef GPU, StringRef FS);
 
   const AMDGPUFrameLowering *getFrameLowering() const { return &FrameLowering; }
   AMDGPUSubtarget &initializeSubtargetDependencies(StringRef GPU, StringRef FS);
 
   const AMDGPUFrameLowering *getFrameLowering() const { return &FrameLowering; }

-  const AMDGPUIntrinsicInfo *getIntrinsicInfo() const { return &IntrinsicInfo; }

   const AMDGPUInstrInfo *getInstrInfo() const { return InstrInfo.get(); }
   const AMDGPURegisterInfo *getRegisterInfo() const {
     return &InstrInfo->getRegisterInfo();
   const AMDGPUInstrInfo *getInstrInfo() const { return InstrInfo.get(); }
   const AMDGPURegisterInfo *getRegisterInfo() const {
     return &InstrInfo->getRegisterInfo();

diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp
index c5515e6dfa8942a88aa8165ede6c4b80c4126217..890e2b776b24ba25c79709b9955292e09b0ef221 100644 (file)
--- a/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -54,7 +54,7 @@ AMDGPUTargetMachine::AMDGPUTargetMachine(const Target &T, StringRef TT,
                                          CodeModel::Model CM,
                                          CodeGenOpt::Level OptLevel)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OptLevel),
                                          CodeModel::Model CM,
                                          CodeGenOpt::Level OptLevel)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OptLevel),

-      Subtarget(TT, CPU, FS, *this) {
+      Subtarget(TT, CPU, FS, *this), IntrinsicInfo() {

   setRequiresStructuredCFG(true);
   initAsmInfo();
 }
   setRequiresStructuredCFG(true);
   initAsmInfo();
 }

diff --git a/lib/Target/R600/AMDGPUTargetMachine.h b/lib/Target/R600/AMDGPUTargetMachine.h
index 64f2546282167c73dd269e435a23dd026eb286d3..59772c649d598fb37ec52790d073e36ef7e8a1d6 100644 (file)
--- a/lib/Target/R600/AMDGPUTargetMachine.h
+++ b/lib/Target/R600/AMDGPUTargetMachine.h
@@ -25,8 +25,8 @@
 namespace llvm {
 
 class AMDGPUTargetMachine : public LLVMTargetMachine {
 namespace llvm {
 
 class AMDGPUTargetMachine : public LLVMTargetMachine {

-

   AMDGPUSubtarget Subtarget;
   AMDGPUSubtarget Subtarget;

+  AMDGPUIntrinsicInfo IntrinsicInfo;

 
 public:
   AMDGPUTargetMachine(const Target &T, StringRef TT, StringRef FS,
 
 public:
   AMDGPUTargetMachine(const Target &T, StringRef TT, StringRef FS,


@@ -37,7 +37,7 @@ public:
     return getSubtargetImpl()->getFrameLowering();
   }
   const AMDGPUIntrinsicInfo *getIntrinsicInfo() const override {
     return getSubtargetImpl()->getFrameLowering();
   }
   const AMDGPUIntrinsicInfo *getIntrinsicInfo() const override {

-    return getSubtargetImpl()->getIntrinsicInfo();
+    return &IntrinsicInfo;

   }
   const AMDGPUInstrInfo *getInstrInfo() const override {
     return getSubtargetImpl()->getInstrInfo();
   }
   const AMDGPUInstrInfo *getInstrInfo() const override {
     return getSubtargetImpl()->getInstrInfo();