Bug 1952060 - prepare perf tests for macosx 15.30 on m4 machines. r=sparky,releng-reviewers,ahal

Differential Revision: https://phabricator.services.mozilla.com/D240539
This commit is contained in:
Joel Maher
2025-03-12 16:39:43 +00:00
parent 13dfd1e8cc
commit 8effc317a0
5 changed files with 52 additions and 6 deletions

View File

@@ -382,6 +382,8 @@ def filter_raptor_jobs(full_task_graph, label_to_taskid, project):
continue
if "macosx1400" in entry.attributes.get("test_platform", ""):
continue
if "macosx1500" in entry.attributes.get("test_platform", ""):
continue
if "browsertime" not in entry.attributes.get("raptor_try_name", ""):
continue
if "shippable" not in entry.attributes.get("test_platform", ""):

View File

@@ -189,6 +189,8 @@ def set_treeherder_machine_platform(config, tasks):
"macosx1100-64-shippable/opt": "osx-1100-shippable/opt",
"macosx1400-64/opt": "osx-1300/opt",
"macosx1400-64-shippable/opt": "osx-1400-shippable/opt",
"macosx1500-64/opt": "osx-1500/opt",
"macosx1500-64-shippable/opt": "osx-1500-shippable/opt",
"win64-asan/opt": "windows11-64/asan",
"win64-aarch64/opt": "windows11-aarch64/opt",
}
@@ -388,6 +390,11 @@ def setup_browsertime(config, tasks):
"macosx64-aarch64-geckodriver",
"macosx64-aarch64-node",
],
"macosx1500.*": [
"browsertime",
"macosx64-aarch64-geckodriver",
"macosx64-aarch64-node",
],
"windows.*aarch64.*": [
"browsertime",
"win32-geckodriver",
@@ -408,6 +415,7 @@ def setup_browsertime(config, tasks):
"linux.*": ["linux64-ffmpeg-4.4.1"],
"macosx1470.*": ["mac64-ffmpeg-4.4.1"],
"macosx1400.*": ["mac64-ffmpeg-4.4.1"],
"macosx1500.*": ["mac64-ffmpeg-4.4.1"],
"windows.*aarch64.*": ["win64-ffmpeg-4.4.1"],
"windows.*-32.*": ["win64-ffmpeg-4.4.1"],
"windows.*-64.*": ["win64-ffmpeg-4.4.1"],
@@ -431,6 +439,10 @@ def setup_browsertime(config, tasks):
"mac-cft-cd-arm-backup",
"mac-cft-cd-arm-stable",
],
"macosx1500.*": [
"mac-cft-cd-arm-backup",
"mac-cft-cd-arm-stable",
],
"windows.*-64.*": [
"win64-cft-cd-backup",
"win64-cft-cd-stable",
@@ -441,6 +453,7 @@ def setup_browsertime(config, tasks):
"linux.*": ["linux64-cft-cd-canary"],
"macosx1400.*": ["mac-cft-cd-arm-canary"],
"macosx1470.*": ["mac-cft-cd-canary"],
"macosx1500.*": ["mac-cft-cd-arm-canary"],
"windows.*-64.*": ["win64-cft-cd-canary"],
"android.*": ["linux64-cft-cd-canary"],
}
@@ -761,6 +774,8 @@ def handle_tier(config, tasks):
"macosx1100-64-qr/debug",
"macosx1400-64-shippable-qr/opt",
"macosx1400-64-qr/debug",
"macosx1500-64-shippable-qr/opt",
"macosx1500-64-qr/debug",
"android-em-7.0-x86_64-shippable/opt",
"android-em-7.0-x86_64-shippable-lite/opt",
"android-em-7.0-x86_64/debug",

View File

@@ -141,7 +141,9 @@ def split_raptor_subtests(config, tests):
# test job for every subtest (i.e. split out each page-load URL into its own job)
subtests = test["raptor"].pop("subtests", None)
if not subtests:
if "macosx1400" not in test["test-platform"]:
if all(
p not in test["test-platform"] for p in ("macosx1400", "macosx1500")
):
yield test
continue

View File

@@ -162,8 +162,9 @@ MACOSX_WORKER_TYPES = {
"macosx1470-64": "t-osx-1400-r8",
"macosx1100-64": "t-osx-1100-m1",
"macosx1400-64": "t-osx-1400-m2",
"macosx1500-64": "t-osx-1500-m4",
"macosx1100-aarch64": "t-osx-1100-m1",
"macosx1400-aarch64": "t-osx-1400-m2",
"macosx1500-aarch64": "t-osx-1500-m4",
}
transforms = TransformSequence()
@@ -192,6 +193,8 @@ def set_worker_type(config, tasks):
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1400-64"]
elif test_platform.startswith("macosx1400-aarch64"):
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1400-aarch64"]
elif test_platform.startswith("macosx1500-aarch64"):
task["worker-type"] = MACOSX_WORKER_TYPES["macosx1500-aarch64"]
elif test_platform.startswith("win"):
# figure out what platform the job needs to run on
if task["virtualization"] == "hardware":

