Skip to content

Commit a59f693

Browse files
aelovikov-intelaelovikov-intel
committed
[SYCL] Change getSyclObjImpl to return reference to an impl
1 parent 667c45a commit a59f693

File tree

119 files changed

+808
-820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+808
-820
lines changed

‎sycl/include/sycl/accessor.hpp‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -949,16 +949,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
949949
detail::convertToArrayOfN<3, 1>(
950950
detail::GetZeroDimAccessRange(BufferRef)),
951951
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
952-
getAdjustedMode(PropertyList),
953-
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
954-
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
955-
PropertyList) {
952+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
953+
AdjustedDim, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
954+
BufferRef.IsSubBuffer, PropertyList) {
956955
throwIfUsedByGraph();
957956
preScreenAccessor(PropertyList);
958957
if (!AccessorBaseHost::isPlaceholder())
959958
addHostAccessorAndWait(AccessorBaseHost::impl.get());
960959
initHostAcc();
961-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
960+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
962961
detail::AccessorBaseHost::impl.get(),
963962
AccessTarget, AccessMode, CodeLoc);
964963
GDBMethodsAnchor();
@@ -990,16 +989,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
990989
detail::convertToArrayOfN<3, 1>(
991990
detail::GetZeroDimAccessRange(BufferRef)),
992991
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
993-
getAdjustedMode(PropertyList),
994-
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
995-
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
996-
PropertyList) {
992+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
993+
AdjustedDim, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
994+
BufferRef.IsSubBuffer, PropertyList) {
997995
throwIfUsedByGraph();
998996
preScreenAccessor(PropertyList);
999997
if (!AccessorBaseHost::isPlaceholder())
1000998
addHostAccessorAndWait(AccessorBaseHost::impl.get());
1001999
initHostAcc();
1002-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1000+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
10031001
detail::AccessorBaseHost::impl.get(),
10041002
AccessTarget, AccessMode, CodeLoc);
10051003
GDBMethodsAnchor();
@@ -1028,14 +1026,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
10281026
detail::convertToArrayOfN<3, 1>(
10291027
detail::GetZeroDimAccessRange(BufferRef)),
10301028
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1031-
getAdjustedMode(PropertyList),
1032-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1033-
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
1029+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1030+
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
1031+
BufferRef.IsSubBuffer, PropertyList) {
10341032
throwIfUsedByGraph();
10351033
preScreenAccessor(PropertyList);
10361034
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
10371035
initHostAcc();
1038-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1036+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
10391037
detail::AccessorBaseHost::impl.get(),
10401038
AccessTarget, AccessMode, CodeLoc);
10411039
GDBMethodsAnchor();
@@ -1066,14 +1064,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
10661064
detail::convertToArrayOfN<3, 1>(
10671065
detail::GetZeroDimAccessRange(BufferRef)),
10681066
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1069-
getAdjustedMode(PropertyList),
1070-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1071-
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
1067+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1068+
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
1069+
BufferRef.IsSubBuffer, PropertyList) {
10721070
throwIfUsedByGraph();
10731071
preScreenAccessor(PropertyList);
10741072
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
10751073
initHostAcc();
1076-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1074+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
10771075
detail::AccessorBaseHost::impl.get(),
10781076
AccessTarget, AccessMode, CodeLoc);
10791077
GDBMethodsAnchor();
@@ -1099,16 +1097,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
10991097
/*Offset=*/{0, 0, 0},
11001098
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
11011099
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1102-
getAdjustedMode(PropertyList),
1103-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1104-
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
1105-
PropertyList) {
1100+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1101+
Dimensions, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
1102+
BufferRef.IsSubBuffer, PropertyList) {
11061103
throwIfUsedByGraph();
11071104
preScreenAccessor(PropertyList);
11081105
if (!AccessorBaseHost::isPlaceholder())
11091106
addHostAccessorAndWait(AccessorBaseHost::impl.get());
11101107
initHostAcc();
1111-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1108+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
11121109
detail::AccessorBaseHost::impl.get(),
11131110
AccessTarget, AccessMode, CodeLoc);
11141111
GDBMethodsAnchor();
@@ -1136,16 +1133,15 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
11361133
/*Offset=*/{0, 0, 0},
11371134
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
11381135
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1139-
getAdjustedMode(PropertyList),
1140-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1141-
IsPlaceH, BufferRef.OffsetInBytes, BufferRef.IsSubBuffer,
1142-
PropertyList) {
1136+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1137+
Dimensions, sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
1138+
BufferRef.IsSubBuffer, PropertyList) {
11431139
throwIfUsedByGraph();
11441140
preScreenAccessor(PropertyList);
11451141
if (!AccessorBaseHost::isPlaceholder())
11461142
addHostAccessorAndWait(AccessorBaseHost::impl.get());
11471143
initHostAcc();
1148-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1144+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
11491145
detail::AccessorBaseHost::impl.get(),
11501146
AccessTarget, AccessMode, CodeLoc);
11511147
GDBMethodsAnchor();
@@ -1201,14 +1197,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
12011197
/*Offset=*/{0, 0, 0},
12021198
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
12031199
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1204-
getAdjustedMode(PropertyList),
1205-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1206-
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
1200+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1201+
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
1202+
BufferRef.IsSubBuffer, PropertyList) {
12071203
throwIfUsedByGraph();
12081204
preScreenAccessor(PropertyList);
12091205
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
12101206
initHostAcc();
1211-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1207+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
12121208
detail::AccessorBaseHost::impl.get(),
12131209
AccessTarget, AccessMode, CodeLoc);
12141210
GDBMethodsAnchor();
@@ -1237,14 +1233,14 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
12371233
/*Offset=*/{0, 0, 0},
12381234
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
12391235
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
1240-
getAdjustedMode(PropertyList),
1241-
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
1242-
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer, PropertyList) {
1236+
getAdjustedMode(PropertyList), &detail::getSyclObjImpl(BufferRef),
1237+
Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
1238+
BufferRef.IsSubBuffer, PropertyList) {
12431239
throwIfUsedByGraph();
12441240
preScreenAccessor(PropertyList);
12451241
initHostAcc();
12461242
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
1247-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1243+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
12481244
detail::AccessorBaseHost::impl.get(),
12491245
AccessTarget, AccessMode, CodeLoc);
12501246
GDBMethodsAnchor();
@@ -1414,7 +1410,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
14141410
detail::convertToArrayOfN<3, 1>(AccessRange),
14151411
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
14161412
getAdjustedMode(PropertyList),
1417-
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
1413+
&detail::getSyclObjImpl(BufferRef), Dimensions,
14181414
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
14191415
BufferRef.IsSubBuffer, PropertyList) {
14201416
throwIfUsedByGraph();
@@ -1428,7 +1424,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
14281424
"exceed the bounds of the buffer");
14291425

