diff options
Diffstat (limited to 'infra/bots/recipes')
-rw-r--r-- | infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json (renamed from infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json) | 90 | ||||
-rw-r--r-- | infra/bots/recipes/perf.py | 5 |
2 files changed, 91 insertions, 4 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json index 107c7f8534..f5ab534f16 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json @@ -69,6 +69,43 @@ "cmd": [ "python", "-u", + "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "rmtree", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data" + ], + "env": { + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + }, + "infra_step": true, + "name": "rmtree data" + }, + { + "cmd": [ + "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-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data", + "511" + ], + "infra_step": true, + "name": "makedirs data", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" ], "name": "get swarming bot id", @@ -95,7 +132,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", "[START_DIR]\\skia\\resources", @@ -118,6 +155,7 @@ "angle_d3d11_es2_msaa8", "--match", "~native_image_to_raster_surface", + "~shapes_mixed_10000_32x33", "~inc0.gif", "~inc1.gif", "~incInterlaced.gif", @@ -136,10 +174,34 @@ "~inc13.png", "~inc14.png", "~inc0.webp", - "~inc1.webp" + "~inc1.webp", + "--outResultsFile", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data\\nanobench_abc123_1337000001.json", + "--properties", + "gitHash", + "abc123", + "swarming_bot_id", + "", + "swarming_task_id", + "", + "--key", + "arch", + "x86_64", + "compiler", + "MSVC", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "GTX960", + "extra_config", + "ANGLE", + "model", + "ShuttleC", + "os", + "Win10" ], "env": { - "BUILDTYPE": "Debug_x64", + "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]\\out" @@ -147,6 +209,28 @@ "name": "nanobench" }, { + "cmd": [ + "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-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data", + "511" + ], + "name": "makedirs perf_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 850ac09756..a85f75aa4e 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -155,6 +155,9 @@ def nanobench_flags(bot): match.append('~shapes_mixed_10000_32x33') match.append('~shapes_rrect_10000_32x32') match.append('~shapes_oval_10000_32x33') + if 'ANGLE' in bot and 'GTX960' in bot and 'Release' in bot: + # skia:6534 + match.append('~shapes_mixed_10000_32x33') # We do not need or want to benchmark the decodes of incomplete images. # In fact, in nanobench we assert that the full image decode succeeds. @@ -336,7 +339,7 @@ TEST_BUILDERS = [ 'Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE', 'Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE', 'Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan', - 'Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE', + 'Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE', 'Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug', 'Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release', 'Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release' |