From 61fc120b07917cd3280e95379fa7d24b09ddc652 Mon Sep 17 00:00:00 2001 From: PietroGhg Date: Mon, 3 Jun 2024 09:20:28 +0100 Subject: [PATCH 1/2] Enable USM/dmem_varied.cpp on Native CPU --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 4 ++-- sycl/test-e2e/USM/dmem_varied.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 9c242cf8941ee..0b8bc10da7eab 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -155,8 +155,8 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) ) fetch_adapter_source(native_cpu - ${UNIFIED_RUNTIME_REPO} - ${UNIFIED_RUNTIME_TAG} + "https://github.com/PietroGhg/unified-runtime.git" + pietro/usm_fixes ) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) diff --git a/sycl/test-e2e/USM/dmem_varied.cpp b/sycl/test-e2e/USM/dmem_varied.cpp index abdb43ef9b9c4..f5bb003498ed9 100644 --- a/sycl/test-e2e/USM/dmem_varied.cpp +++ b/sycl/test-e2e/USM/dmem_varied.cpp @@ -3,7 +3,7 @@ // This test is expected to reliably work with USM allocator which is // currently enabled only on level zero. -// REQUIRES: level_zero +// REQUIRES: level_zero || native_cpu //==---------- dmem_varied.cpp - Test various sizes and alignments ---------==// // From 7c44cca1cb25d9138a83c435691ea37cbff02bb8 Mon Sep 17 00:00:00 2001 From: PietroGhg Date: Tue, 16 Jul 2024 10:23:16 +0100 Subject: [PATCH 2/2] Update test comment --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 16 ++++++++-------- sycl/test-e2e/USM/dmem_varied.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 0b8bc10da7eab..7149b349d19b4 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,13 +116,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 9deaabcbef168015df251c4ac0d47c2cba7bfbfb - # Merge: 84f5e705 ca2916e9 + # commit a89657c2e36d7152820b9ecc088422a54ca1d844 + # Merge: 2355a7d6 be7057c4 # Author: Omar Ahmed - # Date: Mon Aug 5 21:02:44 2024 +0100 - # Merge pull request #1929 from oneapi-src/revert-1880-l0-native-enqueue - # Revert "[L0] L0 impl for enqueue native command" - set(UNIFIED_RUNTIME_TAG 9deaabcbef168015df251c4ac0d47c2cba7bfbfb) + # Date: Wed Aug 7 12:01:33 2024 +0100 + # Merge pull request #1699 from PietroGhg/pietro/usm_fixes + # [NATIVECPU] Implement urUSMGetMemAllocInfo and aligned alloc + set(UNIFIED_RUNTIME_TAG a89657c2e36d7152820b9ecc088422a54ca1d844) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need @@ -155,8 +155,8 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) ) fetch_adapter_source(native_cpu - "https://github.com/PietroGhg/unified-runtime.git" - pietro/usm_fixes + ${UNIFIED_RUNTIME_REPO} + ${UNIFIED_RUNTIME_TAG} ) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) diff --git a/sycl/test-e2e/USM/dmem_varied.cpp b/sycl/test-e2e/USM/dmem_varied.cpp index f5bb003498ed9..4de697b8921c3 100644 --- a/sycl/test-e2e/USM/dmem_varied.cpp +++ b/sycl/test-e2e/USM/dmem_varied.cpp @@ -2,7 +2,7 @@ // RUN: %{run} %t1.out // This test is expected to reliably work with USM allocator which is -// currently enabled only on level zero. +// currently enabled only on level zero and Native CPU. // REQUIRES: level_zero || native_cpu //==---------- dmem_varied.cpp - Test various sizes and alignments ---------==//