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 b677e1c1b746936b426f8625dab10290fdfa5fa3..2e2cea19570a1d6ea8fd7d682f25c725c1648983 100644
--- a/src/IceClFlags.h
+++ b/src/IceClFlags.h
@@ -141,7 +141,6 @@ public:
   setRandomizeAndPoolImmediatesOption(RandomizeAndPoolImmediatesEnum Option) {
     RandomizeAndPoolImmediatesOption = Option;
   }
-
   RandomizeAndPoolImmediatesEnum getRandomizeAndPoolImmediatesOption() const {
     return RandomizeAndPoolImmediatesOption;
   }
@@ -153,6 +152,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 {
@@ -209,6 +228,9 @@ private:
   bool PhiEdgeSplit;
   bool RandomNopInsertion;
   bool RandomRegAlloc;
+  bool ReorderFunctions;
+  bool ReorderGlobalVariables;
+  bool ReorderPooledConstants;
   bool SkipUnimplemented;
   bool SubzeroTimingEnabled;
   bool TimeEachFunction;
@@ -216,8 +238,11 @@ private:
 
   OptLevel Opt;
   FileType OutFileType;
+  RandomizeAndPoolImmediatesEnum RandomizeAndPoolImmediatesOption;
+  uint32_t RandomizeAndPoolImmediatesThreshold;
   int RandomMaxNopsPerInstruction;
   int RandomNopProbabilityAsPercentage;
+  uint32_t ReorderFunctionsWindowSize;
   TargetArch TArch;
   TargetInstructionSet TInstrSet;
   VerboseMask VMask;
@@ -229,10 +254,6 @@ private:
   IceString TranslateOnly;
   IceString VerboseFocusOn;
 
-  // Immediates Randomization and Pooling options
-  RandomizeAndPoolImmediatesEnum RandomizeAndPoolImmediatesOption;
-  uint32_t RandomizeAndPoolImmediatesThreshold;
-
   size_t NumTranslationThreads; // 0 means completely sequential
   uint64_t RandomSeed;
 };