14301426
initHostAcc();
1431-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1427+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
14321428
detail::AccessorBaseHost::impl.get(),
14331429
AccessTarget, AccessMode, CodeLoc);
14341430
GDBMethodsAnchor();
@@ -1457,7 +1453,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
14571453
detail::convertToArrayOfN<3, 1>(AccessRange),
14581454
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
14591455
getAdjustedMode(PropertyList),
1460-
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
1456+
&detail::getSyclObjImpl(BufferRef), Dimensions,
14611457
sizeof(DataT), IsPlaceH, BufferRef.OffsetInBytes,
14621458
BufferRef.IsSubBuffer, PropertyList) {
14631459
throwIfUsedByGraph();
@@ -1471,7 +1467,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
14711467
"exceed the bounds of the buffer");
14721468

14731469
initHostAcc();
1474-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1470+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
14751471
detail::AccessorBaseHost::impl.get(),
14761472
AccessTarget, AccessMode, CodeLoc);
14771473
GDBMethodsAnchor();
@@ -1529,7 +1525,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
15291525
detail::convertToArrayOfN<3, 1>(AccessRange),
15301526
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
15311527
getAdjustedMode(PropertyList),
1532-
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
1528+
&detail::getSyclObjImpl(BufferRef), Dimensions,
15331529
sizeof(DataT), BufferRef.OffsetInBytes,
15341530
BufferRef.IsSubBuffer, PropertyList) {
15351531
throwIfUsedByGraph();
@@ -1542,7 +1538,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
15421538

15431539
initHostAcc();
15441540
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
1545-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1541+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
15461542
detail::AccessorBaseHost::impl.get(),
15471543
AccessTarget, AccessMode, CodeLoc);
15481544
GDBMethodsAnchor();
@@ -1572,7 +1568,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
15721568
detail::convertToArrayOfN<3, 1>(AccessRange),
15731569
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
15741570
getAdjustedMode(PropertyList),
1575-
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
1571+
&detail::getSyclObjImpl(BufferRef), Dimensions,
15761572
sizeof(DataT), BufferRef.OffsetInBytes,
15771573
BufferRef.IsSubBuffer, PropertyList) {
15781574
throwIfUsedByGraph();
@@ -1585,7 +1581,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
15851581

15861582
initHostAcc();
15871583
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
1588-
detail::constructorNotification(detail::getSyclObjImpl(BufferRef).get(),
1584+
detail::constructorNotification(&detail::getSyclObjImpl(BufferRef),
15891585
detail::AccessorBaseHost::impl.get(),
15901586
AccessTarget, AccessMode, CodeLoc);
15911587
GDBMethodsAnchor();

‎sycl/include/sycl/accessor_image.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class image_accessor
333333
: AccessorBaseHost({ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
334334
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
335335
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
336-
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
336+
AccessMode, &detail::getSyclObjImpl(ImageRef),
337337
Dimensions, ImageElementSize, size_t(0)),
338338
MImageCount(ImageRef.size()),
339339
MImgChannelOrder(ImageRef.getChannelOrder()),
@@ -362,7 +362,7 @@ class image_accessor
362362
: AccessorBaseHost({ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
363363
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
364364
detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
365-
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
365+
AccessMode, &detail::getSyclObjImpl(ImageRef),
366366
Dimensions, ImageElementSize, size_t(0)),
367367
MImageCount(ImageRef.size()),
368368
MImgChannelOrder(ImageRef.getChannelOrder()),
@@ -803,7 +803,7 @@ class __SYCL_EBO unsampled_image_accessor :
803803
}
804804
#else
805805
: host_base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
806-
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
806+
AccessMode, &detail::getSyclObjImpl(ImageRef),
807807
Dimensions, ImageRef.getElementSize(),
808808
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
809809
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
@@ -818,7 +818,7 @@ class __SYCL_EBO unsampled_image_accessor :
818818
"aspect::image.");
819819

820820
detail::unsampledImageConstructorNotification(
821-
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), AccessTarget,
821+
&detail::getSyclObjImpl(ImageRef), this->impl.get(), AccessTarget,
822822
AccessMode, (const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
823823
detail::associateWithHandler(CommandGroupHandlerRef, this, AccessTarget);
824824
GDBMethodsAnchor();
@@ -950,15 +950,15 @@ class __SYCL_EBO host_unsampled_image_accessor
950950
const property_list &PropList = {},
951951
const detail::code_location CodeLoc = detail::code_location::current())
952952
: base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
953-
AccessMode, detail::getSyclObjImpl(ImageRef).get(),
954-
Dimensions, ImageRef.getElementSize(),
953+
AccessMode, &detail::getSyclObjImpl(ImageRef), Dimensions,
954+
ImageRef.getElementSize(),
955955
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
956956
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
957957
PropList) {
958958
addHostUnsampledImageAccessorAndWait(base_class::impl.get());
959959

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

@@ -1092,7 +1092,7 @@ class __SYCL_EBO sampled_image_accessor :
10921092
}
10931093
#else
10941094
: host_base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
1095-
detail::getSyclObjImpl(ImageRef).get(), Dimensions,
1095+
&detail::getSyclObjImpl(ImageRef), Dimensions,
10961096
ImageRef.getElementSize(),
10971097
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
10981098
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
@@ -1107,7 +1107,7 @@ class __SYCL_EBO sampled_image_accessor :
11071107
"aspect::image.");
11081108

