SERVER-54682 Implement a command line framework for optimization and hardening flag experiments

1 files changed, 50 insertions, 0 deletions

diff --git a/SConstruct b/SConstruct
index 533d10f310a..da8066af57e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -272,6 +272,21 @@ add_option('opt',
     type='choice',
 )
 
+experimental_optimizations = []
+experimental_optimization_choices = ['*']
+experimental_optimization_choices.extend("+" + opt for opt in experimental_optimizations)
+experimental_optimization_choices.extend("-" + opt for opt in experimental_optimizations)
+
+add_option('experimental-optimization',
+    action="append",
+    choices=experimental_optimization_choices,
+    const=experimental_optimization_choices[0],
+    default=[],
+    help='Enable experimental optimizations',
+    nargs='?',
+    type='choice'
+)
+
 add_option('debug-compress',
     action="append",
     choices=["off", "as", "ld"],
@@ -503,6 +518,21 @@ add_option('runtime-hardening',
     type='choice',
 )
 
+experimental_runtime_hardenings = []
+experimental_runtime_hardening_choices = ['*']
+experimental_runtime_hardening_choices.extend("+" + opt for opt in experimental_runtime_hardenings)
+experimental_runtime_hardening_choices.extend("-" + opt for opt in experimental_runtime_hardenings)
+
+add_option('experimental-runtime-hardening',
+    action="append",
+    choices=experimental_runtime_hardening_choices,
+    const=experimental_runtime_hardening_choices[0],
+    default=[],
+    help='Enable experimental runtime hardenings',
+    nargs='?',
+    type='choice'
+)
+
 add_option('use-hardware-crc32',
     choices=["on", "off"],
     default="on",
@@ -2067,6 +2097,26 @@ if debugBuild:
 else:
     env.AppendUnique( CPPDEFINES=[ 'NDEBUG' ] )
 
+
+# Normalize our experimental optimiation and hardening flags
+selected_experimental_optimizations = set()
+for suboption in get_option('experimental-optimization'):
+    if suboption == "*":
+        selected_experimental_optimizations.update(experimental_optimizations)
+    elif suboption.startswith('-'):
+        selected_experimental_optimizations.discard(suboption[1:])
+    elif suboption.startswith('+'):
+        selected_experimental_optimizations.add(suboption[1:])
+
+selected_experimental_runtime_hardenings = set()
+for suboption in get_option('experimental-runtime-hardening'):
+    if suboption == "*":
+        selected_experimental_runtime_hardenings.update(experimental_runtime_hardenings)
+    elif suboption.startswith('-'):
+        selected_experimental_runtime_hardenings.discard(suboption[1:])
+    elif suboption.startswith('+'):
+        selected_experimental_runtime_hardenings.add(suboption[1:])
+
 if env.TargetOSIs('linux'):
     env.Append( LIBS=["m"] )
     if not env.TargetOSIs('android'):