Fix Linux RTX 3060 GPU dimension.
Now targeting compiles to RTX3060 Intel machines.
Change-Id: Ibe9b295db8207eab59173cef120ce85611170810
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/615397
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
(cherry picked from commit 69a464b9beb89810f2158f131bdacc4182f289aa)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/650678
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index e0857fe..6797858 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -58,7 +58,7 @@
ISOLATE_SDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
ISOLATE_WIN_TOOLCHAIN_NAME = "Housekeeper-PerCommit-IsolateWinToolchain"
- DEBIAN_11_OS = "Debian-11.2"
+ DEBIAN_11_OS = "Debian-11.5"
DEFAULT_OS_DEBIAN = "Debian-10.10"
DEFAULT_OS_LINUX_GCE = "Debian-10.3"
OLD_OS_LINUX_GCE = "Debian-9.8"
@@ -972,7 +972,7 @@
"IntelHD405": "8086:22b1",
"IntelIris640": "8086:5926",
"QuadroP400": "10de:1cb3-510.60.02",
- "RTX3060": "10de:2489-460.91.03",
+ "RTX3060": "10de:2489-470.141.03",
"IntelIrisXe": "8086:9a49",
"RadeonVega6": "1002:1636",
}[b.parts["cpu_or_gpu_value"]]
@@ -991,11 +991,6 @@
// The Intel Iris Xe devices are Debian 11.3.
d["os"] = "Debian-bookworm/sid"
}
- if b.parts["cpu_or_gpu_value"] == "RadeonVega6" {
- // The RadeonVega6 devices are Debian 11.5.
- d["os"] = "Debian-11.5"
- }
-
} else if b.matchOs("Mac") {
gpu, ok := map[string]string{
"AppleM1": "AppleM1",
@@ -1049,6 +1044,9 @@
// Dodge Raspberry Pis.
d["cpu"] = "x86-64"
+ // Target the RTX3060 Intel machines, as they are beefy and we have
+ // 20 of them, and they are setup to compile.
+ d["gpu"] = "10de:2489"
} else {
d["gpu"] = "none"
}
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 90f2b23..f3de42c 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -13881,7 +13881,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -13977,7 +13978,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14096,7 +14098,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14192,7 +14195,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14288,7 +14292,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14384,7 +14389,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14480,7 +14486,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14599,7 +14606,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14695,7 +14703,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -14791,7 +14800,8 @@
],
"dimensions": [
"cpu:x86-64",
- "os:Debian-11.2",
+ "gpu:10de:2489",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -33591,8 +33601,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -33693,8 +33703,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -53883,8 +53893,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -53987,8 +53997,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -54089,8 +54099,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -54191,8 +54201,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
@@ -54293,8 +54303,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
- "gpu:10de:2489-460.91.03",
- "os:Debian-11.2",
+ "gpu:10de:2489-470.141.03",
+ "os:Debian-11.5",
"pool:Skia"
],
"environment": {
