From 7ac737a696ca23cd7c0077675e5eb7bee634784e Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Fri, 27 Sep 2024 11:55:07 +0100 Subject: [PATCH 1/5] [SYCL][Bindless][E2E] fix double free in vulkan interop unsampled test --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- .../bindless_images/vulkan_interop/unsampled_images.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..c75c6668a8b21 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,7 +117,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) + set(UNIFIED_RUNTIME_TAG 698cd9974c18874bf6a7e9ec78507c30b9deeca7) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp index 043fba15297ae..6be1bda552c33 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -147,7 +147,7 @@ void cleanup_test(sycl::context &ctxt, sycl::device &dev, handles_t handles) { syclexp::destroy_image_handle(handles.output, dev, ctxt); syclexp::free_image_mem(handles.input_mem_handle_1, syclexp::image_type::standard, dev, ctxt); - syclexp::free_image_mem(handles.input_mem_handle_1, + syclexp::free_image_mem(handles.input_mem_handle_2, syclexp::image_type::standard, dev, ctxt); syclexp::free_image_mem(handles.output_mem_handle, syclexp::image_type::standard, dev, ctxt); From fff8e33cea2afc6460611130392a88dfa5fe1b15 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Wed, 13 Nov 2024 15:01:46 +0000 Subject: [PATCH 2/5] fix tag update --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index c75c6668a8b21..72841724fa01d 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,7 +117,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - set(UNIFIED_RUNTIME_TAG 698cd9974c18874bf6a7e9ec78507c30b9deeca7) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need From f989c3f9672101fb4790cfe7a7de1b229965aeb9 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Wed, 13 Nov 2024 15:04:56 +0000 Subject: [PATCH 3/5] update tag --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index d9193ceae0c15..692b8fd0af087 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Wed Nov 13 09:57:16 2024 +0000 # Merge pull request #2254 from PietroGhg/pietro/events_rr # [NATIVECPU] Implement events on Native CPU -set(UNIFIED_RUNTIME_TAG cd92e72bbc4ebddef63c63c0f7e66a410f4b9552) +set(UNIFIED_RUNTIME_TAG 698cd9974c18874bf6a7e9ec78507c30b9deeca7) From e33139ec8c531816aa822496b04bbd1e51d3f891 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Thu, 28 Nov 2024 14:04:21 +0000 Subject: [PATCH 4/5] update UR tag --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 8fff99790470a..2177075056a98 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Wed Nov 27 12:16:44 2024 +0000 # Merge pull request #2369 from Bensuo/ben/kernel-binary-update-l0 # [CMDBUF] Implement kernel binary update for L0 adapter -set(UNIFIED_RUNTIME_TAG 0a90db9b2c36960c9b28ce18557ca15760724c4d) +set(UNIFIED_RUNTIME_TAG 870f55dc52cac79af836c8c9f4bfb8fa9a648557) From 9eb28d66f8640439d45ea5928931cb45ad5258cd Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Thu, 28 Nov 2024 14:24:34 +0000 Subject: [PATCH 5/5] fix --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..de6810618569e 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/cppchedy/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")