From c274ec4d7e7e6a99b528138ec59aeecf7b5b6efc Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 3 Aug 2017 22:29:22 -0400 Subject: [PATCH] Add Linux QuadroP400 bots. Bug: skia:6882 Change-Id: I9514af6aa710f1722be277a529acd1d88ed32bc9 No-Try: true Reviewed-on: https://skia-review.googlesource.com/26364 Reviewed-by: Eric Boren Commit-Queue: Ben Wagner --- infra/bots/gen_tasks.go | 1 + infra/bots/jobs.json | 4 + infra/bots/tasks.json | 293 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 298 insertions(+) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 41a1f1f061..cb23604157 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -294,6 +294,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { "IntelHD2000": "8086:0102", "IntelHD405": "8086:22b1", "IntelIris540": "8086:1926", + "QuadroP400": "10de:1cb3-384.59", }[parts["cpu_or_gpu_value"]] if !ok { glog.Fatalf("Entry %q not found in Ubuntu GPU mapping.", parts["cpu_or_gpu_value"]) diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index aa320bdef4..0758549e8e 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -173,6 +173,8 @@ "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release", "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN", "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN", + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug", + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug", "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE", "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan", @@ -329,6 +331,8 @@ "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN", "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN", "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN", + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug", + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", "Test-Ubuntu17-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext", "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug", "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 771355fd23..ccc36b53a1 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -1053,6 +1053,18 @@ "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN" ] }, + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": { + "priority": 0.8, + "tasks": [ + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug" + ] + }, + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "priority": 0.8, + "tasks": [ + "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release" + ] + }, "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -1990,6 +2002,18 @@ "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN" ] }, + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug" + ] + }, + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release" + ] + }, "Test-Ubuntu17-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": { "priority": 0.8, "tasks": [ @@ -8321,6 +8345,100 @@ "max_attempts": 1, "priority": 0.8 }, + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:26" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:78" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:5" + } + ], + "dependencies": [ + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:10de:1cb3-384.59", + "os:Ubuntu-17.04", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:26" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:78" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:5" + } + ], + "dependencies": [ + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:10de:1cb3-384.59", + "os:Ubuntu-17.04", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": { "cipd_packages": [ { @@ -15009,6 +15127,100 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:26" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:78" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:5" + } + ], + "dependencies": [ + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:10de:1cb3-384.59", + "os:Ubuntu-17.04", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:26" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:78" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:5" + } + ], + "dependencies": [ + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:10de:1cb3-384.59", + "os:Ubuntu-17.04", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", + "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-Ubuntu17-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": { "cipd_packages": [ { @@ -19415,6 +19627,33 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, + "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "dependencies": [ + "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Debian-9.1", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_nano_results", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": { "dependencies": [ "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release" @@ -22331,6 +22570,60 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": { + "dependencies": [ + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Debian-9.1", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": { + "dependencies": [ + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Debian-9.1", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release", + "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-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": { "dependencies": [ "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug"