Fix Bug 1607344; remove legacy stylo-seq linux64 jobs. r=erahm,jmaher
☠☠ backed out by ac04f5112cb8 ☠ ☠
authorStephen Donner <sdonner@mozilla.com>
Sat, 11 Jan 2020 07:20:50 +0000
changeset 509858 fd1001cea2608e5aa6ae47f31f16b1e906b44930
parent 509857 34b855ac76ea37bc1dc02d6437194991e85b64e3
child 509859 806f2bed2faffca87f214d18d81233c39570f8dc
push id37005
push usernerli@mozilla.com
push dateSat, 11 Jan 2020 21:51:30 +0000
treeherdermozilla-central@408f6c0f9814 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm, jmaher
bugs1607344
milestone74.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
Fix Bug 1607344; remove legacy stylo-seq linux64 jobs. r=erahm,jmaher Differential Revision: https://phabricator.services.mozilla.com/D59466
taskcluster/ci/config.yml
taskcluster/ci/test/awsy.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/taskgraph/test/test_try_option_syntax.py
taskcluster/taskgraph/transforms/job/mozharness_test.py
taskcluster/taskgraph/transforms/tests.py
taskcluster/taskgraph/try_option_syntax.py
testing/awsy/mach_commands.py
testing/mozharness/scripts/awsy_script.py
testing/mozharness/scripts/desktop_unittest.py
testing/mozharness/scripts/web_platform_tests.py
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -79,17 +79,16 @@ treeherder:
         'Tss': 'Talos performance tests, Stylo sequential'
         'Tss-fis': 'Talos performance tests, Stylo sequential with fission enabled'
         'Tss-1proc': 'Talos performance tests with Stylo sequential without e10s'
         'tt': 'Telemetry tests'
         'tt-1proc': 'Telemetry tests without e10s'
         'SY': 'Are we slim yet tests by TaskCluster'
         'SY-fis': 'Are we slim yet tests by TaskCluster, fission enabled'
         'SYsd': 'Are we slim yet tests by TaskCluster, Stylo disabled'
-        'SYss': 'Are we slim yet tests by TaskCluster, Stylo sequential'
         'VP': 'VideoPuppeteer tests'
         'W': 'Web platform tests'
         'W-1proc': 'Web platform tests without e10s'
         'W-fis': 'Web platform tests with fission enabled'
         'W-sw': 'Web platform tests with serviceworker redesign'
         'W-sw-1proc': 'Web platform tests with serviceworker redesign, without e10s'
         'X': 'Xpcshell tests'
         'X-1proc': 'Xpcshell tests, without e10s'
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@@ -79,15 +79,8 @@ awsy-base:
 awsy-base-dmd:
     description: "Are we slim yet - about:blank base case - dmd enabled"
     treeherder-symbol: SY(ab-d)
     run-on-projects: ['try']
     mozharness:
         extra-options:
             - --base
             - --dmd
-
-awsy-stylo-sequential:
-    description: "Are we slim yet for Stylo sequential"
-    treeherder-symbol: SYss(sy)
-    mozharness:
-        extra-options:
-            - --single-stylo-traversal
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -58,23 +58,16 @@ linux1804-64-devedition/opt:
         - web-platform-tests
 
 linux1804-64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - linux1804-tests
         - web-platform-tests
 
-# Stylo sequential runs check memory and
-# performance when using a single thread.
-linux1804-64-stylo-sequential/opt:
-    build-platform: linux64/opt
-    test-sets:
-        - awsy-stylo-sequential
-
 linux1804-64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - awsy
         - linux1804-qr-tests
         - web-platform-tests
 
 linux1804-64-shippable-qr/opt:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -335,19 +335,16 @@ raptor-firefox-power:
 
 awsy:
     - awsy
     - awsy-base
     - awsy-dmd
     - awsy-base-dmd
     - awsy-tp6
 
-awsy-stylo-sequential:
-    - awsy-stylo-sequential
-
 ##
 # Limited test sets for specific platforms
 
 linux-common-tests:
     - marionette
     - mochitest
     - mochitest-browser-chrome
     - mochitest-chrome
