Upgrade the Radeon GPU drivers.

This affects RadeonR9M470X and RadeonHD7770.

Bug: skia:7677
No-Try: true
Change-Id: Ic961e73b72ad9625a5cff9e08617281b1f4b2530
Reviewed-on: https://skia-review.googlesource.com/109460
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

4 files changed, 267 insertions, 26 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 5bad1a8a67..6041f9441d 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -299,8 +299,8 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 					"IntelHD4400":   "8086:0a16-20.19.15.4835",
 					"IntelIris540":  "8086:1926-21.20.16.4590",
 					"IntelIris6100": "8086:162b-20.19.15.4835",
-					"RadeonHD7770":  "1002:683d-22.19.165.512",
-					"RadeonR9M470X": "1002:6646-22.19.165.512",
+					"RadeonHD7770":  "1002:683d-23.20.15017.4003",
+					"RadeonR9M470X": "1002:6646-23.20.15017.4003",
 					"QuadroP400":    "10de:1cb3-22.21.13.8205",
 				}[parts["cpu_or_gpu_value"]]
 				if !ok {
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
new file mode 100644
index 0000000000..f750acd2c0
--- /dev/null
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
@@ -0,0 +1,237 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "name": "Get downloaded SKP VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "42",
+      "[START_DIR]\\tmp\\SKP_VERSION"
+    ],
+    "infra_step": true,
+    "name": "write SKP_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "name": "Get downloaded skimage VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "42",
+      "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
+    ],
+    "infra_step": true,
+    "name": "write SK_IMAGE_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "name": "Get downloaded SVG VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "42",
+      "[START_DIR]\\tmp\\SVG_VERSION"
+    ],
+    "infra_step": true,
+    "name": "write SVG_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data"
+    ],
+    "infra_step": true,
+    "name": "rmtree data"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data"
+    ],
+    "infra_step": true,
+    "name": "makedirs data"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
+    ],
+    "name": "get swarming bot id",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
+    ],
+    "name": "get swarming task id",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]\\out\\Release_x64\\nanobench",
+      "-i",
+      "[START_DIR]\\skia\\resources",
+      "--skps",
+      "[START_DIR]\\skp",
+      "--images",
+      "[START_DIR]\\skimage\\nanobench",
+      "--svgs",
+      "[START_DIR]\\svg",
+      "--pre_log",
+      "--images",
+      "--gpuStatsDump",
+      "true",
+      "--scales",
+      "1.0",
+      "1.1",
+      "--nocpu",
+      "--config",
+      "vk",
+      "--match",
+      "~path_text_clipped_uncached",
+      "~inc0.gif",
+      "~inc1.gif",
+      "~incInterlaced.gif",
+      "~inc0.jpg",
+      "~incGray.jpg",
+      "~inc0.wbmp",
+      "~inc1.wbmp",
+      "~inc0.webp",
+      "~inc1.webp",
+      "~inc0.ico",
+      "~inc1.ico",
+      "~inc0.png",
+      "~inc1.png",
+      "~inc2.png",
+      "~inc12.png",
+      "~inc13.png",
+      "~inc14.png",
+      "~inc0.webp",
+      "~inc1.webp",
+      "--outResultsFile",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json",
+      "--properties",
+      "gitHash",
+      "abc123",
+      "swarming_bot_id",
+      "skia-bot-123",
+      "swarming_task_id",
+      "123456",
+      "--key",
+      "arch",
+      "x86_64",
+      "compiler",
+      "Clang",
+      "cpu_or_gpu",
+      "GPU",
+      "cpu_or_gpu_value",
+      "RadeonR9M470X",
+      "extra_config",
+      "Vulkan",
+      "model",
+      "AlphaR2",
+      "os",
+      "Win10"
+    ],
+    "env": {
+      "BUILDTYPE": "Release_x64",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]\\out"
+    },
+    "name": "nanobench"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
+    ],
+    "infra_step": true,
+    "name": "makedirs perf_dir"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]
\ No newline at end of file
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index e78de8f05e..1be41e6e63 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -171,6 +171,9 @@ def nanobench_flags(api, bot):
     match.append('~desk_skbug6850overlay2')
     match.append('~desk_googlespreadsheet')
     match.append('~desk_carsvg')
+  if 'Vulkan' in bot and 'RadeonR9M470X' in bot and 'Win' in bot:
+    # skia:7677
+    match.append('~path_text_clipped_uncached')
   if ('Intel' in bot and api.vars.is_linux and not 'Vulkan' in bot):
     # TODO(dogben): Track down what's causing bots to die.
     verbose = True
@@ -354,6 +357,7 @@ TEST_BUILDERS = [
   ('Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-'
    'Valgrind_SK_CPU_LIMIT_SSE41'),
   'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE',
+  'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan',
   'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE',
   'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan',
   'Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 70cd83f963..55be85ac12 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -11245,7 +11245,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -11292,7 +11292,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -11339,7 +11339,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -11386,7 +11386,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -11433,7 +11433,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -11480,7 +11480,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -12984,7 +12984,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -13031,7 +13031,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -13078,7 +13078,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -13125,7 +13125,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -13172,7 +13172,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -13219,7 +13219,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21441,7 +21441,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21489,7 +21489,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21537,7 +21537,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21585,7 +21585,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21633,7 +21633,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -21681,7 +21681,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:1002:6646-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23361,7 +23361,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23409,7 +23409,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23457,7 +23457,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23505,7 +23505,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23553,7 +23553,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],
@@ -23601,7 +23601,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:1002:683d-23.20.15017.4003",
         "os:Windows-10-16299.248",
         "pool:Skia"
       ],