Bug 1491419 - move --enable-reflow-perf to moz.configure; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Mon, 01 Oct 2018 14:51:27 -0400
changeset 494749 c6e9cfc12ec521a0ce9d29fe70c422534ff27145
parent 494748 b257f734506bb147b64e7a443fd54609bbf343a3
child 494750 f52dcc4f72904042ce684e36b8c3412baea305b9
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1491419
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1491419 - move --enable-reflow-perf to moz.configure; r=nalexander
build/moz.configure/old.configure
old-configure.in
toolkit/moz.configure
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -195,17 +195,16 @@ def old_configure_options(*options):
     '--enable-negotiateauth',
     '--enable-nfc',
     '--enable-nspr-build',
     '--enable-official-branding',
     '--enable-parental-controls',
     '--enable-posix-nspr-emulation',
     '--enable-pref-extensions',
     '--enable-readline',
-    '--enable-reflow-perf',
     '--enable-sandbox',
     '--enable-signmar',
     '--enable-startup-notification',
     '--enable-startupcache',
     '--enable-strip',
     '--enable-synth-pico',
     '--enable-system-cairo',
     '--enable-system-extension-dirs',
--- a/old-configure.in
+++ b/old-configure.in
@@ -1905,17 +1905,16 @@ fi
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PREF_EXTENSIONS=1
-MOZ_REFLOW_PERF=
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UNIVERSALCHARDET=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 MOZ_NO_SMART_CARDS=
 NECKO_COOKIES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
@@ -3516,27 +3515,16 @@ AC_SUBST(DEBUG_JS_MODULES)
 dnl ========================================================
 dnl =
 dnl = Profiling and Instrumenting
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Profiling and Instrumenting)
 
 dnl ========================================================
-dnl Turn on reflow counting
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(reflow-perf,
-[  --enable-reflow-perf    Enable reflow performance tracing],
-    MOZ_REFLOW_PERF=1,
-    MOZ_REFLOW_PERF= )
-if test -n "$MOZ_REFLOW_PERF"; then
-    AC_DEFINE(MOZ_REFLOW_PERF)
-fi
-
-dnl ========================================================
 dnl = Offer a way to disable the startup cache
 dnl ========================================================
 
 MOZ_ARG_DISABLE_BOOL(startupcache,
 [  --disable-startupcache          Disable startup cache ],
     MOZ_DISABLE_STARTUPCACHE=1,
     MOZ_DISABLE_STARTUPCACHE=)
 
@@ -4362,21 +4350,16 @@ if test "$MOZ_X11"; then
 
 fi # MOZ_X11
 
 fi # COMPILE_ENVIRONMENT
 
 dnl Set various defines and substitutions
 dnl ========================================================
 
-if test "$MOZ_DEBUG"; then
-    AC_DEFINE(MOZ_REFLOW_PERF)
-    AC_DEFINE(MOZ_REFLOW_PERF_DSP)
-fi
-
 if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK" ; then
     AC_DEFINE(MOZ_ACCESSIBILITY_ATK)
     ATK_FULL_VERSION=`$PKG_CONFIG --modversion atk`
     ATK_MAJOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
     ATK_MINOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
     ATK_REV_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
     AC_DEFINE_UNQUOTED(ATK_MAJOR_VERSION, $ATK_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1156,8 +1156,24 @@ set_config('MOZ_VERIFY_MAR_SIGNATURE',
 
 # TaskTracer
 # ==============================================================
 
 option('--enable-tasktracer', help='Enable TaskTracer')
 
 set_define('MOZ_TASK_TRACER', depends_if('--enable-tasktracer')(lambda _: True))
 set_config('MOZ_TASK_TRACER', depends_if('--enable-tasktracer')(lambda _: True))
+
+# Reflow counting
+# ==============================================================
+
+@depends(moz_debug, '--help')
+def reflow_perf(debug, _):
+    if debug:
+        return True
+
+option('--enable-reflow-perf', help='Enable reflow performance tracing',
+       default=reflow_perf)
+
+# The difference in conditions here comes from the initial implementation
+# in old-configure, which was unexplained there as well.
+set_define('MOZ_REFLOW_PERF', depends_if('--enable-reflow-perf')(lambda _: True))
+set_define('MOZ_REFLOW_PERF_DSP', reflow_perf)