aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 21:33:25 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 21:33:25 +0000
commit05dd435dd95fd4ff494b1f36963f9fe3119cb8e0 (patch)
tree754cfa75902c2799b1c6a66a22c3e270ca6fdecc
parentd6214363664443b407b89cc48d87759ed197ae93 (diff)
parent22e7c7e02f1d40b10ff3d827fc1582d75d92e7f0 (diff)
downloadskia-05dd435dd95fd4ff494b1f36963f9fe3119cb8e0.tar.gz
Snap for 8513843 from 22e7c7e02f1d40b10ff3d827fc1582d75d92e7f0 to mainline-appsearch-release
Change-Id: I086e96f18fe19d8fafb6c83ec507f8a669cb4a93
Diffstat
-rw-r--r--Android.bp2
-rw-r--r--gm/stroketext.cpp30
-rwxr-xr-xgn/gn_to_bp.py2
-rw-r--r--infra/bots/gen_tasks_logic/gen_tasks_logic.go4
-rw-r--r--infra/bots/jobs.json10
-rwxr-xr-xinfra/bots/tasks.json928
-rw-r--r--platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt39
-rw-r--r--resources/fonts/Variable.ttfbin11548 -> 12812 bytes
-rw-r--r--src/ports/SkFontHost_FreeType_common.cpp14
-rw-r--r--tools/skqp/src/BUILD.bazel4
-rw-r--r--tools/skqp/src/skqp.cpp112
11 files changed, 219 insertions, 926 deletions
diff --git a/Android.bp b/Android.bp
index 374dac4717..9c01432326 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1753,7 +1753,7 @@ cc_library_static {
"android",
],
},
- linux_glibc: {
+ host_linux: {
srcs: [
"src/codec/SkRawCodec.cpp",
"src/ports/SkDebug_stdio.cpp",
diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp
index 4c2baa11f4..98e670a9ff 100644
--- a/gm/stroketext.cpp
+++ b/gm/stroketext.cpp
@@ -10,6 +10,8 @@
#include "include/core/SkCanvas.h"
#include "include/core/SkColor.h"
#include "include/core/SkFont.h"
+#include "include/core/SkFontArguments.h"
+#include "include/core/SkFontMgr.h"
#include "include/core/SkFontTypes.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkPaint.h"
@@ -95,10 +97,24 @@ DEF_SIMPLE_GM(stroketext, canvas, 1200, 480) {
draw_text_set(canvas, paint, font);
}
-DEF_SIMPLE_GM_CAN_FAIL(stroketext_native, canvas, msg, 650, 320) {
+DEF_SIMPLE_GM_CAN_FAIL(stroketext_native, canvas, msg, 650, 420) {
sk_sp<SkTypeface> ttf = MakeResourceAsTypeface("fonts/Stroking.ttf");
sk_sp<SkTypeface> otf = MakeResourceAsTypeface("fonts/Stroking.otf");
- if (!ttf && !otf) {
+
+ sk_sp<SkTypeface> overlap = []() -> sk_sp<SkTypeface>{
+ std::unique_ptr<SkStreamAsset> variableStream(GetResourceAsStream("fonts/Variable.ttf"));
+ if (!variableStream) {
+ return nullptr;
+ }
+ const SkFontArguments::VariationPosition::Coordinate position[] = {
+ { SkSetFourByteTag('w','g','h','t'), 721.0f },
+ };
+ SkFontArguments params;
+ params.setVariationDesignPosition({position, SK_ARRAY_COUNT(position)});
+ return SkFontMgr::RefDefault()->makeFromStream(std::move(variableStream), params);
+ }();
+
+ if (!ttf && !otf && !overlap) {
msg->append("No support for ttf or otf.");
return skiagm::DrawResult::kSkip;
}
@@ -140,5 +156,15 @@ DEF_SIMPLE_GM_CAN_FAIL(stroketext_native, canvas, msg, 650, 320) {
canvas->drawString("○◉ ⁰¹³ᶠ", 10, 300, font, p);
}
+ if (overlap) {
+ /* Variable.ttf is structured like:
+ U+74 t (glyf outline has overlap flag)
+ U+167 ŧ (glyf outline does not have overlap flag)
+ */
+ SkFont font(overlap, 100);
+ p.setStrokeWidth(1);
+ canvas->drawString("tŧ", 10, 400, font, p);
+ }
+
return skiagm::DrawResult::kOk;
}
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 16a2ea5caa..c38a086cb3 100755
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -180,7 +180,7 @@ cc_library_static {
"android",
],
},
- linux_glibc: {
+ host_linux: {
srcs: [
$linux_srcs
],
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index a3814fac53..1d6bec3a47 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -890,7 +890,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
"IntelIris655": "8086:3ea5-26.20.100.7463",
"RadeonHD7770": "1002:683d-26.20.13031.18002",
"RadeonR9M470X": "1002:6646-26.20.13031.18002",
- "QuadroP400": "10de:1cb3-30.0.14.7168",
+ "QuadroP400": "10de:1cb3-30.0.15.1179",
}[b.parts["cpu_or_gpu_value"]]
if !ok {
log.Fatalf("Entry %q not found in Win GPU mapping.", b.parts["cpu_or_gpu_value"])
@@ -903,7 +903,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
"IntelHD2000": "8086:0102",
"IntelHD405": "8086:22b1",
"IntelIris640": "8086:5926",
- "QuadroP400": "10de:1cb3-430.14",
+ "QuadroP400": "10de:1cb3-510.60.02",
}[b.parts["cpu_or_gpu_value"]]
if !ok {
log.Fatalf("Entry %q not found in Ubuntu GPU mapping.", b.parts["cpu_or_gpu_value"])
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index cb7c3edd50..a0c46ad90e 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -368,12 +368,7 @@
{"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Skpbench"},
{"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-AllPathsVolatile_Skpbench"},
{"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal_AllPathsVolatile_Skpbench"},
- {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN"},
{"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"},
- {
- "name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN",
- "cq_config": {}
- },
{"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41"},
{"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"},
{"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats"},
@@ -641,12 +636,10 @@
},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"},
- {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN"},
{
"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan",
"cq_config": {}
},
- {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext"},
{
@@ -658,11 +651,8 @@
"cq_config": {}
},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN"},
- {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN"},
- {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext"},
- {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41"},
{"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41"},
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 11e0b7ac94..c5f8d34ee6 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1346,21 +1346,11 @@
"Upload-Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Skpbench"
]
},
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
- "tasks": [
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
"tasks": [
"Upload-Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
]
},
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
- "tasks": [
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats": {
"tasks": [
"Upload-Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats"
@@ -2511,21 +2501,11 @@
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": {
- "tasks": [
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
"tasks": [
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN": {
- "tasks": [
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan": {
"tasks": [
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan"
@@ -2551,31 +2531,16 @@
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": {
- "tasks": [
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN": {
"tasks": [
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
- "tasks": [
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": {
"tasks": [
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan": {
- "tasks": [
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": {
"priority": 0.085,
"tasks": [
@@ -28869,115 +28834,6 @@
"perf"
]
},
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "perf",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "perf",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~inc0.gif\\\",\\\"~inc1.gif\\\",\\\"~incInterlaced.gif\\\",\\\"~inc0.jpg\\\",\\\"~incGray.jpg\\\",\\\"~inc0.wbmp\\\",\\\"~inc1.wbmp\\\",\\\"~inc0.webp\\\",\\\"~inc1.webp\\\",\\\"~inc0.ico\\\",\\\"~inc1.ico\\\",\\\"~inc0.png\\\",\\\"~inc1.png\\\",\\\"~inc2.png\\\",\\\"~inc12.png\\\",\\\"~inc13.png\\\",\\\"~inc14.png\\\",\\\"~inc0.webp\\\",\\\"~inc1.webp\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Debug-ASAN",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "perf"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
"caches": [
{
@@ -29047,7 +28903,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29082,115 +28938,6 @@
"perf"
]
},
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "perf",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "perf",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~inc0.gif\\\",\\\"~inc1.gif\\\",\\\"~incInterlaced.gif\\\",\\\"~inc0.jpg\\\",\\\"~incGray.jpg\\\",\\\"~inc0.wbmp\\\",\\\"~inc1.wbmp\\\",\\\"~inc0.webp\\\",\\\"~inc1.webp\\\",\\\"~inc0.ico\\\",\\\"~inc1.ico\\\",\\\"~inc0.png\\\",\\\"~inc1.png\\\",\\\"~inc2.png\\\",\\\"~inc12.png\\\",\\\"~inc13.png\\\",\\\"~inc14.png\\\",\\\"~inc0.webp\\\",\\\"~inc1.webp\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Release-ASAN",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "perf"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats": {
"caches": [
{
@@ -29260,7 +29007,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29369,7 +29116,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -29479,7 +29226,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29567,7 +29314,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29636,7 +29383,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29707,7 +29454,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29778,7 +29525,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29849,7 +29596,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -29920,7 +29667,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -30015,7 +29762,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -30128,7 +29875,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -30742,7 +30489,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -30846,7 +30593,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -30945,7 +30692,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -31049,7 +30796,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -31148,7 +30895,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -31247,7 +30994,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -31346,7 +31093,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -33426,7 +33173,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -33530,7 +33277,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -52890,7 +52637,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -52999,7 +52746,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53114,7 +52861,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53150,115 +52897,6 @@
],
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "test",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_ASAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Debug-ASAN",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
"caches": [
{
@@ -53338,7 +52976,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53374,115 +53012,6 @@
],
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "test",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Debug-ASAN",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan": {
"caches": [
{
@@ -53562,7 +53091,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53667,7 +53196,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53781,7 +53310,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -53891,7 +53420,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -54001,121 +53530,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "test",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/linux_vulkan_sdk",
- "path": "linux_vulkan_sdk",
- "version": "version:5"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -54224,121 +53639,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "test",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/linux_vulkan_sdk",
- "path": "linux_vulkan_sdk",
- "version": "version:5"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -54442,7 +53743,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -54477,120 +53778,6 @@
"test"
]
},
- "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "casSpec": "test",
- "cipd_packages": [
- {
- "name": "infra/3pp/tools/cpython/linux-amd64",
- "path": "cipd_bin_packages/cpython",
- "version": "version:2@2.7.18.chromium.39"
- },
- {
- "name": "infra/3pp/tools/cpython3/linux-amd64",
- "path": "cipd_bin_packages/cpython3",
- "version": "version:2@3.8.10.chromium.19"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython-native/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:20"
- },
- {
- "name": "skia/bots/linux_vulkan_sdk",
- "path": "linux_vulkan_sdk",
- "version": "version:5"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:47"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:362"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "gpu:10de:1cb3-430.14",
- "os:Ubuntu-18.04",
- "pool:Skia"
- ],
- "environment": {
- "RECIPES_USE_PY3": "true",
- "VPYTHON_LOG_TRACE": "1"
- },
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages/cpython",
- "cipd_bin_packages/cpython/bin",
- "cipd_bin_packages/cpython3",
- "cipd_bin_packages/cpython3/bin",
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_DEFAULT_SPEC": [
- "skia/.vpython"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": {
"caches": [
{
@@ -54665,7 +53852,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -54775,7 +53962,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -54885,7 +54072,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -55000,7 +54187,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -55111,7 +54298,7 @@
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
- "gpu:10de:1cb3-430.14",
+ "gpu:10de:1cb3-510.60.02",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -55818,7 +55005,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -55922,7 +55109,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56026,7 +55213,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56130,7 +55317,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56234,7 +55421,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56338,7 +55525,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56442,7 +55629,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56551,7 +55738,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56655,7 +55842,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56759,7 +55946,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56863,7 +56050,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -56967,7 +56154,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -57071,7 +56258,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -57180,7 +56367,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -61860,7 +61047,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -61964,7 +61151,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -62068,7 +61255,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -62172,7 +61359,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -62276,7 +61463,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -62380,7 +61567,7 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:1cb3-30.0.14.7168",
+ "gpu:10de:1cb3-30.0.15.1179",
"os:Windows-10-19043",
"pool:Skia"
],
@@ -87563,7 +86750,6 @@
},
"Housekeeper-PerCommit-InfraTests_Linux": {},
"Housekeeper-PerCommit-RunGnToBp": {},
- "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {},
"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {},
"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {},
"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs": {},
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
index 8b8a2a0ab0..f73893b763 100644
--- a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
@@ -1,12 +1,23 @@
-# This file is a list of regular expressions, one per line.
-# Any test name matching an expression will be excluded from the set run by SKQP.
+# This file is a list of tests to be excluded from a given run of SkQP.
+
+# The format of the list is: <regex_match_to_tests>[,<optional_android_API_level>]
+# The optional Android API level allows the test to be run if the the device's first
+# API level is greater than or equal to the provided API level. For example ".*FOO.*,33"
+# will exclude all tests containing FOO on devices older than Android T.
+
+# Android API Conversion Chart
+# -----------|--------------|-----------
+# Version | Release Code | API Level
+# -----------|--------------|-----------
+# Android 13 | T | 33
+
+
# Empty lines and comments starting with # are ignored.
# This is parsed by tools/skqp/src/skqp.cpp
# The sheet at go/skqp-cts-tests was the basis of this file.
-# Exclude all unit tests that end with the ES3 suffix because Android does not
-# require ES3 support.
-.+ES3
+# Exclude all unit tests that contain ES3 because Android does not require ES3 support.
+.*ES3.*
SkRemoteGlyphCache_.+
ApplyGamma
@@ -29,7 +40,7 @@ ImageFilter.+
MorphologyFilterRadiusWithMirrorCTM_Gpu
# Android doesn't use promise images
-PromiseImage*
+PromiseImage.*
SkipCopyTaskTest
SkipOpsTaskTest
@@ -39,7 +50,8 @@ SrcSrcOverBatchTest
# Tests chaining/batching logic, not actual execution
TextureOpTest
-# These tests mostly stress the CPU-side math of triangulating, not the GPU drawing triangles, which hopefully we can trust to just work
+# These tests mostly stress the CPU-side math of triangulating, not the GPU drawing
+# triangles, which hopefully we can trust to just work
TriangulatingPath.+
VkDRMModifierTest
@@ -66,6 +78,13 @@ XfermodeImageFilterCroppedInput_Gpu
skbug5221_GPU
# Tests which don't pass on some Qualcomm devices without workarounds b/222736702
-DMSAA_dual_source_blend_disable
-GLBackendAllocationTest
-GrSurfaceRenderability \ No newline at end of file
+DMSAA_dual_source_blend_disable, 33
+GLBackendAllocationTest, 33
+GrSurfaceRenderability, 33
+
+# Test that fail on some existing in-market devices b/229804433
+ES2BlendWithNoTexture, 33
+GLBackendAllocationTest, 33
+GrSurfaceRenderability, 33
+SkRuntimeEffect_Blender_GPU, 33
+SkSLStructsInFunctions_GPU, 33 \ No newline at end of file
diff --git a/resources/fonts/Variable.ttf b/resources/fonts/Variable.ttf
index be5cf90130..f852390699 100644
--- a/resources/fonts/Variable.ttf
+++ b/resources/fonts/Variable.ttf
Binary files differ
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index c85fc77c13..da64ed8d2c 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -13,6 +13,7 @@
#include "include/core/SkPath.h"
#include "include/core/SkPictureRecorder.h"
#include "include/effects/SkGradientShader.h"
+#include "include/pathops/SkPathOps.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTo.h"
#include "src/core/SkFDot6.h"
@@ -49,6 +50,11 @@
#endif
#endif
+// FT_OUTLINE_OVERLAP was added in FreeType 2.10.3
+#ifndef FT_OUTLINE_OVERLAP
+# define FT_OUTLINE_OVERLAP 0x40
+#endif
+
// FT_LOAD_COLOR and the corresponding FT_Pixel_Mode::FT_PIXEL_MODE_BGRA
// were introduced in FreeType 2.5.0.
// The following may be removed once FreeType 2.5.0 is required to build.
@@ -1728,7 +1734,13 @@ bool generateFacePathCOLRv1(FT_Face face, SkGlyphID glyphID, SkPath* path) {
} // namespace
bool SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face, SkPath* path) {
- return generateGlyphPathStatic(face, path);
+ if (!generateGlyphPathStatic(face, path)) {
+ return false;
+ }
+ if (face->glyph->outline.flags & FT_OUTLINE_OVERLAP) {
+ Simplify(*path, path);
+ }
+ return true;
}
bool SkScalerContext_FreeType_Base::generateFacePath(FT_Face face,
diff --git a/tools/skqp/src/BUILD.bazel b/tools/skqp/src/BUILD.bazel
index 420e916df6..25effaa20e 100644
--- a/tools/skqp/src/BUILD.bazel
+++ b/tools/skqp/src/BUILD.bazel
@@ -37,17 +37,13 @@ generated_cc_atom(
deps = [
":skqp_hdr",
"//gm:gm_hdr",
- "//include/core:SkFontStyle_hdr",
"//include/core:SkGraphics_hdr",
"//include/core:SkStream_hdr",
"//include/core:SkSurface_hdr",
- "//include/encode:SkPngEncoder_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrDirectContext_hdr",
- "//include/private:SkImageInfoPriv_hdr",
"//src/core:SkFontMgrPriv_hdr",
"//src/core:SkOSFile_hdr",
- "//src/core:SkStreamPriv_hdr",
"//src/utils:SkOSPath_hdr",
"//tests:Test_hdr",
"//tools/fonts:TestFontMgr_hdr",
diff --git a/tools/skqp/src/skqp.cpp b/tools/skqp/src/skqp.cpp
index 2f0ec2ee59..10633802b3 100644
--- a/tools/skqp/src/skqp.cpp
+++ b/tools/skqp/src/skqp.cpp
@@ -8,17 +8,14 @@
#include "tools/skqp/src/skqp.h"
#include "gm/gm.h"
-#include "include/core/SkFontStyle.h"
+
#include "include/core/SkGraphics.h"
#include "include/core/SkStream.h"
#include "include/core/SkSurface.h"
-#include "include/encode/SkPngEncoder.h"
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/private/SkImageInfoPriv.h"
#include "src/core/SkFontMgrPriv.h"
#include "src/core/SkOSFile.h"
-#include "src/core/SkStreamPriv.h"
#include "src/utils/SkOSPath.h"
#include "tests/Test.h"
#include "tests/TestHarness.h"
@@ -31,9 +28,11 @@
#include "tools/gpu/vk/VkTestContext.h"
#endif
-#include <limits.h>
+#ifdef SK_BUILD_FOR_ANDROID
+#include <sys/system_properties.h>
+#endif
+
#include <algorithm>
-#include <cinttypes>
#include <regex>
static constexpr char kUnitTestReportPath[] = "unit_tests.txt";
@@ -64,31 +63,26 @@ class ExclusionList {
public:
ExclusionList() {}
- void initialize(sk_sp<SkData> dat) {
- fPatterns = {};
- read_lines(dat->data(), dat->size(), [this](std::string_view line) {
- if (!line.empty() && line.back() == '\n') {
- // Strip line endings.
- line.remove_suffix(1);
- }
- if (!line.empty() && line.front() != '#') {
- // Only add non-empty strings, and ignore comments.
- fPatterns.emplace_back(std::string(line));
- }
- });
- }
+ void initialize(SkQPAssetManager* assetManager, sk_sp<SkData> dat, int enforcedAndroidAPILevel);
bool isExcluded(const std::string& name) const {
- for (const auto& pat : fPatterns) {
- if (std::regex_match(name, pat)) {
- return true;
+ for (const auto& entry : fEntries) {
+ if (std::regex_match(name, entry.regexPattern)) {
+ return fEnforcedAndroidAPILevel < entry.excludeUntilAndroidAPILevel;
}
}
return false;
}
private:
- std::vector<std::regex> fPatterns;
+ int fEnforcedAndroidAPILevel;
+
+ struct ExclusionEntry {
+ std::regex regexPattern;
+ int excludeUntilAndroidAPILevel;
+ };
+
+ std::vector<ExclusionEntry> fEntries;
};
}
@@ -143,6 +137,67 @@ static std::vector<SkQP::SkSLErrorTest> get_sksl_error_tests(SkQPAssetManager* a
return skslErrorTests;
}
+void ExclusionList::initialize(SkQPAssetManager* assetManager,
+ sk_sp<SkData> dat,
+ int enforcedAndroidAPILevel) {
+ fEnforcedAndroidAPILevel = enforcedAndroidAPILevel;
+ fEntries = {};
+
+ //TODO: explore refactoring this code to collect the test lists only once in SkQP::init
+ ExclusionList noExclusions;
+ const std::vector<SkQP::UnitTest> unitTestList = get_unit_tests(noExclusions);
+ const std::vector<SkQP::SkSLErrorTest> skslTestList = get_sksl_error_tests(assetManager,
+ noExclusions);
+
+ // function to check whether or not the provided regex matches an existing test
+ auto testExists = [&unitTestList, &skslTestList](const std::regex& exclusionRegex) {
+ for (const auto& test : unitTestList) {
+ if (std::regex_match(std::string(test->fName), exclusionRegex)) {
+ return true;
+ }
+ }
+ for (const auto& test : skslTestList) {
+ if (std::regex_match(test.name, exclusionRegex)) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+ read_lines(dat->data(), dat->size(), [this, &testExists](std::string_view line) {
+ if (!line.empty() && line.back() == '\n') {
+ // Strip line endings.
+ line.remove_suffix(1);
+ }
+ // Only add non-empty strings, and ignore comments.
+ if (line.empty() || line.front() == '#') {
+ return;
+ }
+
+ std::string_view testName = line;
+ int excludeUntilAndroidAPILevel = fEnforcedAndroidAPILevel;
+
+ // Check to see if the test has a min Android API level defined
+ auto commaLocation = line.find_first_of(',');
+ if (commaLocation != std::string::npos) {
+ testName = line.substr(0, commaLocation);
+ std::string apiString(line.substr(commaLocation + 1));
+ excludeUntilAndroidAPILevel = std::stoi(apiString);
+ }
+
+ const std::string exclusionString(testName);
+ const std::regex exclusionRegex(exclusionString);
+
+ // Throw an error if there are no unit or sksl tests that match the exclusion
+ if (!testExists(exclusionRegex)) {
+ SK_ABORT("Exclusion list contains tests not found in the test registry: %s",
+ exclusionString.c_str());
+ }
+
+ fEntries.push_back({exclusionRegex, excludeUntilAndroidAPILevel});
+ });
+}
+
static std::unique_ptr<sk_gpu_test::TestContext> make_test_context(SkQP::SkiaBackend backend) {
using U = std::unique_ptr<sk_gpu_test::TestContext>;
switch (backend) {
@@ -239,11 +294,20 @@ void SkQP::init(SkQPAssetManager* assetManager, const char* reportDirectory) {
SkGraphics::Init();
gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
+ int minAndroidAPILevel = 0;
+#ifdef SK_BUILD_FOR_ANDROID
+ char firstAPIVersionStr[PROP_VALUE_MAX];
+ int strLength = __system_property_get("ro.product.first_api_level", firstAPIVersionStr);
+ // Defaults to zero since most checks care if it is greater than a specific value. So this will
+ // just default to it being less.
+ minAndroidAPILevel = (strLength == 0) ? 0 : atoi(firstAPIVersionStr);
+#endif
+
// Load the exclusion list `skqp/unittests.txt`, if it exists.
// The list is checked in at platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
ExclusionList exclusionList;
if (sk_sp<SkData> dat = assetManager->open(kUnitTestsPath)) {
- exclusionList.initialize(dat);
+ exclusionList.initialize(assetManager, dat, minAndroidAPILevel);
}
fUnitTests = get_unit_tests(exclusionList);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 17:19:29 +0000