Function Layout, Global Variable Layout and Pooled Constants Layout Reordering

src/IceClFlags.h

Index: src/IceClFlags.h
diff --git a/src/IceClFlags.h b/src/IceClFlags.h
index 3b9b0067601d54600902de4ca5dead4be7fa563d..f12cc1f40f49c18619daf7ff06040667e6039f17 100644
--- a/src/IceClFlags.h
+++ b/src/IceClFlags.h
@@ -139,7 +139,6 @@ public:
   setRandomizeAndPoolImmediatesOption(RandomizeAndPoolImmediatesEnum Option) {
     RandomizeAndPoolImmediatesOption = Option;
   }
-
   RandomizeAndPoolImmediatesEnum getRandomizeAndPoolImmediatesOption() const {
     return RandomizeAndPoolImmediatesOption;
   }
@@ -151,6 +150,26 @@ public:
     return RandomizeAndPoolImmediatesThreshold;
   }
 
+  void setShouldReorderFunctions(bool Option) { ReorderFunctions = Option; }
+  bool shouldReorderFunctions() const { return ReorderFunctions; }
+
+  void setReorderFunctionsWindowSize(uint32_t Size) {
+    ReorderFunctionsWindowSize = Size;
+  }
+  uint32_t getReorderFunctionsWindowSize() const {
+    return ReorderFunctionsWindowSize;
+  }
+
+  void setShouldReorderGlobalVariables(bool Option) {
+    ReorderGlobalVariables = Option;
+  }
+  bool shouldReorderGlobalVariables() const { return ReorderGlobalVariables; }
+
+  void setShouldReorderPooledConstants(bool Option) {
+    ReorderPooledConstants = Option;
+  }
+  bool shouldReorderPooledConstants() const { return ReorderPooledConstants; }
+
   // IceString accessors.
 
   const IceString &getDefaultFunctionPrefix() const {
@@ -207,6 +226,9 @@ private:
   bool PhiEdgeSplit;
   bool RandomNopInsertion;
   bool RandomRegAlloc;
+  bool ReorderFunctions;
+  bool ReorderGlobalVariables;
+  bool ReorderPooledConstants;
   bool SkipUnimplemented;
   bool SubzeroTimingEnabled;
   bool TimeEachFunction;
@@ -214,8 +236,13 @@ private:
 
   OptLevel Opt;
   FileType OutFileType;
+  size_t NumTranslationThreads; // 0 means completely sequential

[jvoung (off chromium), 2015/06/24 21:26:23]

Let's leave size_t and the uint64_t where it was before. size_t is sometimes
64-bit.

[qining, 2015/06/24 23:22:33]

Done.

+  RandomizeAndPoolImmediatesEnum RandomizeAndPoolImmediatesOption;
+  uint32_t RandomizeAndPoolImmediatesThreshold;
   int RandomMaxNopsPerInstruction;
   int RandomNopProbabilityAsPercentage;
+  uint64_t RandomSeed;

[jvoung (off chromium), 2015/06/24 21:26:23]

Same -- Otherwise this is interleaving 32-bit things with 64-bit things, which
will leave padding gaps in between, unless you are lucky and end up with an even
number of 32-bit things before the 64-bit thing.

[qining, 2015/06/24 23:22:33]

Done.

+  uint32_t ReorderFunctionsWindowSize;
   TargetArch TArch;
   TargetInstructionSet TInstrSet;
   VerboseMask VMask;
@@ -226,13 +253,6 @@ private:
   IceString TimingFocusOn;
   IceString TranslateOnly;
   IceString VerboseFocusOn;
-
-  // Immediates Randomization and Pooling options
-  RandomizeAndPoolImmediatesEnum RandomizeAndPoolImmediatesOption;
-  uint32_t RandomizeAndPoolImmediatesThreshold;
-
-  size_t NumTranslationThreads; // 0 means completely sequential
-  uint64_t RandomSeed;
 };
 
 } // end of namespace Ice