Reland "Fixes for Vulkan Debug layers"
This reverts commit f01813ec5fd5a9b9c6625766557e538b939855d0.
Reason for revert: enabling for Debug only
Original change's description:
> Revert "Fixes for Vulkan Debug layers"
>
> This reverts commit 45ce9c7a2b0100027217958d31736416565e48de.
>
> Reason for revert: causes bad perf results
>
> Original change's description:
> > Fixes for Vulkan Debug layers
> >
> > Followup to https://skia-review.googlesource.com/c/skia/+/187921. Fixes
> > the path to the layers for the updated SDK.
> >
> > Change-Id: I329b99be25bb23931963b711887da59a84bbf792
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262064
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
>
> TBR=egdaniel@google.com,benjaminwagner@google.com
>
> Change-Id: I00241e8d3f03d98fcbba542bc429ebf6fd338e39
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262934
> Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
> Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Change-Id: I87ec2d21ed7ebc6af2616471d3b414d4b759954a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262935
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/infra/bots/recipe_modules/flavor/default.py b/infra/bots/recipe_modules/flavor/default.py
index 25e517d..23bad98 100644
--- a/infra/bots/recipe_modules/flavor/default.py
+++ b/infra/bots/recipe_modules/flavor/default.py
@@ -139,8 +139,15 @@
env['VULKAN_SDK'] = str(slave_dir.join('linux_vulkan_sdk'))
path.append(slave_dir.join('linux_vulkan_sdk', 'bin'))
ld_library_path.append(slave_dir.join('linux_vulkan_sdk', 'lib'))
- env['VK_LAYER_PATH'] = str(slave_dir.join(
- 'linux_vulkan_sdk', 'etc', 'explicit_layer.d'))
+ # Enable layers for Debug only to avoid affecting perf results on
+ # Release.
+ # ASAN reports leaks in the Vulkan SDK when the debug layer is enabled.
+ # TSAN runs out of memory.
+ if (self.m.vars.builder_cfg.get('configuration', '') != 'Release' and
+ 'ASAN' not in extra_tokens and
+ 'TSAN' not in extra_tokens):
+ env['VK_LAYER_PATH'] = str(slave_dir.join(
+ 'linux_vulkan_sdk', 'etc', 'vulkan', 'explicit_layer.d'))
if 'OpenCL' in extra_tokens:
ld_library_path.append(slave_dir.join('opencl_ocl_icd_linux'))
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
index f204ff4..03ade80 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
@@ -210,7 +210,7 @@
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json",
- "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/explicit_layer.d",
+ "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/vulkan/explicit_layer.d",
"VULKAN_SDK": "[START_DIR]/linux_vulkan_sdk"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
index 5fad925..06873cd 100644
--- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
@@ -232,7 +232,7 @@
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json",
- "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/explicit_layer.d",
+ "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/vulkan/explicit_layer.d",
"VULKAN_SDK": "[START_DIR]/linux_vulkan_sdk"
},
"name": "symbolized nanobench"
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
index 81f65aa..74b9eec 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
@@ -480,7 +480,6 @@
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json",
- "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/explicit_layer.d",
"VULKAN_SDK": "[START_DIR]/linux_vulkan_sdk"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
index 3d1cb25..ab3b5bc 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
@@ -462,7 +462,7 @@
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json",
- "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/explicit_layer.d",
+ "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/vulkan/explicit_layer.d",
"VULKAN_SDK": "[START_DIR]/linux_vulkan_sdk"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan.json
index ff16ea4..85bb068 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan.json
@@ -406,7 +406,7 @@
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
- "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/explicit_layer.d",
+ "VK_LAYER_PATH": "[START_DIR]/linux_vulkan_sdk/etc/vulkan/explicit_layer.d",
"VULKAN_SDK": "[START_DIR]/linux_vulkan_sdk"
},
"name": "symbolized dm"
