From 648f24c92f1add64e25f50a7995f625eb893f62b Mon Sep 17 00:00:00 2001 From: Yuly Novikov Date: Mon, 10 Jul 2023 17:59:29 +0000 Subject: [PATCH] Start Mac AMD 13.4.1 experiment Bug: chromium:1462473 Change-Id: Ic30d5f5a0999c10949581aff813febdb83a8cef9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4675805 Commit-Queue: Yuly Novikov Reviewed-by: Brian Sheedy --- infra/config/generated/luci-milo.cfg | 8 +- infra/config/main.star | 1 + infra/specs/angle.json | 216 ++++++++++++++++++++++++++- infra/specs/waterfalls.pyl | 1 + 4 files changed, 222 insertions(+), 4 deletions(-) diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index af474bdf0..c69e13620 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg @@ -60,6 +60,11 @@ consoles { category: "compile|mac|x64" short_name: "dbg" } + builders { + name: "buildbucket/luci.angle.ci/mac-exp-test" + category: "test|mac|x64" + short_name: "exp" + } builders { name: "buildbucket/luci.angle.ci/mac-test" category: "test|mac|x64" @@ -173,9 +178,6 @@ consoles { builders { name: "buildbucket/luci.angle.ci/linux-exp-tsan-test" } - builders { - name: "buildbucket/luci.angle.ci/mac-exp-test" - } builders { name: "buildbucket/luci.angle.ci/win-exp-test" } diff --git a/infra/config/main.star b/infra/config/main.star index 48c80994c..c2b667f56 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -318,6 +318,7 @@ def angle_builder(name, cpu): active_experimental_builders = [ "android-arm64-exp-test", + "mac-exp-test", ] if (not is_exp) or (name in active_experimental_builders): diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 43d9b879b..69c0d8859 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -3860,7 +3860,221 @@ } ] }, - "mac-exp-amd": {}, + "mac-exp-amd": { + "gtest_tests": [ + { + "args": [ + "--use-angle=gl", + "--max-processes=1" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_egl_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_egl_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_egl_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_egl_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=gl", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles2_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles2_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=gl", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles3_gl_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_deqp_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--use-angle=metal", + "--flaky-retries=2" + ], + "merge": { + "script": "//scripts/angle_deqp_test_merge.py" + }, + "name": "angle_deqp_gles3_metal_tests", + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_deqp_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "--gtest_filter=-*Vulkan_SwiftShader*", + "--flaky-retries=2" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "angle_end2end_tests", + "test_id_prefix": "ninja://src/tests:angle_end2end_tests/", + "use_isolated_scripts_api": true + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-13.4.1", + "pool": "chromium.tests.gpu" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_unittests", + "test_id_prefix": "ninja://src/tests:angle_unittests/", + "use_isolated_scripts_api": true + } + ] + }, "mac-exp-intel": {}, "mac-intel": { "gtest_tests": [ diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index a69175b54..d36476455 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -227,6 +227,7 @@ 'mac_retina_amd_gpu_experimental', ], 'test_suites': { + 'gtest_tests': 'mac_amd_and_intel_gtests', }, }, 'mac-exp-intel': {