Switch CT_BENCH_10k_SKPs bot to use QuadroP400

Bug: skia:7272
Change-Id: I634f00c57b0c999a65d22a748b83a6ff5c35fd74
Reviewed-on: https://skia-review.googlesource.com/68940
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

6 files changed, 79 insertions, 79 deletions

diff --git a/infra/bots/ct/run_ct_skps.py b/infra/bots/ct/run_ct_skps.py
index 0093634b4c..731d12e2ca 100755
--- a/infra/bots/ct/run_ct_skps.py
+++ b/infra/bots/ct/run_ct_skps.py
@@ -67,7 +67,7 @@ def main():
     if 'GPU' in args.builder:
       config = 'gl'
       cpu_or_gpu = 'GPU'
-      cpu_or_gpu_value = 'GT610'
+      cpu_or_gpu_value = 'QuadroP400'
 
     out_results_file = os.path.join(
         args.isolated_outdir, 'nanobench_%s_%s_slave%d.json' % (
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 3570fed46f..adb3c2d912 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -191,7 +191,7 @@
   "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All",
   "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer",
   "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs",
-  "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+  "Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All",
   "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
index a19253ab72..64a02ea663 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@@ -459,7 +459,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"1\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"1\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
     ],
     "infra_step": true,
@@ -539,7 +539,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"2\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"2\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
     ],
     "infra_step": true,
@@ -619,7 +619,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"3\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"3\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
     ],
     "infra_step": true,
@@ -699,7 +699,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"4\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"4\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
     ],
     "infra_step": true,
@@ -779,7 +779,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"5\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"5\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
     ],
     "infra_step": true,
@@ -845,7 +845,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
+      "ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -859,7 +859,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -869,7 +869,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-1]",
       "--tag",
@@ -888,9 +888,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -916,7 +916,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
+      "ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -930,7 +930,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -940,7 +940,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-2]",
       "--tag",
@@ -959,9 +959,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -987,7 +987,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
+      "ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1001,7 +1001,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1011,7 +1011,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-3]",
       "--tag",
@@ -1030,9 +1030,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1058,7 +1058,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
+      "ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1072,7 +1072,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1082,7 +1082,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-4]",
       "--tag",
@@ -1101,9 +1101,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1129,7 +1129,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
+      "ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1143,7 +1143,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1153,7 +1153,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-5]",
       "--tag",
@@ -1172,9 +1172,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1209,7 +1209,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1335,7 +1335,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1461,7 +1461,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1587,7 +1587,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1713,7 +1713,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
index dd938385ec..396adb453a 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@@ -459,7 +459,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"1\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"1\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
     ],
     "infra_step": true,
@@ -539,7 +539,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"2\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"2\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
     ],
     "infra_step": true,
@@ -619,7 +619,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"3\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"3\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
     ],
     "infra_step": true,
@@ -699,7 +699,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"4\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"4\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
     ],
     "infra_step": true,
@@ -779,7 +779,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"5\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n        \"--isolated\", \n        \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\", \n        \"--extra-variable\", \n        \"NUM_SLAVES\", \n        \"5\", \n        \"--extra-variable\", \n        \"CONFIGURATION\", \n        \"Release\", \n        \"--extra-variable\", \n        \"SLAVE_NUM\", \n        \"5\", \n        \"--extra-variable\", \n        \"PAGE_TYPE\", \n        \"10k\", \n        \"--extra-variable\", \n        \"BUILDER\", \n        \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n        \"--extra-variable\", \n        \"GIT_HASH\", \n        \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n        \"--extra-variable\", \n        \"TOOL_NAME\", \n        \"nanobench\", \n        \"--extra-variable\", \n        \"CHROMIUM_BUILD\", \n        \"c37e844a6f8708-eee762104c75bd\"\n    ], \n    \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n    \"version\": 1\n}",
       "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
     ],
     "infra_step": true,
@@ -845,7 +845,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
+      "ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -859,7 +859,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -869,7 +869,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-1]",
       "--tag",
@@ -888,9 +888,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -916,7 +916,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
+      "ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -930,7 +930,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -940,7 +940,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-2]",
       "--tag",
@@ -959,9 +959,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -987,7 +987,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
+      "ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1001,7 +1001,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1011,7 +1011,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-3]",
       "--tag",
@@ -1030,9 +1030,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1058,7 +1058,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
+      "ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1072,7 +1072,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1082,7 +1082,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-4]",
       "--tag",
@@ -1101,9 +1101,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1129,7 +1129,7 @@
       "--shards",
       "1",
       "--task-name",
-      "ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
+      "ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -1143,7 +1143,7 @@
       "x86-64-E3-1230_v5",
       "--dimension",
       "gpu",
-      "10de:104a",
+      "10de:1cb3-384.90",
       "--dimension",
       "os",
       "Ubuntu-14.04",
@@ -1153,7 +1153,7 @@
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+      "buildername:Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
       "--tag",
       "data:[dummy hash for ct-nanobench-5]",
       "--tag",
@@ -1172,9 +1172,9 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -1209,7 +1209,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1335,7 +1335,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1461,7 +1461,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1587,7 +1587,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -1713,7 +1713,7 @@
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py
index ab0192fbb4..af4eb0809d 100644
--- a/infra/bots/recipes/ct_skps.py
+++ b/infra/bots/recipes/ct_skps.py
@@ -202,7 +202,7 @@ def RunSteps(api):
   dimensions={'os': 'Ubuntu-14.04'}
   if 'GPU' in buildername:
     dimensions['cpu'] = 'x86-64-E3-1230_v5'
-    dimensions['gpu'] = '10de:104a'
+    dimensions['gpu'] = '10de:1cb3-384.90'
     # See crbug.com/700053
     dimensions['pool'] = 'Chrome-GPU'
   else:
@@ -308,7 +308,7 @@ def GenTests(api):
   yield(
     api.test('CT_GPU_BENCH_1k_SKPs') +
     api.properties(
-        buildername=('Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-'
+        buildername=('Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-'
                      'CT_BENCH_1k_SKPs'),
         path_config=path_config,
         swarm_out_dir='[SWARM_OUT_DIR]',
@@ -344,7 +344,7 @@ def GenTests(api):
   yield(
     api.test('CT_GPU_BENCH_10k_SKPs') +
     api.properties(
-        buildername=('Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-'
+        buildername=('Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-'
                      'CT_BENCH_10k_SKPs'),
         path_config=path_config,
         swarm_out_dir='[SWARM_OUT_DIR]',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 78fad3cddb..e546e15c13 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1161,10 +1161,10 @@
         "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs"
       ]
     },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs": {
+    "Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs"
+        "Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs"
       ]
     },
     "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
@@ -9364,7 +9364,7 @@
       "isolate": "ct_skps_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs": {
+    "Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
         "os:Debian-9.1"
@@ -9375,7 +9375,7 @@
         "../../..",
         "ct_skps",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-All-CT_BENCH_1k_SKPs",
+        "buildername=Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",