Move the subtarget dependent features from SystemZTargetMachine

down to the subtarget. Add an initialization routine to assist.

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

diff --git a/lib/Target/SystemZ/SystemZISelLowering.cpp b/lib/Target/SystemZ/SystemZISelLowering.cpp
index da65226b0f9ffc71eeae75f60a4c7e1d6b4ae43d..f6c73c3df1ca8e4f23793dedb0addc8964f8d5cd 100644 (file)
--- a/lib/Target/SystemZ/SystemZISelLowering.cpp
+++ b/lib/Target/SystemZ/SystemZISelLowering.cpp
@@ -80,9 +80,9 @@ static MachineOperand earlyUseOperand(MachineOperand Op) {
   return Op;
 }
 
   return Op;
 }
 

-SystemZTargetLowering::SystemZTargetLowering(SystemZTargetMachine &tm)
-  : TargetLowering(tm, new TargetLoweringObjectFileELF()),
-    Subtarget(*tm.getSubtargetImpl()) {
+SystemZTargetLowering::SystemZTargetLowering(const TargetMachine &tm)
+    : TargetLowering(tm, new TargetLoweringObjectFileELF()),
+      Subtarget(tm.getSubtarget<SystemZSubtarget>()) {

   MVT PtrVT = getPointerTy();
 
   // Set up the register classes.
   MVT PtrVT = getPointerTy();
 
   // Set up the register classes.

diff --git a/lib/Target/SystemZ/SystemZISelLowering.h b/lib/Target/SystemZ/SystemZISelLowering.h
index d6e9679fc0b54f2a4b4e36d894fa0e6e021c6147..e21b0501933f08c9303cd09201c6611d2e6075c4 100644 (file)
--- a/lib/Target/SystemZ/SystemZISelLowering.h
+++ b/lib/Target/SystemZ/SystemZISelLowering.h
@@ -198,7 +198,7 @@ class SystemZTargetMachine;
 
 class SystemZTargetLowering : public TargetLowering {
 public:
 
 class SystemZTargetLowering : public TargetLowering {
 public:

-  explicit SystemZTargetLowering(SystemZTargetMachine &TM);
+  explicit SystemZTargetLowering(const TargetMachine &TM);

 
   // Override TargetLowering.
   MVT getScalarShiftAmountTy(EVT LHSTy) const override {
 
   // Override TargetLowering.
   MVT getScalarShiftAmountTy(EVT LHSTy) const override {

diff --git a/lib/Target/SystemZ/SystemZSubtarget.cpp b/lib/Target/SystemZ/SystemZSubtarget.cpp
index a011157dcdfc3ed81f924f9e3d143415ca08cfd6..22246d1153cda68384265cabc6d4f457f3bc944e 100644 (file)
--- a/lib/Target/SystemZ/SystemZSubtarget.cpp
+++ b/lib/Target/SystemZ/SystemZSubtarget.cpp
@@ -23,13 +23,8 @@ using namespace llvm;
 // Pin the vtabel to this file.
 void SystemZSubtarget::anchor() {}
 
 // Pin the vtabel to this file.
 void SystemZSubtarget::anchor() {}
 

-SystemZSubtarget::SystemZSubtarget(const std::string &TT,
-                                   const std::string &CPU,
-                                   const std::string &FS)
-  : SystemZGenSubtargetInfo(TT, CPU, FS), HasDistinctOps(false),
-    HasLoadStoreOnCond(false), HasHighWord(false), HasFPExtension(false),
-    HasFastSerialization(false), HasInterlockedAccess1(false),
-    TargetTriple(TT) {
+SystemZSubtarget &
+SystemZSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS) {

   std::string CPUName = CPU;
   if (CPUName.empty())
     CPUName = "generic";
   std::string CPUName = CPU;
   if (CPUName.empty())
     CPUName = "generic";


@@ -37,11 +32,26 @@ SystemZSubtarget::SystemZSubtarget(const std::string &TT,
   if (CPUName == "generic")
     CPUName = sys::getHostCPUName();
 #endif
   if (CPUName == "generic")
     CPUName = sys::getHostCPUName();
 #endif

-

   // Parse features string.
   ParseSubtargetFeatures(CPUName, FS);
   // Parse features string.
   ParseSubtargetFeatures(CPUName, FS);

+  return *this;

 }
 
 }
 

+SystemZSubtarget::SystemZSubtarget(const std::string &TT,
+                                   const std::string &CPU,
+                                   const std::string &FS,
+                                   const TargetMachine &TM)
+    : SystemZGenSubtargetInfo(TT, CPU, FS), HasDistinctOps(false),
+      HasLoadStoreOnCond(false), HasHighWord(false), HasFPExtension(false),
+      HasFastSerialization(false), HasInterlockedAccess1(false),
+      TargetTriple(TT),
+      // Make sure that global data has at least 16 bits of alignment by
+      // default, so that we can refer to it using LARL.  We don't have any
+      // special requirements for stack variables though.
+      DL("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-a:8:16-n32:64"),
+      InstrInfo(initializeSubtargetDependencies(CPU, FS)), TLInfo(TM),
+      TSInfo(DL), FrameLowering() {}
+

 // Return true if GV binds locally under reloc model RM.
 static bool bindsLocally(const GlobalValue *GV, Reloc::Model RM) {
   // For non-PIC, all symbols bind locally.
 // Return true if GV binds locally under reloc model RM.
 static bool bindsLocally(const GlobalValue *GV, Reloc::Model RM) {
   // For non-PIC, all symbols bind locally.

diff --git a/lib/Target/SystemZ/SystemZSubtarget.h b/lib/Target/SystemZ/SystemZSubtarget.h
index ffca2d8113a890d60b81c5ef668d8004edad15c3..4e8c710bdefd41ec119ff6bd1cfe2e35b6324e4c 100644 (file)
--- a/lib/Target/SystemZ/SystemZSubtarget.h
+++ b/lib/Target/SystemZ/SystemZSubtarget.h
@@ -14,6 +14,12 @@
 #ifndef SYSTEMZSUBTARGET_H
 #define SYSTEMZSUBTARGET_H
 
 #ifndef SYSTEMZSUBTARGET_H
 #define SYSTEMZSUBTARGET_H
 

+#include "SystemZFrameLowering.h"
+#include "SystemZISelLowering.h"
+#include "SystemZInstrInfo.h"
+#include "SystemZRegisterInfo.h"
+#include "SystemZSelectionDAGInfo.h"
+#include "llvm/IR/DataLayout.h"

 #include "llvm/ADT/Triple.h"
 #include "llvm/Target/TargetSubtargetInfo.h"
 #include <string>
 #include "llvm/ADT/Triple.h"
 #include "llvm/Target/TargetSubtargetInfo.h"
 #include <string>


@@ -37,10 +43,26 @@ protected:
 
 private:
   Triple TargetTriple;
 
 private:
   Triple TargetTriple;

-
+  const DataLayout DL;
+  SystemZInstrInfo InstrInfo;
+  SystemZTargetLowering TLInfo;
+  SystemZSelectionDAGInfo TSInfo;
+  SystemZFrameLowering FrameLowering;
+
+  SystemZSubtarget &initializeSubtargetDependencies(StringRef CPU,
+                                                    StringRef FS);

 public:
   SystemZSubtarget(const std::string &TT, const std::string &CPU,
 public:
   SystemZSubtarget(const std::string &TT, const std::string &CPU,

-                   const std::string &FS);
+                   const std::string &FS, const TargetMachine &TM);
+
+  const TargetFrameLowering *getFrameLowering() const { return &FrameLowering; }
+  const SystemZInstrInfo *getInstrInfo() const { return &InstrInfo; }
+  const DataLayout *getDataLayout() const { return &DL; }
+  const SystemZRegisterInfo *getRegisterInfo() const {
+    return &InstrInfo.getRegisterInfo();
+  }
+  const SystemZTargetLowering *getTargetLowering() const { return &TLInfo; }
+  const TargetSelectionDAGInfo *getSelectionDAGInfo() const { return &TSInfo; }

 
   // This is important for reducing register pressure in vector code.
   bool useAA() const override { return true; }
 
   // This is important for reducing register pressure in vector code.
   bool useAA() const override { return true; }

diff --git a/lib/Target/SystemZ/SystemZTargetMachine.cpp b/lib/Target/SystemZ/SystemZTargetMachine.cpp
index f2e8b337d9ff80ea1d66f8fbcf8ee3a444d025ae..0122e99f8a776140affa791a3ae15e52e817bcb0 100644 (file)
--- a/lib/Target/SystemZ/SystemZTargetMachine.cpp
+++ b/lib/Target/SystemZ/SystemZTargetMachine.cpp
@@ -25,12 +25,7 @@ SystemZTargetMachine::SystemZTargetMachine(const Target &T, StringRef TT,
                                            Reloc::Model RM, CodeModel::Model CM,
                                            CodeGenOpt::Level OL)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
                                            Reloc::Model RM, CodeModel::Model CM,
                                            CodeGenOpt::Level OL)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),

-      Subtarget(TT, CPU, FS),
-      // Make sure that global data has at least 16 bits of alignment by
-      // default, so that we can refer to it using LARL.  We don't have any
-      // special requirements for stack variables though.
-      DL("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-a:8:16-n32:64"),
-      InstrInfo(Subtarget), TLInfo(*this), TSInfo(DL), FrameLowering() {
+      Subtarget(TT, CPU, FS, *this) {

   initAsmInfo();
 }
 
   initAsmInfo();
 }
 

diff --git a/lib/Target/SystemZ/SystemZTargetMachine.h b/lib/Target/SystemZ/SystemZTargetMachine.h
index 1db717b7126dbbfc494576dfabae4f3195619117..ded07e912443d9bea3e5e380f6e84a5fc33e666c 100644 (file)
--- a/lib/Target/SystemZ/SystemZTargetMachine.h
+++ b/lib/Target/SystemZ/SystemZTargetMachine.h
@@ -15,25 +15,15 @@
 #ifndef SYSTEMZTARGETMACHINE_H
 #define SYSTEMZTARGETMACHINE_H
 
 #ifndef SYSTEMZTARGETMACHINE_H
 #define SYSTEMZTARGETMACHINE_H
 

-#include "SystemZFrameLowering.h"
-#include "SystemZISelLowering.h"
-#include "SystemZInstrInfo.h"
-#include "SystemZRegisterInfo.h"
-#include "SystemZSelectionDAGInfo.h"

 #include "SystemZSubtarget.h"
 #include "SystemZSubtarget.h"

-#include "llvm/IR/DataLayout.h"
-#include "llvm/Target/TargetFrameLowering.h"

 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
 
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
 

+class TargetFrameLowering;
+

 class SystemZTargetMachine : public LLVMTargetMachine {
   SystemZSubtarget        Subtarget;
 class SystemZTargetMachine : public LLVMTargetMachine {
   SystemZSubtarget        Subtarget;

-  const DataLayout        DL;
-  SystemZInstrInfo        InstrInfo;
-  SystemZTargetLowering   TLInfo;
-  SystemZSelectionDAGInfo TSInfo;
-  SystemZFrameLowering    FrameLowering;

 
 public:
   SystemZTargetMachine(const Target &T, StringRef TT, StringRef CPU,
 
 public:
   SystemZTargetMachine(const Target &T, StringRef TT, StringRef CPU,


@@ -43,25 +33,25 @@ public:
 
   // Override TargetMachine.
   const TargetFrameLowering *getFrameLowering() const override {
 
   // Override TargetMachine.
   const TargetFrameLowering *getFrameLowering() const override {

-    return &FrameLowering;
+    return getSubtargetImpl()->getFrameLowering();

   }
   const SystemZInstrInfo *getInstrInfo() const override {
   }
   const SystemZInstrInfo *getInstrInfo() const override {

-    return &InstrInfo;
+    return getSubtargetImpl()->getInstrInfo();

   }
   const SystemZSubtarget *getSubtargetImpl() const override {
     return &Subtarget;
   }
   const DataLayout *getDataLayout() const override {
   }
   const SystemZSubtarget *getSubtargetImpl() const override {
     return &Subtarget;
   }
   const DataLayout *getDataLayout() const override {

-    return &DL;
+    return getSubtargetImpl()->getDataLayout();

   }
   const SystemZRegisterInfo *getRegisterInfo() const override {
   }
   const SystemZRegisterInfo *getRegisterInfo() const override {

-    return &InstrInfo.getRegisterInfo();
+    return getSubtargetImpl()->getRegisterInfo();

   }
   const SystemZTargetLowering *getTargetLowering() const override {
   }
   const SystemZTargetLowering *getTargetLowering() const override {

-    return &TLInfo;
+    return getSubtargetImpl()->getTargetLowering();

   }
   const TargetSelectionDAGInfo *getSelectionDAGInfo() const override {
   }
   const TargetSelectionDAGInfo *getSelectionDAGInfo() const override {

-    return &TSInfo;
+    return getSubtargetImpl()->getSelectionDAGInfo();

   }
 
   // Override LLVMTargetMachine
   }
 
   // Override LLVMTargetMachine