3 files changed, 13 insertions, 2 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json
index 91ef9e27b5..036f318048 100644
--- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug.json
+++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json
@@ -298,7 +298,9 @@
       "root@192.168.1.2",
       "/cache/skia/nanobench",
       "--config",
+      "8888",
       "gles",
+      "--nogpu",
       "-i",
       "/cache/skia/resources",
       "--images",
diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
index 303bcf09aa..d4240f1f76 100644
--- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
+++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json
@@ -334,7 +334,9 @@
       "root@192.168.1.2",
       "/cache/skia/nanobench",
       "--config",
+      "8888",
       "gles",
+      "--nocpu",
       "-i",
       "/cache/skia/resources",
       "--images",
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 37fe468997..d9f4c7f882 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -239,7 +239,14 @@ def perf_steps(api):
     args = [
       target,
       '--config',
+      '8888',
       'gles',
+    ]
+    if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU':
+      args.extend(['--nogpu'])
+    elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
+      args.extend(['--nocpu'])
+    args.extend([
       '-i', api.flavor.device_dirs.resource_dir,
       '--images', api.flavor.device_path_join(
           api.flavor.device_dirs.resource_dir, 'color_wheel.jpg'),
@@ -250,7 +257,7 @@ def perf_steps(api):
       '~blur_image_filter',
       '~blur_0.01',
       '~GM_animated-image-blurs',
-    ]
+    ])
 
   if api.vars.upload_perf_results:
     now = api.time.utcnow()
@@ -335,7 +342,7 @@ TEST_BUILDERS = [
   'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan',
   'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android',
   'Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release',
-  'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug',
+  'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug',
   'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release',
   'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
   'Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer',