From ef3d54528534c1685c3e681cff10ccf10a5cce81 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Thu, 23 Feb 2017 19:35:49 -0800 Subject: [PATCH] Bug 1342301 - Split out an "optimize" key from configure-args, r=arai --HG-- extra : rebase_source : 4e6b682d848e1d6e0c081903efb89b982db693f8 --- js/src/devtools/automation/autospider.py | 11 ++++++++++- js/src/devtools/automation/variants/arm-sim | 3 ++- js/src/devtools/automation/variants/arm-sim-osx | 3 ++- js/src/devtools/automation/variants/arm64-sim | 3 ++- js/src/devtools/automation/variants/asan | 3 ++- js/src/devtools/automation/variants/compacting | 3 ++- js/src/devtools/automation/variants/dtrace | 3 ++- js/src/devtools/automation/variants/msan | 3 ++- js/src/devtools/automation/variants/plain | 3 ++- js/src/devtools/automation/variants/rootanalysis | 3 ++- js/src/devtools/automation/variants/tsan | 3 ++- 11 files changed, 30 insertions(+), 11 deletions(-) diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py index 288c88edf835..5a7083c5a66e 100755 --- a/js/src/devtools/automation/autospider.py +++ b/js/src/devtools/automation/autospider.py @@ -46,6 +46,9 @@ parser.add_argument('--timeout', '-t', type=int, metavar='TIMEOUT', parser.add_argument('--objdir', type=str, metavar='DIR', default=env.get('OBJDIR', 'obj-spider'), help='object directory') +parser.add_argument('--optimize', type=bool, metavar='OPT', + default=None, + help='whether to generate an optimized build. Overrides variant setting.') parser.add_argument('--run-tests', '--tests', type=str, metavar='TESTSUITE', default='', help="comma-separated set of test suites to add to the variant's default set") @@ -133,9 +136,15 @@ POBJDIR = posixpath.join(PDIR.source, args.objdir) AUTOMATION = env.get('AUTOMATION', False) MAKE = env.get('MAKE', 'make') MAKEFLAGS = env.get('MAKEFLAGS', '-j6') -CONFIGURE_ARGS = variant['configure-args'] UNAME_M = subprocess.check_output(['uname', '-m']).strip() +CONFIGURE_ARGS = variant['configure-args'] +opt = args.optimize +if opt is None: + opt = variant.get('optimize') +if opt is not None: + CONFIGURE_ARGS += (" --enable-optimize" if opt else " --disable-optimize") + # Any jobs that wish to produce additional output can save them into the upload # directory if there is such a thing, falling back to OBJDIR. env.setdefault('MOZ_UPLOAD_DIR', OBJDIR) diff --git a/js/src/devtools/automation/variants/arm-sim b/js/src/devtools/automation/variants/arm-sim index 6c6d2bf38677..fd76dfe5056a 100644 --- a/js/src/devtools/automation/variants/arm-sim +++ b/js/src/devtools/automation/variants/arm-sim @@ -1,4 +1,5 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-pc-linux --host=i686-pc-linux", + "configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-pc-linux --host=i686-pc-linux", + "optimize": true, "bits": 32 } diff --git a/js/src/devtools/automation/variants/arm-sim-osx b/js/src/devtools/automation/variants/arm-sim-osx index c060ad2dc973..ac3495f7befa 100644 --- a/js/src/devtools/automation/variants/arm-sim-osx +++ b/js/src/devtools/automation/variants/arm-sim-osx @@ -1,4 +1,5 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-apple-darwin10.0.0 --host=i686-apple-darwin10.0.0", + "configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-apple-darwin10.0.0 --host=i686-apple-darwin10.0.0", + "optimize": true, "bits": 32 } diff --git a/js/src/devtools/automation/variants/arm64-sim b/js/src/devtools/automation/variants/arm64-sim index 1dbbc8a54428..4ed1e32af30b 100644 --- a/js/src/devtools/automation/variants/arm64-sim +++ b/js/src/devtools/automation/variants/arm64-sim @@ -1,5 +1,6 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm64", + "configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm64", + "optimize": true, "env": { "JSTESTS_EXTRA_ARGS": "--exclude-file={DIR}/arm64-jstests-slow.txt", "JITTEST_EXTRA_ARGS": "--jitflags=none --args=--baseline-eager -x ion/ -x asm.js/" diff --git a/js/src/devtools/automation/variants/asan b/js/src/devtools/automation/variants/asan index 67ee3a8c2fc0..eb13e593e1b0 100644 --- a/js/src/devtools/automation/variants/asan +++ b/js/src/devtools/automation/variants/asan @@ -1,5 +1,6 @@ { - "configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-address-sanitizer", + "configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-address-sanitizer", + "optimize": true, "compiler": "clang", "env": { "LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer" diff --git a/js/src/devtools/automation/variants/compacting b/js/src/devtools/automation/variants/compacting index aaa30db299d7..e6dbc227be73 100644 --- a/js/src/devtools/automation/variants/compacting +++ b/js/src/devtools/automation/variants/compacting @@ -1,5 +1,6 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-ctypes", + "configure-args": "--enable-debug --enable-stdcxx-compat --enable-ctypes", + "optimize": true, "env": { "JS_GC_ZEAL": "Compact", "JITTEST_EXTRA_ARGS": "--jitflags=debug --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt", diff --git a/js/src/devtools/automation/variants/dtrace b/js/src/devtools/automation/variants/dtrace index 8449aa638b87..ebd8be378e9c 100644 --- a/js/src/devtools/automation/variants/dtrace +++ b/js/src/devtools/automation/variants/dtrace @@ -1,3 +1,4 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-dtrace --enable-debug-symbols" + "configure-args": "--enable-debug --enable-dtrace --enable-debug-symbols", + "optimize": true } diff --git a/js/src/devtools/automation/variants/msan b/js/src/devtools/automation/variants/msan index 0f1662db4343..d510466c3c21 100644 --- a/js/src/devtools/automation/variants/msan +++ b/js/src/devtools/automation/variants/msan @@ -1,5 +1,6 @@ { - "configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-memory-sanitizer", + "configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-memory-sanitizer", + "optimize": true, "compiler": "clang", "env": { "JITTEST_EXTRA_ARGS": "--jitflags=interp --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt", diff --git a/js/src/devtools/automation/variants/plain b/js/src/devtools/automation/variants/plain index 6c8a26045171..ab954074d47d 100644 --- a/js/src/devtools/automation/variants/plain +++ b/js/src/devtools/automation/variants/plain @@ -1,5 +1,6 @@ { - "configure-args": "--enable-optimize", + "configure-args": "", + "optimize": true, "env": { "JSTESTS_EXTRA_ARGS": "--jitflags=all" } diff --git a/js/src/devtools/automation/variants/rootanalysis b/js/src/devtools/automation/variants/rootanalysis index b7d07b371c61..4a9623d6aceb 100644 --- a/js/src/devtools/automation/variants/rootanalysis +++ b/js/src/devtools/automation/variants/rootanalysis @@ -1,5 +1,6 @@ { - "configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-ctypes", + "configure-args": "--enable-debug --enable-stdcxx-compat --enable-ctypes", + "optimize": true, "env": { "JS_GC_ZEAL": "GenerationalGC", "JSTESTS_EXTRA_ARGS": "--jitflags=debug" diff --git a/js/src/devtools/automation/variants/tsan b/js/src/devtools/automation/variants/tsan index 04bac7db70b5..7b2fa56bac76 100644 --- a/js/src/devtools/automation/variants/tsan +++ b/js/src/devtools/automation/variants/tsan @@ -1,5 +1,6 @@ { - "configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-thread-sanitizer", + "configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-thread-sanitizer", + "optimize": true, "compiler": "clang", "env": { "LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer",