[skqp/release] Update driver on Ubuntu18 Quadro bots
Also remove "rack" dimension. The os dimension now aligns with the rack
dimension, so we don't need to worry about it.
Cherry-picked from https://skia-review.googlesource.com/c/skia/+/215087
No-Tree-Checks: true
No-Presubmit: true
Bug: chromium:919950
Change-Id: Ia82cc3532363b33bf274db33a811691a4de82bda
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-By: Eric Boren <borenet@google.com>
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224537
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 92c2021..42a0cbe 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -584,15 +584,11 @@
"IntelHD2000": "8086:0102",
"IntelHD405": "8086:22b1",
"IntelIris640": "8086:5926",
- "QuadroP400": "10de:1cb3-384.59",
+ "QuadroP400": "10de:1cb3-430.14",
}[parts["cpu_or_gpu_value"]]
if !ok {
glog.Fatalf("Entry %q not found in Ubuntu GPU mapping.", parts["cpu_or_gpu_value"])
}
- if parts["os"] == "Ubuntu18" && parts["cpu_or_gpu_value"] == "QuadroP400" {
- // Ubuntu18 has a slightly newer GPU driver.
- gpu = "10de:1cb3-415.27"
- }
d["gpu"] = gpu
} else if strings.Contains(parts["os"], "Mac") {
gpu, ok := map[string]string{
@@ -1022,16 +1018,6 @@
task := kitchenTask(name, "calmbench", "calmbench.isolate", "", swarmDimensions(parts), nil, OUTPUT_PERF)
usesGit(task, name)
task.Dependencies = append(task.Dependencies, compileTaskName, compileParentName, ISOLATE_SKP_NAME, ISOLATE_SVG_NAME)
- if parts["cpu_or_gpu_value"] == "QuadroP400" {
- // Specify "rack" dimension for consistent test results.
- // See https://bugs.chromium.org/p/chromium/issues/detail?id=784662&desc=2#c34
- // for more context.
- if parts["os"] == "Ubuntu18" {
- task.Dimensions = append(task.Dimensions, "rack:2")
- } else {
- task.Dimensions = append(task.Dimensions, "rack:1")
- }
- }
b.MustAddTask(name, task)
// Upload results if necessary.
@@ -1186,16 +1172,6 @@
if iid != nil {
task.Command = append(task.Command, fmt.Sprintf("internal_hardware_label=%d", *iid))
}
- if parts["cpu_or_gpu_value"] == "QuadroP400" {
- // Specify "rack" dimension for consistent test results.
- // See https://bugs.chromium.org/p/chromium/issues/detail?id=784662&desc=2#c34
- // for more context.
- if parts["os"] == "Ubuntu18" {
- task.Dimensions = append(task.Dimensions, "rack:2")
- } else {
- task.Dimensions = append(task.Dimensions, "rack:1")
- }
- }
b.MustAddTask(name, task)
// Upload results if necessary.
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 9cd2764..6005d32 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -19161,10 +19161,9 @@
"Housekeeper-PerCommit-IsolateSVG"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -32616,10 +32615,9 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -32733,10 +32731,9 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -32850,10 +32847,9 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -32962,10 +32958,9 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33079,10 +33074,9 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33196,10 +33190,9 @@
"Build-Debian9-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33313,11 +33306,10 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia",
- "valgrind:1",
- "rack:1"
+ "valgrind:1"
],
"env_prefixes": {
"PATH": [
@@ -33431,11 +33423,10 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia",
- "valgrind:1",
- "rack:1"
+ "valgrind:1"
],
"env_prefixes": {
"PATH": [
@@ -33544,10 +33535,9 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33661,10 +33651,9 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33778,10 +33767,9 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -33890,10 +33878,9 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -34007,10 +33994,9 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -34124,10 +34110,9 @@
"Build-Debian9-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35403,8 +35388,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35520,8 +35504,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35637,8 +35620,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35754,8 +35736,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35871,8 +35852,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35988,8 +35968,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -36091,8 +36070,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -36194,8 +36172,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -36297,8 +36274,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -40822,8 +40798,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -40939,8 +40914,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -41056,8 +41030,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -41173,8 +41146,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -59291,7 +59263,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59407,7 +59379,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59518,7 +59490,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59634,7 +59606,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59745,7 +59717,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59861,7 +59833,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -59982,7 +59954,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60098,7 +60070,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60214,7 +60186,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60325,7 +60297,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60441,7 +60413,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60557,7 +60529,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60678,7 +60650,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60794,7 +60766,7 @@
"Build-Debian9-Clang-x86_64-Release-TSAN"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -60915,7 +60887,7 @@
"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -61026,7 +60998,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -61142,7 +61114,7 @@
"Build-Debian9-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia"
],
@@ -61258,7 +61230,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia",
"valgrind:1"
@@ -61375,7 +61347,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia",
"valgrind:1"
@@ -61492,7 +61464,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-384.59",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-17.04",
"pool:Skia",
"valgrind:1"
@@ -61604,7 +61576,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -61720,7 +61692,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -61831,7 +61803,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -61947,7 +61919,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62058,7 +62030,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62174,7 +62146,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62295,7 +62267,7 @@
"Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62411,7 +62383,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62527,7 +62499,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62638,7 +62610,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62754,7 +62726,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62870,7 +62842,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -62991,7 +62963,7 @@
"Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -63107,7 +63079,7 @@
"Build-Debian9-Clang-x86_64-Release-TSAN"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -63228,7 +63200,7 @@
"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -63339,7 +63311,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -63455,7 +63427,7 @@
"Build-Debian9-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
