From ae07302a99184f2f77d45dc31946acfbb00481bf Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Sun, 8 Dec 2024 11:27:23 -0800 Subject: [PATCH 1/3] add a few missing Intel GPU device queries, fix device ID query --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..1d9f061a9f0b0 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/bashbaug/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index cfe8a46fa1d9e..ca29c08b10f3e 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit aa72577da55571b15028dd1710e02a7ea4f62338 -# Merge: 89def64486dd 3d2b7210e352 -# Author: Martin Grant -# Date: Fri Dec 6 15:24:04 2024 +0000 -# Merge pull request #2352 from aarongreig/aaron/fixCoverity15-11 -# Fix a number of issues from the latest coverity scan. -set(UNIFIED_RUNTIME_TAG aa72577da55571b15028dd1710e02a7ea4f62338) +# commit f74b2d7e4fb19aee4c4794cdb2ebc1d87dce02b0 +# Author: Ben Ashbaugh +# Date: Sat Dec 7 16:46:06 2024 -0800 + +# add a few missing Intel GPU device queries +# also, fix the device ID query +set(UNIFIED_RUNTIME_TAG f74b2d7e4fb19aee4c4794cdb2ebc1d87dce02b0) From 74e0c951130213096460e76f235a36297c2321e9 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Mon, 9 Dec 2024 08:04:18 -0800 Subject: [PATCH 2/3] update to latest commit --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index ca29c08b10f3e..51022b835311b 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,4 @@ -# commit f74b2d7e4fb19aee4c4794cdb2ebc1d87dce02b0 +# commit 44b4ff98ae7955186387a4e18ecbb8dfe4920d65 (HEAD -> add-opencl-device-queries) # Author: Ben Ashbaugh -# Date: Sat Dec 7 16:46:06 2024 -0800 - -# add a few missing Intel GPU device queries -# also, fix the device ID query -set(UNIFIED_RUNTIME_TAG f74b2d7e4fb19aee4c4794cdb2ebc1d87dce02b0) +# Date: Mon Dec 9 07:56:24 2024 -0800 +set(UNIFIED_RUNTIME_TAG 44b4ff98ae7955186387a4e18ecbb8dfe4920d65) From deeb35a545099f25d76667e820aa527c74dd4cd2 Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Fri, 13 Dec 2024 11:34:04 +0000 Subject: [PATCH 3/3] [UR] Update tag to 4739d4c for https://github.com/oneapi-src/unified-runtime/pull/2437. --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 101c95f6f4bff..b41256551676c 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 6d4eec8cdcfe8a5d359ed05092797c429c2ca878 -# Merge: 40d28e7bd84a 800b452d67c5 +# commit 4739d4cc30534d80fba4c876bfbafa51d3cad53a +# Merge: b0d133d5d5e8 44b4ff98ae79 # Author: Martin Grant -# Date: Thu Dec 12 16:00:13 2024 +0000 -# Merge pull request #2272 from martygrant/martin/virtual-memory-cts-spec-gap -# Improvements to align CTS and Spec for Virtual Memory -set(UNIFIED_RUNTIME_TAG 6d4eec8cdcfe8a5d359ed05092797c429c2ca878) +# Date: Fri Dec 13 11:30:56 2024 +0000 +# Merge pull request #2437 from bashbaug/add-opencl-device-queries +# add a few missing Intel GPU device queries, fix device ID query +set(UNIFIED_RUNTIME_TAG 4739d4cc30534d80fba4c876bfbafa51d3cad53a)