Skip to content

Commit

Permalink
Start Mac Intel experiment
Browse files Browse the repository at this point in the history
Bug: chromium:326904538, angleproject:8628
Change-Id: Ib453b4ba0e582d348ec0618b7a5b9c0e69efb86e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5410986
Auto-Submit: Brian Sheedy <[email protected]>
Reviewed-by: Yuly Novikov <[email protected]>
Commit-Queue: Yuly Novikov <[email protected]>
  • Loading branch information
Brian Sheedy authored and Angle LUCI CQ committed Apr 3, 2024
1 parent 72c8830 commit 304ea14
Show file tree
Hide file tree
Showing 3 changed files with 189 additions and 1 deletion.
187 changes: 186 additions & 1 deletion infra/specs/angle.json
Original file line number Diff line number Diff line change
Expand Up @@ -5743,7 +5743,192 @@
}
]
},
"mac-exp-intel": {},
"mac-exp-intel": {
"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",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]"
},
"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",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]"
},
"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",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]"
},
"test": "angle_deqp_gles2_tests",
"test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"--use-angle=metal",
"--flaky-retries=2"
],
"merge": {
"script": "//scripts/angle_deqp_test_merge.py"
},
"name": "angle_deqp_gles2_metal_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]"
},
"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",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]",
"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",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]",
"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"
},
"name": "angle_end2end_tests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]",
"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"
},
"name": "angle_unittests",
"swarming": {
"containment_type": "AUTO",
"dimensions": {
"cpu": "x86-64",
"display_attached": "1",
"gpu": "8086:3e9b",
"os": "Mac-14.3.1"
},
"service_account": "[email protected]"
},
"test": "angle_unittests",
"test_id_prefix": "ninja://src/tests:angle_unittests/",
"use_isolated_scripts_api": true
}
]
},
"mac-exp-nvidia": {},
"mac-intel": {
"gtest_tests": [
Expand Down
1 change: 1 addition & 0 deletions infra/specs/waterfalls.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@
'mac_mini_intel_gpu_experimental',
],
'test_suites': {
'gtest_tests': 'mac_amd_and_intel_gtests',
},
},
'mac-exp-nvidia': {
Expand Down
2 changes: 2 additions & 0 deletions src/tests/angle_end2end_tests_expectations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,8 @@ b/330697097 PIXEL6 VULKAN : FramebufferTest_ES31.MultisampleResolveBothAttachmen
// Failures as a result of Mac 13 -> Mac 14 upgrade.
8628 MAC AMD METAL : GLSLTest_ES3.LiteralInfinityOutput/* = SKIP
8628 MAC AMD METAL : GLSLTest_ES3.LiteralNegativeInfinityOutput/* = SKIP
8628 MAC INTEL METAL : GLSLTest_ES3.LiteralInfinityOutput/* = SKIP
8628 MAC INTEL METAL : GLSLTest_ES3.LiteralNegativeInfinityOutput/* = SKIP

// Skip device OOM tests for Linux/NVIDIA.
8236 LINUX NVIDIA : VulkanMemoryTest.* = SKIP
Expand Down

0 comments on commit 304ea14

Please sign in to comment.