Index: scripts/slave/recipes/skia/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json |
diff --git a/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json b/scripts/slave/recipes/skia/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json |
similarity index 96% |
copy from scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json |
copy to scripts/slave/recipes/skia/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json |
index 146f1faf4d04156c4e02724468b0c6297491fa88..f5719812958390b552fac59ef6c28ead797a5486 100644 |
--- a/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json |
+++ b/scripts/slave/recipes/skia/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json |
@@ -383,7 +383,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" |
], |
"name": "Write ct-nanobench-1.isolated.gen.json" |
@@ -454,7 +454,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" |
], |
"name": "Write ct-nanobench-2.isolated.gen.json" |
@@ -525,7 +525,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" |
], |
"name": "Write ct-nanobench-3.isolated.gen.json" |
@@ -596,7 +596,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" |
], |
"name": "Write ct-nanobench-4.isolated.gen.json" |
@@ -667,7 +667,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" |
], |
"name": "Write ct-nanobench-5.isolated.gen.json" |
@@ -731,9 +731,6 @@ |
"cpu", |
"x86-64", |
"--dimension", |
- "gpu", |
- "10de:104a", |
- "--dimension", |
"os", |
"Ubuntu-14.04", |
"--dimension", |
@@ -795,9 +792,6 @@ |
"cpu", |
"x86-64", |
"--dimension", |
- "gpu", |
- "10de:104a", |
- "--dimension", |
"os", |
"Ubuntu-14.04", |
"--dimension", |
@@ -859,9 +853,6 @@ |
"cpu", |
"x86-64", |
"--dimension", |
- "gpu", |
- "10de:104a", |
- "--dimension", |
"os", |
"Ubuntu-14.04", |
"--dimension", |
@@ -923,9 +914,6 @@ |
"cpu", |
"x86-64", |
"--dimension", |
- "gpu", |
- "10de:104a", |
- "--dimension", |
"os", |
"Ubuntu-14.04", |
"--dimension", |
@@ -987,9 +975,6 @@ |
"cpu", |
"x86-64", |
"--dimension", |
- "gpu", |
- "10de:104a", |
- "--dimension", |
"os", |
"Ubuntu-14.04", |
"--dimension", |