Index: src/IceTargetLoweringX8632.cpp |
diff --git a/src/IceTargetLoweringX8632.cpp b/src/IceTargetLoweringX8632.cpp |
index d049cbdebb107f83341c8b52bdc1fcfc43f0a60f..3aa2569fb837223f1d1afa4522f3cb060a7cdd11 100644 |
--- a/src/IceTargetLoweringX8632.cpp |
+++ b/src/IceTargetLoweringX8632.cpp |
@@ -4530,6 +4530,81 @@ void TargetX8632::postLower() { |
} |
} |
+void TargetX8632::makeRandomRegisterPermutation( |
+ llvm::SmallVectorImpl<int32_t> &Permutation, |
+ const llvm::SmallBitVector &ExcludeRegisters) const { |
+ assert(Permutation.size() >= RegX8632::Reg_NUM); |
+ typedef llvm::SmallVector<int32_t, 8> RegisterList; |
JF
2014/12/17 18:56:19
Make 8 a constant somewhere, with an explanation.
Jim Stichnoth
2014/12/18 18:52:03
Done.
|
+ typedef std::map<unsigned, RegisterList> EquivalenceClassMap; |
+ EquivalenceClassMap EquivalenceClasses; |
+ SizeT NumShuffled = 0, NumPreserved = 0; |
+ |
+// Build up the equivalence classes of registers by looking at the |
+// register properties as well as whether the registers should be |
+// explicitly excluded from shuffling. |
+#define X(val, encode, name, name16, name8, scratch, preserved, stackptr, \ |
+ frameptr, isI8, isInt, isFP) \ |
+ if (ExcludeRegisters[RegX8632::val]) { \ |
+ /* val stays the same in the resulting permutation. */ \ |
+ Permutation[RegX8632::val] = RegX8632::val; \ |
+ ++NumPreserved; \ |
+ } else { \ |
+ union { \ |
+ unsigned ClassNum; \ |
+ struct { \ |
+ unsigned IsScratch : 1; \ |
+ unsigned IsPreserved : 1; \ |
+ unsigned IsI8 : 1; \ |
+ unsigned IsInt : 1; \ |
+ unsigned IsFP : 1; \ |
+ } Bits; \ |
+ } Class = { 0 }; \ |
+ Class.Bits.IsScratch = scratch; \ |
+ Class.Bits.IsPreserved = preserved; \ |
+ Class.Bits.IsI8 = isI8; \ |
+ Class.Bits.IsInt = isInt; \ |
+ Class.Bits.IsFP = isFP; \ |
+ /* val is assigned to an equivalence class based on its properties. */ \ |
+ EquivalenceClasses[Class.ClassNum].push_back(RegX8632::val); \ |
JF
2014/12/17 18:56:19
You can't access Class.ClassNum here: the union's
Jim Stichnoth
2014/12/18 18:52:03
Done.
|
+ } |
+ REGX8632_TABLE |
+#undef X |
JF
2014/12/17 18:56:19
Can't this table be in rodata?
Jim Stichnoth
2014/12/18 18:52:03
Not so readily, since the table is dependent on th
|
+ |
+ RandomNumberGeneratorWrapper RNG(Ctx->getRNG()); |
+ |
+ // Shuffle the resulting equivalence classes. |
+ for (EquivalenceClassMap::const_iterator I = EquivalenceClasses.begin(), |
+ E = EquivalenceClasses.end(); |
+ I != E; ++I) { |
JF
2014/12/17 18:56:19
C++11.
Jim Stichnoth
2014/12/18 18:52:03
Done.
|
+ const RegisterList &List = I->second; |
+ RegisterList Shuffled(List); |
+ std::random_shuffle(Shuffled.begin(), Shuffled.end(), RNG); |
+ for (size_t SI = 0, SE = Shuffled.size(); SI < SE; ++SI) { |
JF
2014/12/17 18:56:19
C++11.
Jim Stichnoth
2014/12/18 18:52:03
I don't think much can be done here, since the ind
|
+ Permutation[List[SI]] = Shuffled[SI]; |
+ ++NumShuffled; |
+ } |
+ } |
+ |
+ assert(NumShuffled + NumPreserved == RegX8632::Reg_NUM); |
+ |
+ if (Func->getContext()->isVerbose(IceV_Random)) { |
+ Ostream &Str = Func->getContext()->getStrDump(); |
+ Str << "Register equivalence classes:\n"; |
+ for (EquivalenceClassMap::const_iterator I = EquivalenceClasses.begin(), |
+ E = EquivalenceClasses.end(); |
+ I != E; ++I) { |
JF
2014/12/17 18:56:18
C++11.
Jim Stichnoth
2014/12/18 18:52:03
Done.
|
+ Str << "{"; |
+ const RegisterList &List = I->second; |
+ for (SizeT RI = 0, RE = List.size(); RI != RE; ++RI) { |
JF
2014/12/17 18:56:19
C++11.
Jim Stichnoth
2014/12/18 18:52:03
Done.
|
+ if (RI > 0) |
+ Str << " "; |
+ Str << getRegName(List[RI], IceType_i32); |
+ } |
+ Str << "}\n"; |
+ } |
+ } |
+} |
+ |
template <> void ConstantInteger32::emit(GlobalContext *Ctx) const { |
if (!ALLOW_DUMP) |
return; |