Bug 1552425 - re-disable e10s when generating PGO profile data to fix speedometer perf regression r=froydnj
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Sun, 19 May 2019 13:26:13 +0000
changeset 536349 3a6ea5b272d35eb9cd96401c35bacc6f4d28126c
parent 536348 cff3c3d2b3c51ac4b473747b5a660283ade55490
child 536350 4a74609752d2e77e4be401e92978c9c32a842b40
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1552425, 1548941, 1196094
milestone68.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 1552425 - re-disable e10s when generating PGO profile data to fix speedometer perf regression r=froydnj Bug 1548941 restricted under which circumstances we allow the browser.tabs.remote.autostart pref to turn off e10s. The PGO profileserver.py script relied on the unittest-required user.js prefs collection to turn off e10s (see also bug 1196094) via this pref. For PGO builds, we do not set the MOZ_DISABLE_NONLOCAL_CONNECTIONS env var, which meant that we stopped honouring the pref to turn off e10s. Unfortunately, this meant that e10s was inadvertently now switched on for the pgo profiling, which negatively impacted speedometer on PGO builds (and possibly other tests). All this change does is re-disable e10s for PGO profiling. We should investigate how to turn e10s on "properly" for PGO, but we can do that in bug 1196094, without taking this temporary regression, especially as 68 branches. Differential Revision: https://phabricator.services.mozilla.com/D31736
build/pgo/profileserver.py
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -75,16 +75,20 @@ if __name__ == '__main__':
                                  addons=[os.path.join(
                                      build.topsrcdir, 'tools', 'quitter',
                                      'quitter@mozilla.org.xpi')],
                                  locations=locations)
 
         env = os.environ.copy()
         env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
         env["XPCOM_DEBUG_BREAK"] = "warn"
+        # TODO should use e10s and gather data from all processes (bug 1196094).
+        # Note that unittest-required/user.js sets the autostart pref, but it
+        # is ignored by the code in nsAppRunner.
+        env["MOZ_FORCE_DISABLE_E10S"] = "1"
 
         # For VC12+, make sure we can find the right bitness of pgort1x0.dll
         if not substs.get('HAVE_64BIT_BUILD'):
             for e in ('VS140COMNTOOLS', 'VS120COMNTOOLS'):
                 if e not in env:
                     continue
 
                 vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin'))