From fd61e820a54b8bfe98447a1d2bca285e18b8a17e Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Wed, 26 Jun 2024 16:42:03 +0100 Subject: [PATCH 1/6] [SYCL][Bindless] Create mapping of host and device handle Updates L0 UR commit. Creates a mapping between the host and device handle in the L0 backend to be able to retrieve the host handle when destroying the image. --- sycl/plugins/unified_runtime/CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 2ac59ac873cad..085183d041c0c 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -99,7 +99,7 @@ if(SYCL_PI_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 "git@github.com:DBDuncan/unified-runtime.git") # commit 1e9b1b493fe30e6236bf611ae6d82366c9376f6c # Merge: a011f092 d8500a36 # Author: Kenneth Benzie (Benie) @@ -110,13 +110,11 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - # commit f040b1fea9313561c01ccdb81ea3ca52c1c62061 - # Merge: 08acafb6 b3f36b96 - # Author: Callum Fare - # Date: Tue Jun 25 11:19:54 2024 +0100 - # Merge pull request #1778 from nrspruit/fix_multi_driver_exp_handle - # [L0] Fix Handle used in calls to L0 Driver zex apis given multi drivers - f040b1fea9313561c01ccdb81ea3ca52c1c62061 + # commit 72c8aa173551f6b4b570baa87c3fb43decc67933 + # Author: Duncan Brawley + # Date: Mon, 10 Jun 2024 17:27:17 +0100 + # [Bindless][Exp] Create mapping of host and device handle + 72c8aa173551f6b4b570baa87c3fb43decc67933 ) fetch_adapter_source(opencl From cd5f76286ad6f90cd31163df1450e9ad8055198f Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Mon, 1 Jul 2024 14:18:17 +0100 Subject: [PATCH 2/6] Update UR commit --- sycl/plugins/unified_runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 085183d041c0c..0d132e011bc1d 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -110,11 +110,11 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - # commit 72c8aa173551f6b4b570baa87c3fb43decc67933 + # commit 51cbcea6e8ffd4ca6e2be918335be509ae6f401c # Author: Duncan Brawley # Date: Mon, 10 Jun 2024 17:27:17 +0100 # [Bindless][Exp] Create mapping of host and device handle - 72c8aa173551f6b4b570baa87c3fb43decc67933 + 51cbcea6e8ffd4ca6e2be918335be509ae6f401c ) fetch_adapter_source(opencl From 57e6a189c745daaa3b1763071b76dc7b6ee8bedc Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Mon, 8 Jul 2024 15:01:14 +0100 Subject: [PATCH 3/6] Update UR commit --- sycl/plugins/unified_runtime/CMakeLists.txt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index bea0fee50250d..23f5080f02c14 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -100,20 +100,15 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "git@github.com:DBDuncan/unified-runtime.git") - # commit aaf08109f2a05adb61f50478824ae2739526daee - # Author: Ben Tracy - # Date: Mon Jun 17 14:49:53 2024 +0100 - # [CMDBUF] Fix coverity issue in command buffers - # - Fix incorrect conditions for copy engine usage that were reported on coverity. - set(UNIFIED_RUNTIME_TAG aaf08109f2a05adb61f50478824ae2739526daee) - - fetch_adapter_source(level_zero - ${UNIFIED_RUNTIME_REPO} - # commit 51cbcea6e8ffd4ca6e2be918335be509ae6f401c + # commit 7cccfc77e6016312cdeec11eeab4cfe2832c6528 # Author: Duncan Brawley # Date: Mon, 10 Jun 2024 17:27:17 +0100 # [Bindless][Exp] Create mapping of host and device handle - 51cbcea6e8ffd4ca6e2be918335be509ae6f401c + set(UNIFIED_RUNTIME_TAG 7cccfc77e6016312cdeec11eeab4cfe2832c6528) + + fetch_adapter_source(level_zero + ${UNIFIED_RUNTIME_REPO} + ${UNIFIED_RUNTIME_TAG} ) fetch_adapter_source(opencl From a96f74c1b50f0736f4f14f546c893a4ade6ad303 Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Tue, 9 Jul 2024 14:13:43 +0100 Subject: [PATCH 4/6] Update UR link and commits --- sycl/plugins/unified_runtime/CMakeLists.txt | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 23f5080f02c14..ef36bb03b1fef 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -99,16 +99,22 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "git@github.com:DBDuncan/unified-runtime.git") - # commit 7cccfc77e6016312cdeec11eeab4cfe2832c6528 - # Author: Duncan Brawley - # Date: Mon, 10 Jun 2024 17:27:17 +0100 - # [Bindless][Exp] Create mapping of host and device handle - set(UNIFIED_RUNTIME_TAG 7cccfc77e6016312cdeec11eeab4cfe2832c6528) + set(UNIFIED_RUNTIME_REPO "https://github.com/DBDuncan/unified-runtime.git") + # commit 4a60029d79aeb6a2bb09fc2f7677ec682634aa6e + # Merge: 01af5602 79be9c5f + # Author: Kenneth Benzie (Benie) + # Date: Mon Jul 8 13:52:48 2024 +0100 + # Merge pull request #1775 from Bensuo/fabio/refactor_l0_cmd_buffer + # Refactor Level Zero Command-Buffer implementation + set(UNIFIED_RUNTIME_TAG 4a60029d79aeb6a2bb09fc2f7677ec682634aa6e) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - ${UNIFIED_RUNTIME_TAG} + # commit a7e929a198ef384534b83cf23a96b89dbee313b9 + # Author: Duncan Brawley + # Date: Mon, 10 Jun 2024 17:27:17 +0100 + # [Bindless][Exp] Create mapping of host and device handle + a7e929a198ef384534b83cf23a96b89dbee313b9 ) fetch_adapter_source(opencl From d972b7806863e74216ec16b6bfed0e79f363fc58 Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Tue, 16 Jul 2024 13:51:06 +0100 Subject: [PATCH 5/6] Update UR commit --- sycl/plugins/unified_runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 2094a35610052..b20a1bb855375 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -110,11 +110,11 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - # commit a7e929a198ef384534b83cf23a96b89dbee313b9 + # commit f7c05981e55e9789c90c852ceece6109d24ec517 # Author: Duncan Brawley # Date: Mon, 10 Jun 2024 17:27:17 +0100 # [Bindless][Exp] Create mapping of host and device handle - a7e929a198ef384534b83cf23a96b89dbee313b9 + f7c05981e55e9789c90c852ceece6109d24ec517 ) fetch_adapter_source(opencl From 955e42aa6385bd24e7066a7b48dcc55123699487 Mon Sep 17 00:00:00 2001 From: Duncan Brawley Date: Tue, 30 Jul 2024 14:58:30 +0100 Subject: [PATCH 6/6] Update UR commit --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 80b48c2944b11..14a720f552562 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -115,13 +115,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/DBDuncan/unified-runtime.git") - # commit bc1a28ede0df7f837047b632e00437587672c134 + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + # commit 47ab963bfdc4e99cfb1ab7ab1ffd3219989f851f # Author: Omar Ahmed - # Date: Mon Jul 29 16:44:58 2024 +0100 - # Merge pull request #1819 from DBDuncan/sean/rename-interop-to-external - # [Bindless][Exp] Rename interop related structs/funcs with "external" - set(UNIFIED_RUNTIME_TAG bc1a28ede0df7f837047b632e00437587672c134) + # Date: Mon, 10 Jun 2024 17:27:17 +0100 + # Merge pull request #1790 from DBDuncan/duncan/host-to-device-img-map + # [Bindless][Exp] Create mapping of host and device handle + set(UNIFIED_RUNTIME_TAG 47ab963bfdc4e99cfb1ab7ab1ffd3219989f851f) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need @@ -135,11 +135,7 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - # commit f7c05981e55e9789c90c852ceece6109d24ec517 - # Author: Duncan Brawley - # Date: Mon, 10 Jun 2024 17:27:17 +0100 - # [Bindless][Exp] Create mapping of host and device handle - f7c05981e55e9789c90c852ceece6109d24ec517 + ${UNIFIED_RUNTIME_TAG} ) fetch_adapter_source(opencl