diff options
| author |  egdaniel <egdaniel@google.com> | 2016-07-27 08:03:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-27 08:03:57 -0700 |
| commit | 735109c24892a95290974c9665527b57b01e5440 (patch) | |
| tree | 9af8307d3bf071ca638d0624365701ab661b184a /infra | |
| parent | c043324e56a24bbb46aedbfa56fb04c54f52c850 (diff) | |
Add gyp define to enable vulkan debug layers
On Debug vulkan bots, running with the debug layers on seems to be adding
more than an hour to the total running time. Since we suppress any output
on the bots anyways the debug layers are serving no purpose. Thus I am
adding a gyp define to disable the layers on the bot.
With this change, by default when running vulkan in Debug, the debug_layers
will be enabled. The bots should disable the layers. Android framework
should also have them disabled by default.
TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2185953003
Review-Url: https://codereview.chromium.org/2185953003
Diffstat (limited to 'infra')
4 files changed, 9 insertions, 8 deletions
diff --git a/infra/bots/recipe_modules/skia/fake_specs.py b/infra/bots/recipe_modules/skia/fake_specs.py index 6390ba23ac..776ce40d91 100644 --- a/infra/bots/recipe_modules/skia/fake_specs.py +++ b/infra/bots/recipe_modules/skia/fake_specs.py @@ -583,9 +583,9 @@ FAKE_SPECS = { 'do_test_steps': False, 'env': { 'GYP_DEFINES': - ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warn' - 'ings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg' - '=0'), + ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulk' + 'an_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_pa' + 'th=c:/DbgHelp skia_win_ltcg=0'), }, 'nanobench_flags': [ '--dummy-flags', @@ -936,7 +936,8 @@ FAKE_SPECS = { 'do_test_steps': True, 'env': { 'GYP_DEFINES': - 'skia_arch_type=arm64 skia_vulkan=1 skia_warnings_as_errors=0', + ('skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 ski' + 'a_warnings_as_errors=0'), }, 'nanobench_flags': [ '--dummy-flags', diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index fd18b404c3..fd1ee8412f 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -101,7 +101,7 @@ "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", @@ -135,7 +135,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "CHROME_PATH": "[SLAVE_BUILD]\\src", - "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0", + "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan", "VK_SDK_PATH": "[SLAVE_BUILD]\\vulkan_1.0.17.0" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 45c82e5d12..15216ae258 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -246,7 +246,7 @@ "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json index 2ea683f61d..3aadb901a4 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json @@ -251,7 +251,7 @@ "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_vulkan=1 skia_warnings_as_errors=0\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=0\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |