From 01e47e305f4341526d12a2a2f208316c2cbcd6aa Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Mon, 23 Sep 2024 18:00:41 -0700 Subject: [PATCH 1/2] [UR][L0]Refcnt Parent Buffer on Sub Buffer Create and die on use of buffer after free - pre-commit PR for https://github.com/oneapi-src/unified-runtime/pull/2121 Signed-off-by: Neil R. Spruit --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 75d0d84317f90..8e19721e23316 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,14 @@ 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/nrspruit/unified-runtime.git") # commit 7aba70bc5c6bf82a6e5f7cdd3623eb8f46fcff40 # Merge: 1f13d2ce cf5994a1 # Author: Piotr Balcer # Date: Thu Oct 3 10:47:01 2024 +0200 # Merge pull request #2101 from lslusarczyk/fix-interleaved-urtraces # Fix mixed output of adapter and regular traces - set(UNIFIED_RUNTIME_TAG 7aba70bc5c6bf82a6e5f7cdd3623eb8f46fcff40) + set(UNIFIED_RUNTIME_TAG ae7f58e37baa17f8d38bc2a491a6ef07a243e3e6) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need From d857a938bd6e1d531dcae70ca1528c682435470a Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Fri, 4 Oct 2024 11:38:37 +0100 Subject: [PATCH 2/2] Update UR tag. --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 8e19721e23316..b32c7db699479 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,14 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/nrspruit/unified-runtime.git") - # commit 7aba70bc5c6bf82a6e5f7cdd3623eb8f46fcff40 - # Merge: 1f13d2ce cf5994a1 - # Author: Piotr Balcer - # Date: Thu Oct 3 10:47:01 2024 +0200 - # Merge pull request #2101 from lslusarczyk/fix-interleaved-urtraces - # Fix mixed output of adapter and regular traces - set(UNIFIED_RUNTIME_TAG ae7f58e37baa17f8d38bc2a491a6ef07a243e3e6) + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + # commit 7907998a442b381a6669d2ae5ab957f8ddda5d03 + # Merge: 7e9d9d47 ae7f58e3 + # Author: aarongreig + # Date: Fri Oct 4 11:35:10 2024 +0100 + # Merge pull request #2121 from nrspruit/error_after_free_syclos + # [L0] Refcnt Parent Buffer on Sub Buffer Create and die on use of buffer after free + set(UNIFIED_RUNTIME_TAG 7907998a442b381a6669d2ae5ab957f8ddda5d03) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need