diff --git a/CMakeLists.txt b/CMakeLists.txt index f53185a428..c4a367aec7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception cmake_minimum_required(VERSION 3.20.0 FATAL_ERROR) -project(unified-runtime VERSION 0.10.14) +project(unified-runtime VERSION 0.10.15) # Check if unified runtime is built as a standalone project. if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR UR_STANDALONE_BUILD) diff --git a/source/adapters/level_zero/command_buffer.cpp b/source/adapters/level_zero/command_buffer.cpp index 61fd89d8e3..a192f4d7ac 100644 --- a/source/adapters/level_zero/command_buffer.cpp +++ b/source/adapters/level_zero/command_buffer.cpp @@ -609,10 +609,13 @@ ur_result_t createMainCommandList(ur_context_handle_t Context, */ bool canBeInOrder(ur_context_handle_t Context, const ur_exp_command_buffer_desc_t *CommandBufferDesc) { + const char *UrRet = std::getenv("UR_L0_USE_DRIVER_INORDER_LISTS"); // In-order command-lists are not available in old driver version. + bool DriverInOrderRequested = UrRet ? std::atoi(UrRet) != 0 : false; bool CompatibleDriver = Context->getPlatform()->isDriverVersionNewerOrSimilar( 1, 3, L0_DRIVER_INORDER_MIN_VERSION); - return CompatibleDriver + bool CanUseDriverInOrderLists = CompatibleDriver && DriverInOrderRequested; + return CanUseDriverInOrderLists ? (CommandBufferDesc ? CommandBufferDesc->isInOrder : false) : false; } diff --git a/source/adapters/level_zero/device.cpp b/source/adapters/level_zero/device.cpp index ed2557f925..aba3c37892 100644 --- a/source/adapters/level_zero/device.cpp +++ b/source/adapters/level_zero/device.cpp @@ -1204,10 +1204,10 @@ bool ur_device_handle_t_::useDriverInOrderLists() { static const bool UseDriverInOrderLists = [&] { const char *UrRet = std::getenv("UR_L0_USE_DRIVER_INORDER_LISTS"); - bool CompatibleDriver = this->Platform->isDriverVersionNewerOrSimilar( - 1, 3, L0_DRIVER_INORDER_MIN_VERSION); + // bool CompatibleDriver = this->Platform->isDriverVersionNewerOrSimilar( + // 1, 3, L0_DRIVER_INORDER_MIN_VERSION); if (!UrRet) - return CompatibleDriver; + return false; return std::atoi(UrRet) != 0; }();