11091109
detail::sampledImageConstructorNotification(
1110-
detail::getSyclObjImpl(ImageRef).get(), this->impl.get(), AccessTarget,
1110+
&detail::getSyclObjImpl(ImageRef), this->impl.get(), AccessTarget,
11111111
(const void *)typeid(DataT).name(), sizeof(DataT), CodeLoc);
11121112
detail::associateWithHandler(CommandGroupHandlerRef, this, AccessTarget);
11131113
GDBMethodsAnchor();
@@ -1215,15 +1215,15 @@ class __SYCL_EBO host_sampled_image_accessor
12151215
const property_list &PropList = {},
12161216
const detail::code_location CodeLoc = detail::code_location::current())
12171217
: base_class(detail::convertToArrayOfN<3, 1>(ImageRef.get_range()),
1218-
detail::getSyclObjImpl(ImageRef).get(), Dimensions,
1218+
&detail::getSyclObjImpl(ImageRef), Dimensions,
12191219
ImageRef.getElementSize(),
12201220
{ImageRef.getRowPitch(), ImageRef.getSlicePitch(), 0},
12211221
ImageRef.getChannelType(), ImageRef.getChannelOrder(),
12221222
ImageRef.getSampler(), PropList) {
12231223
addHostSampledImageAccessorAndWait(base_class::impl.get());
12241224

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

0 commit comments

Comments
 (0)