View File

@@ -20,9 +20,11 @@ task-defaults:
- .*macosx.*shippable.*
safari-tp:
- macosx1400.*
- macosx1500.*
custom-car:
- macosx1400.*shippable.*
- linux.*shippable.*
- macosx1500.*shippable.*
- linux.*-64.*shippable.*
- windows.*-64.*shippable.*
default: []
test-manifest-loader: null # don't load tests in the taskgraph
@@ -69,12 +71,19 @@ task-defaults:
- macosx-arm64-custom-car
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
macosx1500.*:
- macosx-arm64-custom-car
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
default: []
safari-tp:
by-test-platform:
macosx1400.*:
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
macosx1500.*:
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
default: []
default:
by-test-platform:
@@ -87,6 +96,9 @@ task-defaults:
macosx1400.*:
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
macosx1500.*:
- macosx64-aarch64-minidump-stackwalk
- macosx64-aarch64-fix-stacks
default:
- linux64-minidump-stackwalk
- linux64-fix-stacks
@@ -102,6 +114,7 @@ browsertime-tp6:
- .*macos.*shippable.*
custom-car:
- macosx1400.*shippable.*
- macosx1500.*shippable.*
- linux.*shippable.*
- windows.*-64.*shippable.*
default: []
@@ -233,6 +246,7 @@ browsertime-tp6-essential:
run-visual-metrics:
by-test-platform:
macosx1400.*shippable.*: false
macosx1500.*shippable.*: false
# Bug 1845014 Resolve osx 1300 vismet permafails
default: true
subtests:
@@ -317,6 +331,7 @@ browsertime-tp7:
- .*macos.*shippable.*
custom-car:
- macosx1400.*shippable.*
- macosx1500.*shippable.*
- linux.*shippable.*
- windows.*-64.*shippable.*
default: []
@@ -362,7 +377,7 @@ browsertime-benchmark:
apps: [firefox, chrome, safari, safari-tp, custom-car]
subtests:
by-test-platform:
macosx1400.*shippable.*:
(macosx1400|macosx1500).*shippable.*:
by-app:
safari-tp:
- [speedometer3, sp3]
@@ -463,6 +478,7 @@ browsertime-benchmark:
jetstream2:
by-test-platform:
macosx1400.*shippable.*: 3
macosx1500.*shippable.*: 3
default: 2
default: 2
@@ -479,8 +495,9 @@ browsertime-benchmark:
windows11-64-shippable(-qr)?/opt: [trunk]
windows11-64-24h2-shippable/opt: [trunk]
linux.*shippable.*: [trunk]
macosx1400.*shippable.*: [trunk]
macosx1470.*shippable.*: [trunk]
macosx1400.*shippable.*: [trunk]
macosx1500.*shippable.*: [trunk]
.*nightlyasrelease.*: [autoland, mozilla-central]
default: []
custom-car:
@@ -492,6 +509,7 @@ browsertime-benchmark:
safari-tp:
by-test-platform:
macosx1400.*: [mozilla-central]
macosx1500.*: [mozilla-central]
default: []
default: []
unity-webgl:
@@ -522,8 +540,9 @@ browsertime-benchmark:
firefox:
by-test-platform:
windows.*-32.*: []
(?!macosx1400).*64.*shippable.*/.*: [trunk]
(?!macosx1400|macosx1500).*64.*shippable.*/.*: [trunk]
macosx1400.*shippable.*: [mozilla-central]
macosx1500.*shippable.*: [mozilla-central]
default: []
default: []
max-run-time:
@@ -541,6 +560,7 @@ browsertime-benchmark:
speedometer3:
by-test-platform:
macosx1400.*shippable.*: 4200
macosx1500.*shippable.*: 4200
default: 2100
speedometer: 2100
default: 900
@@ -550,6 +570,9 @@ browsertime-benchmark:
macosx1400.*shippable.*:
- --extra-profiler-run
- --page-timeout=900000
macosx1500.*shippable.*:
- --extra-profiler-run
- --page-timeout=900000
default:
- --extra-profiler-run
@@ -1176,6 +1199,7 @@ browsertime-indexeddb:
- (.*?!macosx1470.*)shippable.*
custom-car:
- macosx1400.*shippable.*
- macosx1500.*shippable.*
- linux.*shippable.*
- windows.*-64.*shippable.*
default: []