--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -299,16 +299,17 @@ for platform, platform_config in PLATFOR
platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
else:
platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
ALL_TALOS_PLATFORMS = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'win32', 'macosx64', 'win64', 'linux64-qr', 'linux64-stylo', 'linux64-stylosequential'))
LINUX_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('linux64', 'linux64-qr', 'linux64-stylo', 'linux64-stylosequential'))
WIN_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('win32', 'win64'))
WIN7_ONLY = ['win7_ix']
+WIN10_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('win64',))
SUITES = {
'xperf-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5n', '--sampleConfig', 'xperf.config', '--mozAfterPaint', '--xperf_path',
'"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, WIN7_ONLY),
},
@@ -324,46 +325,61 @@ SUITES = {
'"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, WIN7_ONLY),
},
'tp5o-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
+ 'tp5o-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': (TALOS_TP_NEW_OPTS, WIN10_ONLY),
+ },
'tp5o-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'tp5o-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'g1-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
+ 'g1-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
+ 'options': (TALOS_TP_NEW_OPTS, WIN10_ONLY),
+ },
'g1-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'g1-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o_scroll', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'g2-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'damp', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
+ 'g2-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'damp', '--filter', 'ignore_first:1', '--filter', 'median'],
+ 'options': (TALOS_TP_NEW_OPTS, WIN10_ONLY),
+ },
'g2-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'damp', '--filter', 'ignore_first:1', '--filter', 'median'],
'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
},
'g2-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'damp', '--filter', 'ignore_first:1', '--filter', 'median'],
@@ -384,121 +400,161 @@ SUITES = {
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_dom'],
'options': ({}, LINUX_ONLY),
},
'g4-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'basic_compositor_video'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'g4-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'basic_compositor_video'],
+ 'options': ({}, WIN10_ONLY),
+ },
'g4-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'basic_compositor_video'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'g4-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'basic_compositor_video'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'g5-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'g5-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint'],
+ 'options': ({}, WIN10_ONLY),
+ },
'g5-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'g5-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'other-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'other-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, WIN10_ONLY),
+ },
'other-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'other-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'svgr-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'svgr-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, WIN10_ONLY),
+ },
'svgr-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'svgr-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'dromaeojs-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'dromaeojs-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
+ 'options': ({}, WIN10_ONLY),
+ },
'dromaeojs-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'dromaeojs-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'chromez-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'chromez-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, WIN10_ONLY),
+ },
'chromez-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'chromez-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'perf-reftest-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic:bloom_basic_ref', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'perf-reftest-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic:bloom_basic_ref', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, WIN10_ONLY),
+ },
'perf-reftest-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic:bloom_basic_ref', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'perf-reftest-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic:bloom_basic_ref', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'tp6-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'tp6-profiling-e10s': {
+ 'enable_by_default': True,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo'],
+ 'options': ({}, WIN10_ONLY),
+ },
'tp6-stylo-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'tp6-stylo-disabled-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo'],
@@ -509,31 +565,41 @@ SUITES = {
'suites': GRAPH_CONFIG + ['--activeTests', 'Quantum_1', '--filter', 'ignore_first:5', '--filter', 'median', '--stylo-threads'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'perf-reftest-singletons-e10s': {
'enable_by_default': True,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic_singleton', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'perf-reftest-singletons-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic_singleton', '--filter', 'ignore_first:5', '--filter', 'median'],
+ 'options': ({}, WIN10_ONLY),
+ },
'perf-reftest-singletons-stylo-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic_singleton', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'perf-reftest-singletons-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'bloom_basic_singleton', '--filter', 'ignore_first:5', '--filter', 'median'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'speedometer-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'speedometer'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
+ 'speedometer-profiling-e10s': {
+ 'enable_by_default': False,
+ 'suites': GRAPH_CONFIG + ['--activeTests', 'speedometer'],
+ 'options': ({}, WIN10_ONLY),
+ },
'speedometer-stylo-disabled-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'speedometer'],
'options': ({}, ALL_TALOS_PLATFORMS),
},
'h1-e10s': {
'enable_by_default': False,
'suites': GRAPH_CONFIG + ['--activeTests', 'ts_paint_heavy'],
@@ -2911,16 +2977,33 @@ for name, branch in items_at_least(BRANC
branch['dromaeojs-stylo-disabled-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['chromez-stylo-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['chromez-stylo-disabled-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['perf-reftest-stylo-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['perf-reftest-stylo-disabled-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['perf-reftest-singletons-stylo-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
branch['perf-reftest-singletons-stylo-disabled-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
+# Enable talos profiling suite on 60+ for m-c and try
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 60):
+ if branch.get('enable_talos') is False:
+ continue
+ if name in ['try', 'mozilla-central']:
+ branch['tp5o-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['g1-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['g2-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['g4-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['g5-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['other-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['svgr-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['dromaeojs-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['chromez-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['perf-reftest-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+ branch['perf-reftest-singletons-profiling-e10s_tests'] = (1, False, {}, WIN10_ONLY)
+
### Test suites that only run on Try ###
ride_trains_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
ride_trains_branches.append(name)
# TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
for branch in BRANCHES.keys():