| Index: infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
|
| diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
|
| similarity index 90%
|
| copy from infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json
|
| copy to infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
|
| index e34c1c473c953dbae703227decdb02534e6dd950..99ed57f1d75c2176a66f8fb5cc9312782785fdf0 100644
|
| --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json
|
| +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
|
| @@ -64,7 +64,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data"
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data"
|
| ],
|
| "env": {
|
| "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
|
| @@ -86,7 +86,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data",
|
| "511"
|
| ],
|
| "name": "makedirs data",
|
| @@ -131,8 +131,6 @@
|
| "msaa16",
|
| "nvpr16",
|
| "nvprdit16",
|
| - "glinst",
|
| - "glinst16",
|
| "--match",
|
| "~interlaced1.png",
|
| "~interlaced2.png",
|
| @@ -157,7 +155,7 @@
|
| "~inc0.webp",
|
| "~inc1.webp",
|
| "--outResultsFile",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data/nanobench_abc123.json",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data/nanobench_abc123.json",
|
| "--properties",
|
| "gitHash",
|
| "abc123",
|
| @@ -171,19 +169,15 @@
|
| "cpu_or_gpu",
|
| "CPU",
|
| "cpu_or_gpu_value",
|
| - "AVX",
|
| + "AVX2",
|
| "extra_config",
|
| "GN",
|
| "model",
|
| - "MacMini6.2",
|
| + "GCE",
|
| "os",
|
| - "Mac"
|
| + "Ubuntu"
|
| ],
|
| - "env": {
|
| - "BUILDTYPE": "Release",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| + "cwd": "[SLAVE_BUILD]/skia",
|
| "name": "nanobench"
|
| },
|
| {
|
| @@ -191,7 +185,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data",
|
| "511"
|
| ],
|
| "name": "makedirs perf_dir",
|
|
|