diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index c4b159216f223..953b4851be7d9 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit cabf128094eff9ff7b79bdff559640a8a111f0c3 - # Merge: a96fcbc5 15bca3b6 + # commit d0a50523006fa6f283da6a36811081add3bb22fc + # Merge: 804851e4 04deb8b3 # Author: Omar Ahmed - # Date: Mon Aug 19 16:20:45 2024 +0100 - # Merge pull request #1984 from rafbiels/rafbiels/cuda-stream-race-cond - # Fix race condition in CUDA stream creation - set(UNIFIED_RUNTIME_TAG cabf128094eff9ff7b79bdff559640a8a111f0c3) + # Date: Tue Aug 20 16:28:30 2024 +0100 + # Merge pull request #1940 from RossBrunton/ross/urcall + # [XPTI] Use `ur.call` rather than `ur` in XPTI + set(UNIFIED_RUNTIME_TAG d0a50523006fa6f283da6a36811081add3bb22fc) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/test-e2e/XPTI/Inputs/test_collector.cpp b/sycl/test-e2e/XPTI/Inputs/test_collector.cpp index 17f838f79b11a..86e126714fc07 100644 --- a/sycl/test-e2e/XPTI/Inputs/test_collector.cpp +++ b/sycl/test-e2e/XPTI/Inputs/test_collector.cpp @@ -21,7 +21,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int MajorVersion, std::string_view NameView{StreamName}; using type = xpti::trace_point_type_t; - if (NameView == "ur") { + if (NameView == "ur.call") { uint8_t StreamID = xptiRegisterStream(StreamName); for (type t : std::initializer_list{type::function_with_args_begin}) xptiRegisterCallback(StreamID, static_cast(t), syclUrCallback); diff --git a/sycl/test-e2e/XPTI/basic_event_collection_linux.cpp b/sycl/test-e2e/XPTI/basic_event_collection_linux.cpp index b195678161951..ef6142d392e09 100644 --- a/sycl/test-e2e/XPTI/basic_event_collection_linux.cpp +++ b/sycl/test-e2e/XPTI/basic_event_collection_linux.cpp @@ -5,7 +5,7 @@ #include "basic_event_collection.inc" // -// CHECK: xptiTraceInit: Stream Name = ur +// CHECK: xptiTraceInit: Stream Name = ur.call // CHECK: xptiTraceInit: Stream Name = sycl.experimental.mem_alloc // CHECK: xptiTraceInit: Stream Name = sycl // CHECK-NEXT: Graph create diff --git a/sycl/tools/sycl-prof/collector.cpp b/sycl/tools/sycl-prof/collector.cpp index 35d1111a86cb7..7afca930b9194 100644 --- a/sycl/tools/sycl-prof/collector.cpp +++ b/sycl/tools/sycl-prof/collector.cpp @@ -77,7 +77,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int /*major_version*/, } std::string_view NameView{StreamName}; - if (NameView == "ur") { + if (NameView == "ur.call") { uint8_t StreamID = xptiRegisterStream(StreamName); xptiRegisterCallback(StreamID, xpti::trace_function_with_args_begin, urBeginEndCallback); diff --git a/sycl/tools/sycl-sanitize/collector.cpp b/sycl/tools/sycl-sanitize/collector.cpp index 7266a3e24fa9a..9ce6f1a58d79b 100644 --- a/sycl/tools/sycl-sanitize/collector.cpp +++ b/sycl/tools/sycl-sanitize/collector.cpp @@ -32,7 +32,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int /*major_version*/, unsigned int /*minor_version*/, const char * /*version_str*/, const char *StreamName) { - if (std::string_view(StreamName) == "ur") { + if (std::string_view(StreamName) == "ur.call") { uint8_t StreamID = xptiRegisterStream(StreamName); xptiRegisterCallback(StreamID, xpti::trace_function_with_args_begin, tpCallback); @@ -45,7 +45,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int /*major_version*/, } XPTI_CALLBACK_API void xptiTraceFinish(const char *StreamName) { - if (std::string_view(StreamName) == "ur") { + if (std::string_view(StreamName) == "ur.call") { bool hadLeak = false; auto &GS = USMAnalyzer::getInstance(); if (GS.ActivePointers.size() > 0) { diff --git a/sycl/tools/sycl-trace/collector.cpp b/sycl/tools/sycl-trace/collector.cpp index edf6ce9ccff3f..bdfbb377b8ecc 100644 --- a/sycl/tools/sycl-trace/collector.cpp +++ b/sycl/tools/sycl-trace/collector.cpp @@ -177,7 +177,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int /*major_version*/, unsigned int /*minor_version*/, const char * /*version_str*/, const char *StreamName) { - if (std::string_view(StreamName) == "ur" && + if (std::string_view(StreamName) == "ur.call" && std::getenv("SYCL_TRACE_UR_ENABLE")) { urPrintersInit(); uint16_t StreamID = xptiRegisterStream(StreamName); @@ -233,7 +233,7 @@ XPTI_CALLBACK_API void xptiTraceInit(unsigned int /*major_version*/, } XPTI_CALLBACK_API void xptiTraceFinish(const char *StreamName) { - if (std::string_view(StreamName) == "ur" && + if (std::string_view(StreamName) == "ur.call" && std::getenv("SYCL_TRACE_UR_ENABLE")) urPrintersFinish(); #ifdef SYCL_HAS_LEVEL_ZERO diff --git a/sycl/tools/sycl-trace/main.cpp b/sycl/tools/sycl-trace/main.cpp index cb51474c3be60..77c5c4ddee238 100644 --- a/sycl/tools/sycl-trace/main.cpp +++ b/sycl/tools/sycl-trace/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv, char *env[]) { cl::values( // TODO graph dot // clEnumValN(PI, "plugin", "Trace Plugin Interface calls"), - clEnumValN(UR, "ur", "Trace Unified Runtime calls"), + clEnumValN(UR, "ur.call", "Trace Unified Runtime calls"), clEnumValN(ZE, "level_zero", "Trace Level Zero calls"), clEnumValN(CU, "cuda", "Trace CUDA Driver API calls"), clEnumValN(SYCL, "sycl", "Trace SYCL API calls"),