Skip to content

Commit 685c6a9

Browse files
committed
[SYCL][UR] Fully remove enabling the validation layer thru the SYCL init
Signed-off-by: Neil R. Spruit <[email protected]>
1 parent 6d80b5f commit 685c6a9

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
117117
endfunction()
118118

119119
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
120-
# commit 76361a88a0af6502fe655144655b381260ea9706
121-
# Merge: b4195cb 0db57da
120+
# commit b766009add8dc41ad03e2a63be9f6ed40eea4c55 (HEAD, origin/main, origin/HEAD)
121+
# Merge: 608e9184 c3c57284
122122
# Author: Omar Ahmed <[email protected]>
123-
# Date: Wed, 31 Jul 2024 14:26:38 +0100
124-
# Merge pull request #1961 from DBDuncan/duncan/num-channels-mipmap-fix
125-
# [Bindless][Exp] Fix urBindlessImagesImageGetInfoExp failing with mipmap images
126-
set(UNIFIED_RUNTIME_TAG 76361a88a0af6502fe655144655b381260ea9706)
123+
# Date: Tue Aug 27 16:30:04 2024 +0100
124+
# Merge pull request #2011 from nrspruit/fix_opencl_usm_align_check
125+
# [OpenCL] Fix USM alignment error check to occur always and return nulllptr
126+
set(UNIFIED_RUNTIME_TAG b766009add8dc41ad03e2a63be9f6ed40eea4c55)
127127

128128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
129129
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need

sycl/source/detail/ur.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,9 @@ static void initializePlugins(std::vector<PluginPtr> &Plugins,
109109
__SYCL_CHECK_OCL_CODE_NO_EXC(Call)
110110

111111
bool OwnLoaderConfig = false;
112-
// If we weren't provided with a custom config handle create our own and
113-
// enable full validation by default.
112+
// If we weren't provided with a custom config handle create our own.
114113
if(!LoaderConfig) {
115114
CHECK_UR_SUCCESS(urLoaderConfigCreate(&LoaderConfig))
116-
if (std::getenv("UR_LOG_VALIDATION")) {
117-
CHECK_UR_SUCCESS(urLoaderConfigEnableLayer(
118-
LoaderConfig, "UR_LAYER_PARAMETER_VALIDATION"))
119-
}
120115
OwnLoaderConfig = true;
121116
}
122117

sycl/test-e2e/format.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ def get_extra_env(sycl_devices):
201201
if "level_zero:gpu" in sycl_devices and litConfig.params.get("ur_l0_debug"):
202202
extra_env.append("UR_L0_DEBUG={}".format(test.config.ur_l0_debug))
203203

204-
extra_env.append('UR_LOG_VALIDATION="level:info;output:stdout;flush:info"')
205-
206204
if "level_zero:gpu" in sycl_devices and litConfig.params.get(
207205
"ur_l0_leaks_debug"
208206
):

0 commit comments

Comments
 (0)