diff options
author | Ben Wagner <benjaminwagner@google.com> | 2017-09-28 21:20:25 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-29 13:54:04 +0000 |
commit | 135db05fa114f0fc545c53f3047990c027cec9f6 (patch) | |
tree | 7684a98a47f229f7e043b43f6d147cd538e1e079 | |
parent | 37bbfe3ea4745170df3f5ef2f4c1e1332af49cea (diff) |
Remove duplicate config for MacMini.
No-Try: true
Change-Id: I449c0fd435b233e9c9538c17295ef18348380658
Reviewed-on: https://skia-review.googlesource.com/53120
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
-rw-r--r-- | infra/bots/README.recipes.md | 4 | ||||
-rw-r--r-- | infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release.json | 236 | ||||
-rw-r--r-- | infra/bots/recipes/perf.py | 5 |
3 files changed, 242 insertions, 3 deletions
diff --git a/infra/bots/README.recipes.md b/infra/bots/README.recipes.md index e83926e3af..52f45872ab 100644 --- a/infra/bots/README.recipes.md +++ b/infra/bots/README.recipes.md @@ -755,11 +755,11 @@ Return a list of targets to build, depending on the builder type. [DEPS](/infra/bots/recipes/perf.py#12): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [core](#recipe_modules-core), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -— **def [RunSteps](/infra/bots/recipes/perf.py#356)(api):** +— **def [RunSteps](/infra/bots/recipes/perf.py#358)(api):** — **def [nanobench\_flags](/infra/bots/recipes/perf.py#29)(api, bot):** -— **def [perf\_steps](/infra/bots/recipes/perf.py#242)(api):** +— **def [perf\_steps](/infra/bots/recipes/perf.py#244)(api):** Run Skia benchmarks. ### *recipes* / [recreate\_skps](/infra/bots/recipes/recreate_skps.py) diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release.json new file mode 100644 index 0000000000..cf3034a475 --- /dev/null +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release.json @@ -0,0 +1,236 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SKP_VERSION" + ], + "infra_step": true, + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded skimage VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SK_IMAGE_VERSION" + ], + "infra_step": true, + "name": "write SK_IMAGE_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded SVG VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SVG_VERSION" + ], + "infra_step": true, + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release/data" + ], + "infra_step": true, + "name": "rmtree data" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release/data" + ], + "infra_step": true, + "name": "makedirs data" + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[START_DIR]/out/Release/nanobench", + "-i", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/nanobench", + "--svgs", + "[START_DIR]/svg", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--nocpu", + "--config", + "gl", + "glsrgb", + "glinst", + "--match", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", + "--outResultsFile", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release/data/nanobench_abc123_1337000001.json", + "--properties", + "gitHash", + "abc123", + "swarming_bot_id", + "skia-bot-123", + "swarming_task_id", + "123456", + "--key", + "arch", + "x86_64", + "compiler", + "Clang", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "IntelIris5100", + "model", + "MacMini7.1", + "os", + "Mac" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "nanobench" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release/data" + ], + "infra_step": true, + "name": "makedirs perf_dir" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index d11b3c2c33..cc65d9ca6d 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -106,7 +106,9 @@ def nanobench_flags(api, bot): # Bench instanced rendering on a limited number of platforms inst_config = gl_prefix + 'inst' if 'PixelC' in bot or 'NVIDIA_Shield' in bot or 'MacMini7.1' in bot: - configs.extend([inst_config, inst_config + sample_count]) + configs.append(inst_config) + if sample_count: + configs.append(inst_config + sample_count) if 'CommandBuffer' in bot: configs = ['commandbuffer'] @@ -385,6 +387,7 @@ TEST_BUILDERS = [ 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-UBSAN_float_cast_overflow', 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release', 'Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release', + 'Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release', 'Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer', 'Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan', 'Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release', |