Subzero. Changes the Register Allocator so that it is aware of register

src/IceTargetLoweringX8632Traits.h

 //===- subzero/src/IceTargetLoweringX8632Traits.h - x86-32 traits -*- C++ -*-=//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file declares the X8632 Target Lowering Traits.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICETARGETLOWERINGX8632TRAITS_H
 #define SUBZERO_SRC_ICETARGETLOWERINGX8632TRAITS_H
 
 #include "IceAssembler.h"
 #include "IceConditionCodesX8632.h"
 #include "IceDefs.h"
 #include "IceInst.h"
 #include "IceInstX8632.def"
 #include "IceOperand.h"
 #include "IceRegistersX8632.h"
 #include "IceTargetLoweringX8632.def"
 #include "IceTargetLowering.h"
 
+#include <vector>

[Jim Stichnoth, 2015/09/03 17:48:49]

Is this needed?  I would have expected <array> if anything.

[John, 2015/09/03 22:38:25]

Done.

+
 namespace Ice {
 
 class TargetX8632;
 
 namespace X8632 {
 class AssemblerX8632;
 } // end of namespace X8632
 
 namespace X86Internal {
 
@@ skipping 267 matching lines @@
     case IceType_i1:
     case IceType_i8:
       return RegNames8[RegNum];
     case IceType_i16:
       return RegNames16[RegNum];
     default:
       return RegNames[RegNum];
     }
   }
 
-  static void initRegisterSet(llvm::SmallBitVector *IntegerRegisters,
-                              llvm::SmallBitVector *IntegerRegistersI8,
-                              llvm::SmallBitVector *FloatRegisters,
-                              llvm::SmallBitVector *VectorRegisters,
-                              llvm::SmallBitVector *ScratchRegs) {
+  static void initRegisterSet(
+      std::array<llvm::SmallBitVector, IceType_NUM> *TypeToRegisterSet,
+      std::array<llvm::SmallBitVector, RegisterSet::Reg_NUM> *RegisterAliases,
+      llvm::SmallBitVector *ScratchRegs) {
+    llvm::SmallBitVector IntegerRegisters(RegisterSet::Reg_NUM);
+    llvm::SmallBitVector IntegerRegistersI8(RegisterSet::Reg_NUM);
+    llvm::SmallBitVector FloatRegisters(RegisterSet::Reg_NUM);
+    llvm::SmallBitVector VectorRegisters(RegisterSet::Reg_NUM);
+    llvm::SmallBitVector InvalidRegisters(RegisterSet::Reg_NUM);
+    ScratchRegs->resize(RegisterSet::Reg_NUM);
 #define X(val, encode, name, name16, name8, scratch, preserved, stackptr,      \
           frameptr, isI8, isInt, isFP)                                         \
-  (*IntegerRegisters)[RegisterSet::val] = isInt;                               \
-  (*IntegerRegistersI8)[RegisterSet::val] = isI8;                              \
-  (*FloatRegisters)[RegisterSet::val] = isFP;                                  \
-  (*VectorRegisters)[RegisterSet::val] = isFP;                                 \
+  (IntegerRegisters)[RegisterSet::val] = isInt;                                \
+  (IntegerRegistersI8)[RegisterSet::val] = isI8;                               \
+  (FloatRegisters)[RegisterSet::val] = isFP;                                   \
+  (VectorRegisters)[RegisterSet::val] = isFP;                                  \
+  (*RegisterAliases)[RegisterSet::val].resize(RegisterSet::Reg_NUM);           \
+  (*RegisterAliases)[RegisterSet::val].set(RegisterSet::val);                  \
   (*ScratchRegs)[RegisterSet::val] = scratch;
     REGX8632_TABLE;
 #undef X
+
+    (*TypeToRegisterSet)[IceType_void] = InvalidRegisters;
+    (*TypeToRegisterSet)[IceType_i1] = IntegerRegistersI8;
+    (*TypeToRegisterSet)[IceType_i8] = IntegerRegistersI8;
+    (*TypeToRegisterSet)[IceType_i16] = IntegerRegisters;
+    (*TypeToRegisterSet)[IceType_i32] = IntegerRegisters;
+    (*TypeToRegisterSet)[IceType_i64] = IntegerRegisters;
+    (*TypeToRegisterSet)[IceType_f32] = FloatRegisters;
+    (*TypeToRegisterSet)[IceType_f64] = FloatRegisters;
+    (*TypeToRegisterSet)[IceType_v4i1] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v8i1] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v16i1] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v16i8] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v8i16] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v4i32] = VectorRegisters;
+    (*TypeToRegisterSet)[IceType_v4f32] = VectorRegisters;
   }
 
   static llvm::SmallBitVector
   getRegisterSet(TargetLowering::RegSetMask Include,
                  TargetLowering::RegSetMask Exclude) {
     llvm::SmallBitVector Registers(RegisterSet::Reg_NUM);
 
 #define X(val, encode, name, name16, name8, scratch, preserved, stackptr,      \
           frameptr, isI8, isInt, isFP)                                         \
   if (scratch && (Include & ::Ice::TargetLowering::RegSet_CallerSave))         \
@@ skipping 377 matching lines @@
 
 } // end of namespace X86Internal
 
 namespace X8632 {
 using Traits = ::Ice::X86Internal::MachineTraits<TargetX8632>;
 } // end of namespace X8632
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8632TRAITS_H