Skip to content
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

Jump to bottom

[DO NOT MERGE] Test XPTI removal for upstreaming #16011

Draft
wants to merge 7 commits into
base: sycl
Choose a base branch
from
Draft

[DO NOT MERGE] Test XPTI removal for upstreaming #16011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26effca
[SYCL][RT upstreaming] Remove uses of XPTI
sergey-semenov Nov 7, 2024
0aa441a
Appease clang-format
sergey-semenov Nov 7, 2024
6579a6c
Drop XPTI based tools and tests
sergey-semenov Nov 11, 2024
5cf2c8d
Remove doc mentions
sergey-semenov Nov 13, 2024
19ceadf
Remove XPTI from cmake and lit config files
sergey-semenov Nov 13, 2024
7d7e8c2
Remove XPTI helpers
sergey-semenov Nov 13, 2024
3ee8318
More cleanup
sergey-semenov Nov 13, 2024
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
32 changes: 0 additions & 32 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ if(SYCL_ENABLE_EXTENSION_JIT AND WIN32)
BOOL "Extension to JIT kernels not yet supported on Windows" FORCE)
endif()

if (NOT XPTI_INCLUDES)
set(XPTI_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../xpti/include)
endif()

if (NOT XPTI_PROXY_SRC)
set(XPTI_PROXY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../xpti/src/xpti_proxy.cpp)
endif()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
include(AddSYCLExecutable)
include(AddSYCL)
Expand Down Expand Up @@ -127,10 +119,6 @@ if(SYCL_ENABLE_WERROR)
endif()
endif()

# Create a soft option for enabling or disabling the instrumentation
# of the SYCL runtime and expect enabling
option(SYCL_ENABLE_XPTI_TRACING "Enable tracing of SYCL constructs" OFF)

# Get clang's version
include(VersionFromVCS)
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
Expand Down Expand Up @@ -355,14 +343,6 @@ if (NOT WIN32)
COMPONENT sycl-headers-extras)
endif()

if (SYCL_ENABLE_XPTI_TRACING)
if (MSVC)
set(XPTIFW_LIBS xpti xptid xptifw xptifwd)
else()
set(XPTIFW_LIBS xpti xptifw)
endif()
endif()

# SYCL toolchain builds all components: compiler, libraries, headers, etc.
add_custom_target(sycl-compiler
DEPENDS append-file
Expand Down Expand Up @@ -393,7 +373,6 @@ add_custom_target( sycl-toolchain ALL
DEPENDS sycl-runtime-libraries
sycl-compiler
sycl-ls
${XPTIFW_LIBS}
COMMENT "Building SYCL compiler toolchain..."
)

Expand Down Expand Up @@ -471,24 +450,13 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
libsycldevice
unified-memory-framework
unified-runtime-loader
${XPTIFW_LIBS}
${SYCL_TOOLCHAIN_DEPS}
)

if (WIN32)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS ur_win_proxy_loader)
endif()

if (TARGET sycl-prof)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS sycl-prof)
endif()
if (TARGET sycl-sanitize)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS sycl-sanitize)
endif()
if (TARGET sycl-trace)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS sycl-trace)
endif()

if(OpenCL_INSTALL_KHRONOS_ICD_LOADER AND TARGET OpenCL-ICD)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS OpenCL-ICD)
endif()
Expand Down
5 changes: 0 additions & 5 deletions sycl/doc/EnvironmentVariables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,8 @@ For a description of parallel for range rounding in DPC++ see
| Environment variable | Values | Description |
| -------------------- | ------ | ----------- |
| `INTEL_ENABLE_OFFLOAD_ANNOTATIONS` | Any(\*) | Enables ITT Annotations support for SYCL runtime. This variable should only be used by tools, that support ITT Annotations. |
| `XPTI_FRAMEWORK_DISPATCHER`(\*\*) | Path to dispatcher library | Loads XPTI instrumentation dispatcher framework library. See [XPTI Framework documentation][xpti] for more info |
| `XPTI_TRACE_ENABLE`(\*\*) | `1`, `true`, `0`, `false` | Enables XPTI instrumentation. See [XPTI Framework documentation][xpti] for more info |
| `XPTI_SUBSCRIBERS`(\*\*) | Comma separated list of subscriber libraries | Loads XPTI subscribers. See [XPTI Framework documentation][xpti] for more info |

