[recipes] Re-disable SKPs on iOS and images on GPU in nanobench

These were accidentally enabled in
https://skia-review.googlesource.com/c/skia/+/274553 which changed the
order of the flags.

Change-Id: I6d9eb3d5c78baa5bc0d987fa61fe2b1ce305b138
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274856
Reviewed-by: Eric Boren <[email protected]>
Commit-Queue: Eric Boren <[email protected]>

Author: erock2112

infra/bots/gen_tasks_logic/nano_flags.go

@@ -27,16 +27,11 @@ func nanobenchFlags(bot string, parts map[string]string, doUpload bool) ([]strin
 	}
 
 	if has("GPU") {
-		args = append(args, "--images")
 		args = append(args, "--gpuStatsDump", "true")
 	}
 
 	args = append(args, "--scales", "1.0", "1.1")
 
-	if has("iOS") {
-		args = append(args, "--skps", "ignore_skps")
-	}
-
 	configs := []string{}
 	if parts["cpu_or_gpu"] == "CPU" {
 		args = append(args, "--nogpu")

infra/bots/recipes/perf.expected/Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json

@@ -163,9 +163,7 @@
       "-i",
       "[START_DIR]/skia/resources",
       "--skps",
-      "[START_DIR]/skp",
-      "--images",
-      "[START_DIR]/skimage/nanobench"
+      "[START_DIR]/skp"
     ],
     "env": {
       "CHROME_HEADLESS": "1",

infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json

@@ -197,8 +197,6 @@
       "[START_DIR]\\skia\\resources",
       "--skps",
       "[START_DIR]\\skp",
-      "--images",
-      "[START_DIR]\\skimage\\nanobench",
       "--svgs",
       "[START_DIR]\\svg",
       "--outResultsFile",

infra/bots/recipes/perf.py

@@ -69,12 +69,13 @@ def perf_steps(api):
         args.extend([k, v])
 
   # Paths to required resources.
-  args.extend([
-      '-i',       api.flavor.device_dirs.resource_dir,
-      '--skps',   api.flavor.device_dirs.skp_dir,
-      '--images', api.flavor.device_path_join(
-          api.flavor.device_dirs.images_dir, 'nanobench'),
-  ])
+  args.extend(['-i', api.flavor.device_dirs.resource_dir])
+  if 'iOS' not in b:
+    args.extend(['--skps', api.flavor.device_dirs.skp_dir]),
+  if 'GPU' not in b:
+    args.extend(['--images', api.flavor.device_path_join(
+        api.flavor.device_dirs.images_dir, 'nanobench')])
+
   if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU' and 'Android' in b:
     assert api.flavor.device_dirs.texttraces_dir
     args.extend(['--texttraces', api.flavor.device_dirs.texttraces_dir])