From 240516f772ea27e62f477ba510aabeb84b6f68d5 Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Thu, 15 Feb 2018 09:55:24 -0500 Subject: Add NativeFonts support to some GPU bots Bug: skia:7562 Change-Id: I56e0991999644c02890008123b25f141aed0b70e Reviewed-on: https://skia-review.googlesource.com/107520 Commit-Queue: Jim Van Verth Reviewed-by: Ben Wagner --- infra/bots/jobs.json | 3 + infra/bots/recipes/test.py | 7 +- infra/bots/tasks.json | 231 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 238 insertions(+), 3 deletions(-) (limited to 'infra/bots') diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 9d8f769cf4..b51974450a 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -347,6 +347,7 @@ "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan", + "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads", @@ -409,6 +410,7 @@ "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", @@ -477,6 +479,7 @@ "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 6f6b08ac99..ad337853e5 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -135,9 +135,10 @@ def dm_flags(api, bot): elif 'ChromeOS' in bot: gl_prefix = 'gles' - configs.extend([gl_prefix, gl_prefix + 'dft', gl_prefix + 'srgb']) - if sample_count is not '': - configs.append(gl_prefix + 'msaa' + sample_count) + if 'NativeFonts' not in bot: + configs.extend([gl_prefix, gl_prefix + 'dft', gl_prefix + 'srgb']) + if sample_count is not '': + configs.append(gl_prefix + 'msaa' + sample_count) # The NP produces a long error stream when we run with MSAA. The Tegra3 just # doesn't support it. diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 249e9f387a..70c57edcbc 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -2100,6 +2100,12 @@ "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan" ] }, + "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts" + ] + }, "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { "priority": 0.8, "tasks": [ @@ -2473,6 +2479,12 @@ "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" ] }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts" + ] + }, "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "priority": 0.8, "tasks": [ @@ -2878,6 +2890,12 @@ "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE" ] }, + "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts" + ] + }, "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "priority": 0.8, "tasks": [ @@ -16317,6 +16335,42 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { + "dependencies": [ + "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", + "Housekeeper-PerCommit-IsolateSKP", + "Housekeeper-PerCommit-IsolateSVG", + "Housekeeper-PerCommit-IsolateSkImage" + ], + "dimensions": [ + "device_os:OPR6.170623.023", + "device_type:bullhead", + "os:Android", + "pool:Skia", + "python:2.7.12" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { "dependencies": [ "Build-Debian9-Clang-arm64-Release-Android", @@ -19353,6 +19407,54 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "cipd_packages": [ { @@ -22624,6 +22726,54 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:1926-21.20.16.4590", + "os:Windows-10-15063", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_win.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "cipd_packages": [ { @@ -29321,6 +29471,33 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { + "dependencies": [ + "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { "dependencies": [ "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads" @@ -30906,6 +31083,33 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { + "dependencies": [ + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "dependencies": [ "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All" @@ -32380,6 +32584,33 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { + "dependencies": [ + "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "dependencies": [ "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan" -- cgit v1.2.3