`(*) Note: Any means this environment variable is effective when set to any non-null value.`
`(**) Note: These variables come from XPTI framework`

## Debugging variables for DPC++ Runtime

Expand Down Expand Up @@ -299,5 +295,4 @@ variables in production code.</span>

`(*) Note: Any means this environment variable is effective when set to any non-null value.`

[xpti]: https://github.com/intel/llvm/blob/sycl/xptifw/doc/XPTI_Framework.md
[range-rounding]: https://github.com/intel/llvm/blob/sycl/sycl/doc/design/ParallelForRangeRounding.md
354 changes: 0 additions & 354 deletions sycl/doc/design/SYCLInstrumentationUsingXPTI.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion sycl/doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Design Documents for the oneAPI DPC++ Compiler
design/SharedLibraries
design/OptionalDeviceFeatures
design/ParallelForRangeRounding
design/SYCLInstrumentationUsingXPTI
design/ITTAnnotations
design/DeviceGlobal
design/CompileTimeProperties
Expand Down
73 changes: 18 additions & 55 deletions sycl/include/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,6 @@ struct AccHostDataT {
void *Reserved = nullptr;
};

void __SYCL_EXPORT constructorNotification(void *BufferObj, void *AccessorObj,
access::target Target,
access::mode Mode,
const code_location &CodeLoc);

template <typename T>
using IsPropertyListT = typename std::is_base_of<PropertyListBase, T>;

Expand Down Expand Up @@ -957,14 +952,12 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
#endif
}
Expand Down Expand Up @@ -998,14 +991,12 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
#endif
}
Expand Down Expand Up @@ -1035,13 +1026,11 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1073,13 +1062,11 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1107,14 +1094,12 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1144,14 +1129,12 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1208,13 +1191,11 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1244,13 +1225,11 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1421,6 +1400,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
Expand All @@ -1432,9 +1412,6 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
"exceed the bounds of the buffer");

initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1464,6 +1441,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
Expand All @@ -1475,9 +1453,6 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
"exceed the bounds of the buffer");

initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1536,6 +1511,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (BufferRef.isOutOfBounds(AccessOffset, AccessRange,
Expand All @@ -1546,9 +1522,6 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :

initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1579,6 +1552,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
std::ignore = CodeLoc;
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (BufferRef.isOutOfBounds(AccessOffset, AccessRange,
Expand All @@ -1589,9 +1563,6 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :

initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
}
#endif
Expand Down Expand Up @@ -1646,10 +1617,6 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
PropertyListT::template areSameCompileTimeProperties<NewPropsT...>(),
"Compile-time-constant properties must be the same");
(void)CodeLoc;
#ifndef __SYCL_DEVICE_ONLY__
detail::constructorNotification(getMemoryObject(), impl.get(), AccessTarget,
AccessMode, CodeLoc);
#endif
}

void swap(accessor &other) {
Expand Down Expand Up @@ -2251,8 +2218,7 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
}
#else
: LocalAccessorBaseHost(range<3>{1, 1, 1}, AdjustedDim, sizeof(DataT)) {
detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
access::target::local, AccessMode, CodeLoc);
std::ignore = CodeLoc;
GDBMethodsAnchor();
}
#endif
Expand All @@ -2269,9 +2235,8 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
#else
: LocalAccessorBaseHost(range<3>{1, 1, 1}, AdjustedDim, sizeof(DataT),
propList) {
detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
access::target::local, AccessMode, CodeLoc);
GDBMethodsAnchor();
std::ignore = CodeLoc;
GDBMethodsAnchor();
}
#endif

Expand All @@ -2286,8 +2251,7 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
#else
: LocalAccessorBaseHost(detail::convertToArrayOfN<3, 1>(AllocationSize),
AdjustedDim, sizeof(DataT)) {
detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
access::target::local, AccessMode, CodeLoc);
std::ignore = CodeLoc;
GDBMethodsAnchor();
}
#endif
Expand All @@ -2306,9 +2270,8 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
#else
: LocalAccessorBaseHost(detail::convertToArrayOfN<3, 1>(AllocationSize),
AdjustedDim, sizeof(DataT), propList) {
detail::constructorNotification(nullptr, LocalAccessorBaseHost::impl.get(),
access::target::local, AccessMode, CodeLoc);
GDBMethodsAnchor();
std::ignore = CodeLoc;
GDBMethodsAnchor();
}
#endif

Expand Down
Loading