Skip to content

[XPTI] Rename ur to ur.call in XPTI #14971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2024
Merged

[XPTI] Rename ur to ur.call in XPTI #14971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
# 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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/XPTI/Inputs/test_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>{type::function_with_args_begin})
xptiRegisterCallback(StreamID, static_cast<uint16_t>(t), syclUrCallback);
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/XPTI/basic_event_collection_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-prof/collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions sycl/tools/sycl-sanitize/collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions sycl/tools/sycl-trace/collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/tools/sycl-trace/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Loading