--- a/taskcluster/taskgraph/test/test_try_option_syntax.py
+++ b/taskcluster/taskgraph/test/test_try_option_syntax.py
@@ -236,23 +236,22 @@ class TestTryOptionSyntax(unittest.TestC
         "-u gtest[linux,win32] selects the linux and win32 platforms for gtest"
         parameters = {'try_options': parse_message('try: -u gtest[linux,win32]')}
         tos = TryOptionSyntax(parameters, graph_with_jobs, GRAPH_CONFIG)
         self.assertEqual(sorted(tos.unittests), sorted([
             {'test': 'gtest', 'platforms': ['linux', 'win32']},
         ]))
 
     def test_u_platforms_pretty(self):
-        """-u gtest[Ubuntu] selects the linux, linux64, linux64-asan
-        and linux64-stylo-sequential platforms for gtest"""
+        """-u gtest[Ubuntu] selects the linux, linux64 and linux64-asan
+        platforms for gtest"""
         parameters = {'try_options': parse_message('try: -u gtest[Ubuntu]')}
         tos = TryOptionSyntax(parameters, graph_with_jobs, GRAPH_CONFIG)
         self.assertEqual(sorted(tos.unittests), sorted([
-            {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan',
-                                            'linux64-stylo-sequential']},
+            {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan']},
         ]))
 
     def test_u_platforms_negated(self):
         "-u gtest[-linux] selects all platforms but linux for gtest"
         parameters = {'try_options': parse_message('try: -u gtest[-linux]')}
         tos = TryOptionSyntax(parameters, graph_with_jobs, GRAPH_CONFIG)
         all_platforms = set([x.attributes['test_platform'] for x in unittest_tasks.values()])
         self.assertEqual(sorted(tos.unittests[0]['platforms']), sorted(
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -27,17 +27,16 @@ from taskgraph.transforms.job.common imp
 VARIANTS = [
     'nightly',
     'shippable',
     'devedition',
     'pgo',
     'asan',
     'stylo',
     'stylo-disabled',
-    'stylo-sequential',
     'qr',
     'ccov',
 ]
 
 
 def get_variant(test_platform):
     for v in VARIANTS:
         if '-{}/'.format(v) in test_platform:
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -1461,31 +1461,16 @@ def set_test_type(config, tests):
     for test in tests:
         for test_type in ['mochitest', 'reftest', 'talos', 'raptor']:
             if test_type in test['suite'] and 'web-platform' not in test['suite']:
                 test.setdefault('tags', {})['test-type'] = test_type
         yield test
 
 
 @transforms.add
-def single_stylo_traversal_tests(config, tests):
-    """Enable single traversal for all tests on the sequential Stylo platform."""
-
-    for test in tests:
-        if not test['test-platform'].startswith('linux64-stylo-sequential/'):
-            yield test
-            continue
-
-        # Bug 1356122 - Run Stylo tests in sequential mode
-        test['mozharness'].setdefault('extra-options', [])\
-                          .append('--single-stylo-traversal')
-        yield test
-
-
-@transforms.add
 def set_worker_type(config, tests):
     """Set the worker type based on the test platform."""
     for test in tests:
         # during the taskcluster migration, this is a bit tortured, but it
         # will get simpler eventually!
         test_platform = test['test-platform']
         if test.get('worker-type'):
             # This test already has its worker type defined, so just use that (yields below)
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -114,23 +114,21 @@ UNITTEST_ALIASES = {
 # new platform, and they shouldn't have to explicitly spell out the new platform
 # every time for such cases.
 #
 # Note that the test platforms here are only the prefix up to the `/`.
 UNITTEST_PLATFORM_PRETTY_NAMES = {
     'Ubuntu': [
         'linux32',
         'linux64',
-        'linux64-asan',
-        'linux64-stylo-sequential'
+        'linux64-asan'
     ],
     'x64': [
         'linux64',
-        'linux64-asan',
-        'linux64-stylo-sequential'
+        'linux64-asan'
     ],
     'Android 7.0 Moto G5 32bit': ['android-hw-g5-7.0-arm7-api-16'],
     'Android 8.0 Google Pixel 2 32bit': ['android-hw-p2-8.0-arm7-api-16'],
     'Android 8.0 Google Pixel 2 64bit': ['android-hw-p2-8.0-android-aarch64'],
     '10.14': ['macosx1014-64'],
     # other commonly-used substrings for platforms not yet supported with
     # in-tree taskgraphs:
     # '10.10.5': [..TODO..],
--- a/testing/awsy/mach_commands.py
+++ b/testing/awsy/mach_commands.py
@@ -224,19 +224,16 @@ class MachCommands(MachCommandBase):
     @CommandArgument('--per-tab-pause', group='AWSY', action='store', type=int,
                      dest='perTabPause',
                      help='Seconds to wait in between opening tabs. '
                      'Defaults to %s.' % PER_TAB_PAUSE)
     @CommandArgument('--settle-wait-time', group='AWSY', action='store', type=int,
                      dest='settleWaitTime',
                      help='Seconds to wait for things to settled down. '
                      'Defaults to %s.' % SETTLE_WAIT_TIME)
-    @CommandArgument('--single-stylo-traversal', group='AWSY', action='store_true',
-                     dest='single_stylo_traversal', default=False,
-                     help='Set STYLO_THREADS=1.')
     @CommandArgument('--dmd', group='AWSY', action='store_true',
                      dest='dmd', default=False,
                      help='Enable DMD during testing. Requires a DMD-enabled build.')
     @CommandArgument('--tp6', group='AWSY', action='store_true',
                      dest='tp6', default=False,
                      help='Use the tp6 pageset during testing.')
     def run_awsy_test(self, tests, **kwargs):
         """mach awsy-test runs the in-tree version of the Are We Slim Yet
--- a/testing/mozharness/scripts/awsy_script.py
+++ b/testing/mozharness/scripts/awsy_script.py
@@ -45,22 +45,16 @@ class AWSY(TestingMixin, MercurialScript
           "help": "Run tests without multiple processes (e10s). (Desktop builds only)",
           }],
         [["--setpref"],
          {"action": "append",
           "dest": "extra_prefs",
           "default": [],
           "help": "Extra user prefs.",
           }],
-        [["--single-stylo-traversal"],
-         {"action": "store_true",
-          "dest": "single_stylo_traversal",
-          "default": False,
-          "help": "Set STYLO_THREADS=1.",
-          }],
         [["--enable-webrender"],
          {"action": "store_true",
           "dest": "enable_webrender",
           "default": False,
           "help": "Enable the WebRender compositor in Gecko.",
           }],
         [["--base"],
          {"action": "store_true",
@@ -251,23 +245,17 @@ class AWSY(TestingMixin, MercurialScript
         cmd.append("--preferences=%s" % os.path.join(self.awsy_path, "conf", prefs_file))
         if dmd_enabled:
             cmd.append("--setpref=security.sandbox.content.level=0")
         cmd.append(test_file)
 
         if self.config['enable_webrender']:
             cmd.append('--enable-webrender')
 
-        if self.config['single_stylo_traversal']:
-            env['STYLO_THREADS'] = '1'
-        else:
-            env['STYLO_THREADS'] = '4'
-
-        # TODO: consider getting rid of this as stylo is enabled by default
-        env['STYLO_FORCE_ENABLED'] = '1'
+        env['STYLO_THREADS'] = '4'
 
         env['MOZ_UPLOAD_DIR'] = dirs['abs_blob_upload_dir']
         if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
             self.mkdir_p(env['MOZ_UPLOAD_DIR'])
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         env['MINIDUMP_SAVE_PATH'] = dirs['abs_blob_upload_dir']
         env['RUST_BACKTRACE'] = '1'
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -137,22 +137,16 @@ class DesktopUnittest(TestingMixin, Merc
          ],
         [["--allow-software-gl-layers"], {
             "action": "store_true",
             "dest": "allow_software_gl_layers",
             "default": False,
             "help": "Permits a software GL implementation (such as LLVMPipe) to use "
                     "the GL compositor."}
          ],
-        [["--single-stylo-traversal"], {
-            "action": "store_true",
-            "dest": "single_stylo_traversal",
-            "default": False,
-            "help": "Forcibly enable single thread traversal in Stylo with STYLO_THREADS=1"}
-         ],
         [["--enable-webrender"], {
             "action": "store_true",
             "dest": "enable_webrender",
             "default": False,
             "help": "Enable the WebRender compositor in Gecko."}
          ],
         [["--gpu-required"], {
             "action": "store_true",
@@ -884,20 +878,17 @@ class DesktopUnittest(TestingMixin, Merc
                 env['MINIDUMP_SAVE_PATH'] = self.query_abs_dirs()['abs_blob_upload_dir']
                 env['RUST_BACKTRACE'] = 'full'
                 if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
                     self.mkdir_p(env['MOZ_UPLOAD_DIR'])
 
                 if self.config['allow_software_gl_layers']:
                     env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
 
-                if self.config['single_stylo_traversal']:
-                    env['STYLO_THREADS'] = '1'
-                else:
-                    env['STYLO_THREADS'] = '4'
+                env['STYLO_THREADS'] = '4'
 
                 env = self.query_env(partial_env=env, log_level=INFO)
                 cmd_timeout = self.get_timeout_for_category(suite_category)
 
                 summary = {}
                 for per_test_args in self.query_args(suite):
                     # Make sure baseline code coverage tests are never
                     # skipped and that having them run has no influence
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -81,22 +81,16 @@ class WebPlatformTest(TestingMixin, Merc
             "help": "Specify headless virtual screen width (default: 1600)."}
          ],
         [["--headless-height"], {
             "action": "store",
             "dest": "headless_height",
             "default": "1200",
             "help": "Specify headless virtual screen height (default: 1200)."}
          ],
-        [["--single-stylo-traversal"], {
-            "action": "store_true",
-            "dest": "single_stylo_traversal",
-            "default": False,
-            "help": "Forcibly enable single thread traversal in Stylo with STYLO_THREADS=1"}
-         ],
         [["--setpref"], {
             "action": "append",
             "metavar": "PREF=VALUE",
             "dest": "extra_prefs",
             "default": [],
             "help": "Defines an extra user preference."}
          ],
         [["--include"], {