Function Layout, Global Variable Layout and Pooled Constants Layout Reordering

src/IceClFlags.cpp

 //===- subzero/src/IceClFlags.cpp - Command line flags and parsing --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines commandline flags parsing.
@@ skipping 261 matching lines @@
                clEnumValEnd));
 // Command line option for x86 immediate integer randomization/pooling
 // threshold. Immediates whose representation are between:
 // -RandomizeAndPoolImmediatesThreshold/2 and
 // +RandomizeAndPoolImmediatesThreshold/2 will be randomized or pooled.
 cl::opt<uint32_t> RandomizeAndPoolImmediatesThreshold(
     "randomize-pool-threshold",
     cl::desc("The threshold for immediates randomization and pooling"),
     cl::init(0xffff));
 
+// Command line option for turning on function layout reordering.
+cl::opt<bool> ReorderFunctions(
+    "reorder-functions",
+    cl::desc("Reorder the layout of functions in TEXT section"),
+    cl::init(false));
+
+// Command line option for the shuffling window size for function reordering.
+// The default size is 8.
+cl::opt<uint32_t> ReorderFunctionsWindowSize(
+    "reorder-functions-window-size",
+    cl::desc("The shuffling window size for function reordering. 1 or 0 means "
+             "no effective shuffling."),
+    cl::init(8));
+
+// Command line option for turing on global variable layout reordering.
+cl::opt<bool> ReorderGlobalVariables(
+    "reorder-global-variables",
+    cl::desc("Reorder the layout of global variables in NON TEXT section"),
+    cl::init(false));
+
+// Command line option for turning on layout reordering in constant pools.
+cl::opt<bool> ReorderPooledConstants(
+    "reorder-pooled-constants",
+    cl::desc("Reorder the layout of constants in constant pools"),
+    cl::init(false));
 } // end of anonymous namespace
 
 namespace Ice {
 
 void ClFlags::parseFlags(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv);
   AppName = IceString(argv[0]);
 }
 
 void ClFlags::resetClFlags(ClFlags &OutFlags) {
   // bool fields
   OutFlags.AllowErrorRecovery = false;
   OutFlags.AllowUninitializedGlobals = false;
   OutFlags.DataSections = false;
   OutFlags.DecorateAsm = false;
   OutFlags.DisableInternal = false;
   OutFlags.DisableIRGeneration = false;
   OutFlags.DisableTranslation = false;
   OutFlags.DumpStats = false;
   OutFlags.EnableBlockProfile = false;
   OutFlags.FunctionSections = false;
   OutFlags.GenerateUnitTestMessages = false;
   OutFlags.PhiEdgeSplit = false;
   OutFlags.RandomNopInsertion = false;
   OutFlags.RandomRegAlloc = false;
   OutFlags.SkipUnimplemented = false;
   OutFlags.SubzeroTimingEnabled = false;
   OutFlags.TimeEachFunction = false;
   OutFlags.UseSandboxing = false;
+  OutFlags.ReorderFunctions = false;

[John, 2015/06/24 00:24:00]

Move these to line 332 (i.e., keep it sorted alphabetically.)

[qining, 2015/06/24 01:20:39]

Done.

+  OutFlags.ReorderGlobalVariables = false;
+  OutFlags.ReorderPooledConstants = false;
   // Enum and integer fields.
   OutFlags.Opt = Opt_m1;
   OutFlags.OutFileType = FT_Iasm;
   OutFlags.RandomMaxNopsPerInstruction = 0;
   OutFlags.RandomNopProbabilityAsPercentage = 0;
   OutFlags.TArch = TargetArch_NUM;
   OutFlags.VMask = IceV_None;
+  OutFlags.RandomizeAndPoolImmediatesOption = RPI_None;

[John, 2015/06/24 00:24:00]

And these, to 344

[qining, 2015/06/24 01:20:39]

Done.

+  OutFlags.RandomizeAndPoolImmediatesThreshold = 0xffff;
+  OutFlags.ReorderFunctionsWindowSize = 8;
   // IceString fields.
   OutFlags.DefaultFunctionPrefix = "";
   OutFlags.DefaultGlobalPrefix = "";
   OutFlags.TestPrefix = "";
   OutFlags.TimingFocusOn = "";
   OutFlags.TranslateOnly = "";
   OutFlags.VerboseFocusOn = "";
   // size_t and 64-bit fields.
   OutFlags.NumTranslationThreads = 0;
   OutFlags.RandomSeed = 0;
@@ skipping 37 matching lines @@
   OutFlags.setTimeEachFunction(::TimeEachFunction);
   OutFlags.setTimingFocusOn(::TimingFocusOn);
   OutFlags.setTranslateOnly(::TranslateOnly);
   OutFlags.setUseSandboxing(::UseSandboxing);
   OutFlags.setVerboseFocusOn(::VerboseFocusOn);
   OutFlags.setOutFileType(::OutFileType);
   OutFlags.setMaxNopsPerInstruction(::MaxNopsPerInstruction);
   OutFlags.setNopProbabilityAsPercentage(::NopProbabilityAsPercentage);
   OutFlags.setVerbose(VMask);
 
-  // set for immediates randomization or pooling option
+  // Set for immediates randomization or pooling option.
   OutFlags.setRandomizeAndPoolImmediatesOption(
       ::RandomizeAndPoolImmediatesOption);
   OutFlags.setRandomizeAndPoolImmediatesThreshold(
       ::RandomizeAndPoolImmediatesThreshold);
+
+  // Set for function reordering options.
+  OutFlags.setShouldReorderFunctions(::ReorderFunctions);
+  OutFlags.setReorderFunctionsWindowSize(::ReorderFunctionsWindowSize);
+
+  // Set for global variable reordering option.
+  OutFlags.setShouldReorderGlobalVariables(::ReorderGlobalVariables);
+
+  // Set for pooled constant reordering option.
+  OutFlags.setShouldReorderPooledConstants(::ReorderPooledConstants);
 }
 
 void ClFlags::getParsedClFlagsExtra(ClFlagsExtra &OutFlagsExtra) {
   OutFlagsExtra.setAlwaysExitSuccess(AlwaysExitSuccess);
   OutFlagsExtra.setBuildOnRead(BuildOnRead);
   OutFlagsExtra.setGenerateBuildAtts(GenerateBuildAtts);
   OutFlagsExtra.setLLVMVerboseErrors(LLVMVerboseErrors);
   OutFlagsExtra.setAppName(AppName);
   OutFlagsExtra.setInputFileFormat(InputFileFormat);
   OutFlagsExtra.setIRFilename(IRFilename);
   OutFlagsExtra.setLogFilename(LogFilename);
   OutFlagsExtra.setOutputFilename(OutputFilename);
 }
 
 } // end of namespace Ice