Subzero: Refactor some common TargetLowering initializations.

src/IceGlobalContext.cpp

@@ -270,6 +270,8 @@ GlobalContext::GlobalContext(Ostream *OsDump, Ostream *OsEmit, Ostream *OsError,
   ProfileBlockInfoVarDecl->setName("__Sz_block_profile_info");
   ProfileBlockInfoVarDecl->setSuppressMangling();
   ProfileBlockInfoVarDecl->setLinkage(llvm::GlobalValue::ExternalLinkage);
+
+  TargetLowering::staticInit(Flags.getTargetArch());
 }
 
 void GlobalContext::translateFunctions() {

src/IceTargetLowering.cpp

@@ -105,6 +105,24 @@ TargetLowering *TargetLowering::createLowering(TargetArch Target, Cfg *Func) {
   return nullptr;
 }
 
+void TargetLowering::staticInit(TargetArch Target) {
+  // Call the specified target's static initializer.
+  switch (Target) {
+  default:
+    llvm::report_fatal_error("Unsupported target");
+    break;
+#define SUBZERO_TARGET(X)                                                      \
+  case Target_##X: {                                                           \
+    static bool InitGuard##X = false;                                          \
+    if (InitGuard##X)                                                          \
+      return;                                                                  \
+    InitGuard##X = true;                                                       \
+    Target##X::staticInit();                                                   \
+  } break;
+#include "llvm/Config/SZTargets.def"
+  }
+}
+
 TargetLowering::TargetLowering(Cfg *Func)
     : Func(Func), Ctx(Func->getContext()), Context() {}
 

src/IceTargetLowering.h

@@ -136,6 +136,9 @@ class TargetLowering {
 public:
   // TODO(jvoung): return a unique_ptr like the other factory functions.
   static TargetLowering *createLowering(TargetArch Target, Cfg *Func);
+  static void staticInit(TargetArch Target);
+  // Each target must define a public static method:
+  //   static void staticInit();
   static std::unique_ptr<Assembler> createAssembler(TargetArch Target,
                                                     Cfg *Func);
   void translate() {

src/IceTargetLoweringARM32.cpp

@@ -160,9 +160,9 @@ TargetARM32Features::TargetARM32Features(const ClFlags &Flags) {
 }
 
 TargetARM32::TargetARM32(Cfg *Func)
-    : TargetLowering(Func), CPUFeatures(Func->getContext()->getFlags()) {
-  // TODO: Don't initialize IntegerRegisters and friends every time. Instead,
-  // initialize in some sort of static initializer for the class.
+    : TargetLowering(Func), CPUFeatures(Func->getContext()->getFlags()) {}
+
+void TargetARM32::staticInit() {
   // Limit this size (or do all bitsets need to be the same width)???
   llvm::SmallBitVector IntegerRegisters(RegARM32::Reg_NUM);
   llvm::SmallBitVector I64PairRegisters(RegARM32::Reg_NUM);
@@ -4268,4 +4268,8 @@ void TargetHeaderARM32::lower() {
   Str << ".eabi_attribute 14, 3   @ Tag_ABI_PCS_R9_use: Not used\n";
 }
 
+llvm::SmallBitVector TargetARM32::TypeToRegisterSet[IceType_NUM];
+llvm::SmallBitVector TargetARM32::RegisterAliases[RegARM32::Reg_NUM];
+llvm::SmallBitVector TargetARM32::ScratchRegs;
+
 } // end of namespace Ice

src/IceTargetLoweringARM32.h

@@ -55,6 +55,7 @@ class TargetARM32 : public TargetLowering {
   TargetARM32 &operator=(const TargetARM32 &) = delete;
 
 public:
+  static void staticInit();
   // TODO(jvoung): return a unique_ptr.
   static TargetARM32 *create(Cfg *Func) { return new TargetARM32(Func); }
 
@@ -551,9 +552,9 @@ protected:
   bool MaybeLeafFunc = true;
   size_t SpillAreaSizeBytes = 0;
   // TODO(jpp): std::array instead of array.
-  llvm::SmallBitVector TypeToRegisterSet[IceType_NUM];
-  llvm::SmallBitVector RegisterAliases[RegARM32::Reg_NUM];
-  llvm::SmallBitVector ScratchRegs;
+  static llvm::SmallBitVector TypeToRegisterSet[IceType_NUM];
+  static llvm::SmallBitVector RegisterAliases[RegARM32::Reg_NUM];
+  static llvm::SmallBitVector ScratchRegs;
   llvm::SmallBitVector RegsUsed;
   VarList PhysicalRegisters[IceType_NUM];
 

src/IceTargetLoweringMIPS32.cpp

@@ -41,10 +41,9 @@ constexpr uint32_t MIPS32_MAX_GPR_ARG = 4;
 
 } // end of anonymous namespace
 
-TargetMIPS32::TargetMIPS32(Cfg *Func) : TargetLowering(Func) {
-  // TODO: Don't initialize IntegerRegisters and friends every time. Instead,
-  // initialize in some sort of static initializer for the class.
+TargetMIPS32::TargetMIPS32(Cfg *Func) : TargetLowering(Func) {}
 
+void TargetMIPS32::staticInit() {
   llvm::SmallBitVector IntegerRegisters(RegMIPS32::Reg_NUM);
   llvm::SmallBitVector I64PairRegisters(RegMIPS32::Reg_NUM);
   llvm::SmallBitVector Float32Registers(RegMIPS32::Reg_NUM);
@@ -1055,4 +1054,8 @@ void TargetHeaderMIPS32::lower() {
   Str << "\t.set\tnomips16\n";
 }
 
+llvm::SmallBitVector TargetMIPS32::TypeToRegisterSet[IceType_NUM];
+llvm::SmallBitVector TargetMIPS32::RegisterAliases[RegMIPS32::Reg_NUM];
+llvm::SmallBitVector TargetMIPS32::ScratchRegs;
+
 } // end of namespace Ice

src/IceTargetLoweringMIPS32.h

@@ -29,6 +29,7 @@ class TargetMIPS32 : public TargetLowering {
   TargetMIPS32 &operator=(const TargetMIPS32 &) = delete;
 
 public:
+  static void staticInit();
   // TODO(jvoung): return a unique_ptr.
   static TargetMIPS32 *create(Cfg *Func) { return new TargetMIPS32(Func); }
 
@@ -197,9 +198,9 @@ protected:
 
   bool UsesFramePointer = false;
   bool NeedsStackAlignment = false;
-  llvm::SmallBitVector TypeToRegisterSet[IceType_NUM];
-  llvm::SmallBitVector RegisterAliases[RegMIPS32::Reg_NUM];
-  llvm::SmallBitVector ScratchRegs;
+  static llvm::SmallBitVector TypeToRegisterSet[IceType_NUM];
+  static llvm::SmallBitVector RegisterAliases[RegMIPS32::Reg_NUM];
+  static llvm::SmallBitVector ScratchRegs;
   llvm::SmallBitVector RegsUsed;
   VarList PhysicalRegisters[IceType_NUM];
 

src/IceTargetLoweringX8632.cpp

@@ -86,6 +86,19 @@ const size_t MachineTraits<TargetX8632>::TableTypeX8632AttributesSize =
 const uint32_t MachineTraits<TargetX8632>::X86_STACK_ALIGNMENT_BYTES = 16;
 const char *MachineTraits<TargetX8632>::TargetName = "X8632";
 
+template <>
+std::array<llvm::SmallBitVector, IceType_NUM>
+    TargetX86Base<TargetX8632>::TypeToRegisterSet = {};
+
+template <>
+std::array<llvm::SmallBitVector,
+           TargetX86Base<TargetX8632>::Traits::RegisterSet::Reg_NUM>
+    TargetX86Base<TargetX8632>::RegisterAliases = {};
+
+template <>
+llvm::SmallBitVector
+    TargetX86Base<TargetX8632>::ScratchRegs = llvm::SmallBitVector();
+
 } // end of namespace X86Internal
 
 //------------------------------------------------------------------------------

src/IceTargetLoweringX8664.cpp

@@ -86,6 +86,19 @@ const size_t MachineTraits<TargetX8664>::TableTypeX8664AttributesSize =
 const uint32_t MachineTraits<TargetX8664>::X86_STACK_ALIGNMENT_BYTES = 16;
 const char *MachineTraits<TargetX8664>::TargetName = "X8664";
 
+template <>
+std::array<llvm::SmallBitVector, IceType_NUM>
+    TargetX86Base<TargetX8664>::TypeToRegisterSet = {};
+
+template <>
+std::array<llvm::SmallBitVector,
+           TargetX86Base<TargetX8664>::Traits::RegisterSet::Reg_NUM>
+    TargetX86Base<TargetX8664>::RegisterAliases = {};
+
+template <>
+llvm::SmallBitVector
+    TargetX86Base<TargetX8664>::ScratchRegs = llvm::SmallBitVector();
+
 } // end of namespace X86Internal
 
 //------------------------------------------------------------------------------

src/IceTargetLoweringX86Base.h

@@ -58,6 +58,7 @@ public:
 
   ~TargetX86Base() override = default;
 
+  static void staticInit();
   static TargetX86Base *create(Cfg *Func) { return new TargetX86Base(Func); }
 
   void translateOm1() override;
@@ -669,10 +670,10 @@ protected:
   bool NeedsStackAlignment = false;
   size_t SpillAreaSizeBytes = 0;
   size_t FixedAllocaSizeBytes = 0;
-  std::array<llvm::SmallBitVector, IceType_NUM> TypeToRegisterSet;
-  std::array<llvm::SmallBitVector, Traits::RegisterSet::Reg_NUM>
+  static std::array<llvm::SmallBitVector, IceType_NUM> TypeToRegisterSet;
+  static std::array<llvm::SmallBitVector, Traits::RegisterSet::Reg_NUM>
       RegisterAliases;
-  llvm::SmallBitVector ScratchRegs;
+  static llvm::SmallBitVector ScratchRegs;
   llvm::SmallBitVector RegsUsed;
   std::array<VarList, IceType_NUM> PhysicalRegisters;
 

src/IceTargetLoweringX86BaseImpl.h

@@ -281,8 +281,9 @@ TargetX86Base<Machine>::TargetX86Base(Cfg *Func)
          TargetInstructionSet::X86InstructionSet_Begin) +
         Traits::InstructionSet::Begin);
   }
-  // TODO: Don't initialize IntegerRegisters and friends every time. Instead,
-  // initialize in some sort of static initializer for the class.
+}
+
+template <class Machine> void TargetX86Base<Machine>::staticInit() {
   Traits::initRegisterSet(&TypeToRegisterSet, &RegisterAliases, &ScratchRegs);
 }