diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 9a18382ea52d2..72fb678608237 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -110,13 +110,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(opencl ${UNIFIED_RUNTIME_REPO} - # commit 85b7559033e329389452cb87615ad42fbb644d59 (HEAD -> main, origin/main, origin/HEAD) - # Merge: a7c202b4 5c300799 + # commit 0d2a972c71ba4dd5935478c7b7124a372a1eeca0 + # Merge: ac89abfe 44aef877 # Author: Kenneth Benzie (Benie) - # Date: Tue Apr 9 14:06:49 2024 +0100 - # Merge pull request #1496 from steffenlarsen/steffen/revert_memory_lookup_error - # [OpenCL] Revert urMemBufferCreate extension function lookup error - 85b7559033e329389452cb87615ad42fbb644d59 + # Date: Thu Apr 11 10:24:19 2024 +0100 + # Merge pull request #1440 from fabiomestre/fabio/opencl_remove_queued_hack + # [OPENCL] Remove EVENT_STATUS_QUEUED workaround + 0d2a972c71ba4dd5935478c7b7124a372a1eeca0 ) fetch_adapter_source(cuda diff --git a/sycl/source/detail/event_info.hpp b/sycl/source/detail/event_info.hpp index 05aaed8a36adb..9c60a226e4798 100644 --- a/sycl/source/detail/event_info.hpp +++ b/sycl/source/detail/event_info.hpp @@ -40,6 +40,16 @@ typename Param::return_type get_event_info(sycl::detail::pi::PiEvent Event, // TODO catch an exception and put it to list of asynchronous exceptions Plugin->call(Event, PiInfoCode::value, sizeof(Result), &Result, nullptr); + + // If the status is PI_EVENT_QUEUED We need to change it since QUEUE is + // not a valid status in sycl. + if constexpr (std::is_same::value) { + Result = static_cast(Result) == PI_EVENT_QUEUED + ? sycl::info::event_command_status::submitted + : Result; + } + return Result; }