[skqp/dev] 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
Bug: chromium:919950
Change-Id: I8c07645cd6d662bb93475a280df4f86217cc942a
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/+/224538
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 cc1a209..cabd38e 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -585,15 +585,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 newer GPU driver.
- gpu = "10de:1cb3-415.27"
- }
d["gpu"] = gpu
} else if strings.Contains(parts["os"], "Mac") {
gpu, ok := map[string]string{
@@ -1026,16 +1022,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.
@@ -1198,16 +1184,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 f4e59da..d8a6df2 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -20559,10 +20559,9 @@
"Housekeeper-PerCommit-IsolateSVG"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
- "pool:Skia",
- "rack:2"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -35053,10 +35052,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": [
@@ -35170,10 +35168,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": [
@@ -35287,10 +35284,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": [
@@ -35399,10 +35395,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": [
@@ -35516,10 +35511,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": [
@@ -35633,10 +35627,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": [
@@ -35750,11 +35743,10 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia",
- "valgrind:1",
- "rack:2"
+ "valgrind:1"
],
"env_prefixes": {
"PATH": [
@@ -37030,8 +37022,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37147,8 +37138,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37264,8 +37254,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37381,8 +37370,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37498,8 +37486,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37615,8 +37602,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37718,8 +37704,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37821,8 +37806,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -37924,8 +37908,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -42449,8 +42432,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -42566,8 +42548,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -42683,8 +42664,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -42800,8 +42780,7 @@
"dimensions": [
"gpu:10de:1cb3-25.21.14.1678",
"os:Windows-10-16299.309",
- "pool:Skia",
- "rack:1"
+ "pool:Skia"
],
"env_prefixes": {
"PATH": [
@@ -63877,7 +63856,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -63993,7 +63972,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"
],
@@ -64104,7 +64083,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -64220,7 +64199,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"
],
@@ -64331,7 +64310,7 @@
"Build-Debian9-Clang-x86_64-Debug"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -64447,7 +64426,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"
],
@@ -64563,7 +64542,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"
],
@@ -64679,7 +64658,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"
],
@@ -64790,7 +64769,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -64906,7 +64885,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"
],
@@ -65022,7 +65001,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"
],
@@ -65138,7 +65117,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"
],
@@ -65259,7 +65238,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"
],
@@ -65370,7 +65349,7 @@
"Build-Debian9-Clang-x86_64-Release"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia"
],
@@ -65486,7 +65465,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"
],
@@ -65602,7 +65581,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -65719,7 +65698,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
@@ -65836,7 +65815,7 @@
"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41"
],
"dimensions": [
- "gpu:10de:1cb3-415.27",
+ "gpu:10de:1cb3-430.14",
"os:Ubuntu-18.04",
"pool:Skia",
"valgrind:1"
