Migrate Win/x86/dbg to Starlark Migrates the builders related to dawn-win-x86-builder-dbg to use test specs generated from Starlark. Bug: 485816035 Change-Id: Id8c05b459d399b31d652ca9e03acfb657f1560ba Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/295735 Reviewed-by: Jonathan Lee <jonathanjlee@google.com> Commit-Queue: Jonathan Lee <jonathanjlee@google.com> Commit-Queue: Brian Sheedy <bsheedy@google.com> Auto-Submit: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/targets/ci.json b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/targets/ci.json new file mode 100644 index 0000000..b3d15b6 --- /dev/null +++ b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/targets/ci.json
@@ -0,0 +1,166 @@ +{ + "dawn-win-x86-builder-dbg": { + "additional_compile_targets": [ + "default" + ] + }, + "dawn-win-x86-sws-dbg": { + "gtest_tests": [ + { + "args": [ + "--backend=opengles", + "--use-angle=swiftshader", + "--enable-toggles=gl_force_es_31_and_no_extensions" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_swangle_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1AE0" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_sws_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1414" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_warp_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "args": [ + "--use-wire" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_wire_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/tint/cmd/test:tint_unittests/", + "module_scheme": "gtest", + "name": "tint_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "tint_unittests", + "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/" + } + ] + } +} \ No newline at end of file
diff --git a/infra/config/global/generated/builders/ci/dawn-win-x86-sws-dbg/targets/ci.json b/infra/config/global/generated/builders/ci/dawn-win-x86-sws-dbg/targets/ci.json new file mode 100644 index 0000000..b538faf --- /dev/null +++ b/infra/config/global/generated/builders/ci/dawn-win-x86-sws-dbg/targets/ci.json
@@ -0,0 +1,161 @@ +{ + "dawn-win-x86-sws-dbg": { + "gtest_tests": [ + { + "args": [ + "--backend=opengles", + "--use-angle=swiftshader", + "--enable-toggles=gl_force_es_31_and_no_extensions" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_swangle_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1AE0" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_sws_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1414" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_warp_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "args": [ + "--use-wire" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_wire_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/tint/cmd/test:tint_unittests/", + "module_scheme": "gtest", + "name": "tint_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "tint_unittests", + "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/" + } + ] + } +} \ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-cq-win-x86-dbg/targets/ci.json b/infra/config/global/generated/builders/try/dawn-cq-win-x86-dbg/targets/ci.json new file mode 100644 index 0000000..b3d15b6 --- /dev/null +++ b/infra/config/global/generated/builders/try/dawn-cq-win-x86-dbg/targets/ci.json
@@ -0,0 +1,166 @@ +{ + "dawn-win-x86-builder-dbg": { + "additional_compile_targets": [ + "default" + ] + }, + "dawn-win-x86-sws-dbg": { + "gtest_tests": [ + { + "args": [ + "--backend=opengles", + "--use-angle=swiftshader", + "--enable-toggles=gl_force_es_31_and_no_extensions" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_swangle_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1AE0" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_sws_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1414" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_warp_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "args": [ + "--use-wire" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_wire_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/tint/cmd/test:tint_unittests/", + "module_scheme": "gtest", + "name": "tint_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "tint_unittests", + "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/" + } + ] + } +} \ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/targets/ci.json b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/targets/ci.json new file mode 100644 index 0000000..b3d15b6 --- /dev/null +++ b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/targets/ci.json
@@ -0,0 +1,166 @@ +{ + "dawn-win-x86-builder-dbg": { + "additional_compile_targets": [ + "default" + ] + }, + "dawn-win-x86-sws-dbg": { + "gtest_tests": [ + { + "args": [ + "--backend=opengles", + "--use-angle=swiftshader", + "--enable-toggles=gl_force_es_31_and_no_extensions" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_swangle_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1AE0" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_sws_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--adapter-vendor-id=0x1414" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_warp_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "args": [ + "--use-wire" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_unittests/", + "module_scheme": "gtest", + "name": "dawn_wire_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_unittests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/" + }, + { + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/tint/cmd/test:tint_unittests/", + "module_scheme": "gtest", + "name": "tint_unittests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "tint_unittests", + "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/" + } + ] + } +} \ No newline at end of file
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg index 83a4dce..0a61959 100644 --- a/infra/config/global/generated/luci/cr-buildbucket.cfg +++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -9236,7 +9236,8 @@ ' "builder": "dawn-try-win-x86-sws-dbg",' ' "group": "try"' ' }' - ' ]' + ' ],' + ' "targets_spec_directory": "infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/targets"' ' }' ' },' ' "$build/siso": {' @@ -9990,7 +9991,8 @@ ' "builder": "dawn-try-win-x86-sws-dbg",' ' "group": "try"' ' }' - ' ]' + ' ],' + ' "targets_spec_directory": "infra/config/global/generated/builders/ci/dawn-win-x86-sws-dbg/targets"' ' }' ' },' ' "builder_group": "ci",' @@ -13983,7 +13985,8 @@ ' "builder": "dawn-win-x86-sws-dbg",' ' "project": "dawn"' ' }' - ' ]' + ' ],' + ' "targets_spec_directory": "infra/config/global/generated/builders/try/dawn-cq-win-x86-dbg/targets"' ' }' ' },' ' "$build/flakiness": {' @@ -19350,7 +19353,8 @@ ' "builder": "dawn-win-x86-sws-dbg",' ' "project": "dawn"' ' }' - ' ]' + ' ],' + ' "targets_spec_directory": "infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/targets"' ' }' ' },' ' "$build/siso": {'
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star index 39827bd..2c00c30 100644 --- a/infra/config/global/gn_standalone_ci.star +++ b/infra/config/global/gn_standalone_ci.star
@@ -662,6 +662,11 @@ "x86", ], ), + targets = targets.bundle( + additional_compile_targets = [ + "default", + ], + ), console_view_entry = consoles.console_view_entry( category = "win|build|clang|dbg", short_name = "x86", @@ -1893,6 +1898,18 @@ ), run_tests_serially = True, ), + targets = targets.bundle( + targets = [ + "win_software_renderer_gtests", + ], + mixins = [ + "win10_gce_gpu_pool", + ], + ), + targets_settings = targets.settings( + browser_config = targets.browser_config.DEBUG, + os_type = targets.os_type.WINDOWS, + ), console_view_entry = consoles.console_view_entry( category = "win|test|clang|dbg|x86", short_name = "sws",