From 5252593b3aa1ba957de2627dab8e62e4c5a3f6e3 Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Fri, 22 Nov 2024 12:23:10 +0000 Subject: [PATCH] [UR][SYCL] Remove UR context atomic queries. These were always just used as placeholder values so they can be replaced by __SYCL_TRAIT_HANDLED_IN_RT. --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 6 +----- sycl/include/sycl/info/context_traits.def | 8 ++++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..d0eff6cbe84f1 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/aarongreig/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 dc58da15ef33d..0d34e0d282578 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,5 +1 @@ -# commit b5294ee0762e9eb4919102e5663e724c152487bc -# Author: Yang Zhao -# Date: Fri Nov 22 15:59:23 2024 +0800 -# [DeviceASAN][NFC] Code Restructure (#2232) -set(UNIFIED_RUNTIME_TAG b5294ee0762e9eb4919102e5663e724c152487bc) +set(UNIFIED_RUNTIME_TAG aaron/removeContextAtomicQueries) diff --git a/sycl/include/sycl/info/context_traits.def b/sycl/include/sycl/info/context_traits.def index 5eb20f4b44a94..f522e6e61c3bb 100644 --- a/sycl/include/sycl/info/context_traits.def +++ b/sycl/include/sycl/info/context_traits.def @@ -1,7 +1,7 @@ __SYCL_PARAM_TRAITS_SPEC(context, reference_count, uint32_t, UR_CONTEXT_INFO_REFERENCE_COUNT) __SYCL_PARAM_TRAITS_SPEC(context, platform, sycl::platform, __SYCL_TRAIT_HANDLED_IN_RT) __SYCL_PARAM_TRAITS_SPEC(context, devices, std::vector, UR_CONTEXT_INFO_DEVICES) -__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_order_capabilities, std::vector, UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES) -__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_scope_capabilities, std::vector, UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES) -__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_order_capabilities, std::vector, UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES) -__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_scope_capabilities, std::vector, UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES) +__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_order_capabilities, std::vector, __SYCL_TRAIT_HANDLED_IN_RT) +__SYCL_PARAM_TRAITS_SPEC(context, atomic_memory_scope_capabilities, std::vector, __SYCL_TRAIT_HANDLED_IN_RT) +__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_order_capabilities, std::vector, __SYCL_TRAIT_HANDLED_IN_RT) +__SYCL_PARAM_TRAITS_SPEC(context, atomic_fence_scope_capabilities, std::vector, __SYCL_TRAIT_HANDLED_IN_RT)