Skip to content

[SYCL] Change getSyclObjImpl to return reference to an impl #20810

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

Draft
aelovikov-intel wants to merge 1 commit into
base: sycl
Choose a base branch
from
Draft

[SYCL] Change getSyclObjImpl to return reference to an impl #20810

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
84 changes: 40 additions & 44 deletions sycl/include/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,16 +949,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(
detail::GetZeroDimAccessRange(BufferRef)),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
AdjustedDim, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -990,16 +989,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(
detail::GetZeroDimAccessRange(BufferRef)),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
AdjustedDim, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1028,14 +1026,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(
detail::GetZeroDimAccessRange(BufferRef)),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1066,14 +1064,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(
detail::GetZeroDimAccessRange(BufferRef)),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand All @@ -1099,16 +1097,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1136,16 +1133,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
if (!AccessorBaseHost::isPlaceholder())
addHostAccessorAndWait(AccessorBaseHost::impl.get());
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1201,14 +1197,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1237,14 +1233,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
preScreenAccessor(PropertyList);
initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1414,7 +1410,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(AccessRange),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
&detail::getSyclObjImpl(BufferRef), Dimensions,
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
Expand All @@ -1428,7 +1424,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
"exceed the bounds of the buffer");

initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1457,7 +1453,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(AccessRange),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
&detail::getSyclObjImpl(BufferRef), Dimensions,
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
Expand All @@ -1471,7 +1467,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
"exceed the bounds of the buffer");

initHostAcc();
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1529,7 +1525,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(AccessRange),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
&detail::getSyclObjImpl(BufferRef), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
Expand All @@ -1542,7 +1538,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :

initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1572,7 +1568,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
detail::convertToArrayOfN<3, 1>(AccessRange),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
&detail::getSyclObjImpl(BufferRef), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer, PropertyList) {
throwIfUsedByGraph();
Expand All @@ -1585,7 +1581,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :

initHostAcc();
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
detail::AccessorBaseHost::impl.get(),
AccessTarget, AccessMode, CodeLoc);
GDBMethodsAnchor();
Expand Down
22 changes: 11 additions & 11 deletions sycl/include/sycl/accessor_image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ class image_accessor
: AccessorBaseHost({ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
AccessMode, &detail::getSyclObjImpl(ImageRef),
Dimensions, ImageElementSize, size_t(0)),
MImageCount(ImageRef.size()),
MImgChannelOrder(ImageRef.getChannelOrder()),
Expand Down Expand Up @@ -362,7 +362,7 @@ class image_accessor
: AccessorBaseHost({ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
AccessMode, &detail::getSyclObjImpl(ImageRef),
Dimensions, ImageElementSize, size_t(0)),
MImageCount(ImageRef.size()),
MImgChannelOrder(ImageRef.getChannelOrder()),
Expand Down Expand Up @@ -803,7 +803,7 @@ class __SYCL_EBO unsampled_image_accessor :
}
#else
: host_base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
AccessMode, &detail::getSyclObjImpl(ImageRef),
Dimensions, ImageRef.getElementSize(),
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
Expand All @@ -818,7 +818,7 @@ class __SYCL_EBO unsampled_image_accessor :
"aspect::image.");

detail::unsampledImageConstructorNotification(
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), AccessTarget,
&detail::getSyclObjImpl(ImageRef), this->impl.get(), AccessTarget,
AccessMode, (const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
detail::associateWithHandler(CommandGroupHandlerRef, this, AccessTarget);
GDBMethodsAnchor();
Expand Down Expand Up @@ -950,15 +950,15 @@ class __SYCL_EBO host_unsampled_image_accessor
const property_list &PropList = {},
const detail::code_location CodeLoc = detail::code_location::current())
: base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
Dimensions, ImageRef.getElementSize(),
AccessMode, &detail::getSyclObjImpl(ImageRef), Dimensions,
ImageRef.getElementSize(),
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
PropList) {
addHostUnsampledImageAccessorAndWait(base_class::impl.get());

detail::unsampledImageConstructorNotification(
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), std::nullopt,
&detail::getSyclObjImpl(ImageRef), this->impl.get(), std::nullopt,
AccessMode, (const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
}

Expand Down Expand Up @@ -1092,7 +1092,7 @@ class __SYCL_EBO sampled_image_accessor :
}
#else
: host_base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
detail::getSyclObjImpl(ImageRef).get(), Dimensions,
&detail::getSyclObjImpl(ImageRef), Dimensions,
ImageRef.getElementSize(),
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
Expand All @@ -1107,7 +1107,7 @@ class __SYCL_EBO sampled_image_accessor :
"aspect::image.");

detail::sampledImageConstructorNotification(
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), AccessTarget,
&detail::getSyclObjImpl(ImageRef), this->impl.get(), AccessTarget,
(const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
detail::associateWithHandler(CommandGroupHandlerRef, this, AccessTarget);
GDBMethodsAnchor();
Expand Down Expand Up @@ -1215,15 +1215,15 @@ class __SYCL_EBO host_sampled_image_accessor
const property_list &PropList = {},
const detail::code_location CodeLoc = detail::code_location::current())
: base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
detail::getSyclObjImpl(ImageRef).get(), Dimensions,
&detail::getSyclObjImpl(ImageRef), Dimensions,
ImageRef.getElementSize(),
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
ImageRef.getSampler(), PropList) {
addHostSampledImageAccessorAndWait(base_class::impl.get());

detail::sampledImageConstructorNotification(
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), std::nullopt,
&detail::getSyclObjImpl(ImageRef), this->impl.get(), std::nullopt,
(const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
}

Expand Down
Loading
Loading