Skip to content

Commit 7700111

Browse files
DBDuncanDBDuncan
committed
Rename 'SrcImageDesc' and 'DestImageDesc' to 'SrcImgDesc' and 'DescImgDesc' to align with existing code
1 parent 46666c1 commit 7700111

File tree

5 files changed

+69
-70
lines changed

5 files changed

+69
-70
lines changed

‎sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -818,10 +818,10 @@ public:
818818
void ext_oneapi_copy(
819819
const ext::oneapi::experimental::image_mem_handle Src,
820820
sycl::range<3> SrcOffset,
821-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
821+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
822822
ext::oneapi::experimental::image_mem_handle Dest,
823823
sycl::range<3> DestOffset,
824-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
824+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
825825
sycl::range<3> CopyExtent)
826826
};
827827

@@ -969,27 +969,27 @@ public:
969969
void ext_oneapi_copy(
970970
const ext::oneapi::experimental::image_mem_handle Src,
971971
sycl::range<3> SrcOffset,
972-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
972+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
973973
ext::oneapi::experimental::image_mem_handle Dest,
974974
sycl::range<3> DestOffset,
975-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
975+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
976976
sycl::range<3> CopyExtent)
977977
void ext_oneapi_copy(
978978
const ext::oneapi::experimental::image_mem_handle Src,
979979
sycl::range<3> SrcOffset,
980-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
980+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
981981
ext::oneapi::experimental::image_mem_handle Dest,
982982
sycl::range<3> DestOffset,
983-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
983+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
984984
sycl::range<3> CopyExtent
985985
event DepEvent)
986986
void ext_oneapi_copy(
987987
const ext::oneapi::experimental::image_mem_handle Src,
988988
sycl::range<3> SrcOffset,
989-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
989+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
990990
ext::oneapi::experimental::image_mem_handle Dest,
991991
sycl::range<3> DestOffset,
992-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
992+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
993993
sycl::range<3> CopyExtent
994994
const std::vector<event> &DepEvents)
995995
};

‎sycl/include/sycl/ext/oneapi/bindless_images.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,51 +1612,51 @@ inline event queue::ext_oneapi_copy(
16121612
inline event queue::ext_oneapi_copy(
16131613
const ext::oneapi::experimental::image_mem_handle Src,
16141614
sycl::range<3> SrcOffset,
1615-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1615+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
16161616
ext::oneapi::experimental::image_mem_handle Dest, sycl::range<3> DestOffset,
1617-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1617+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
16181618
sycl::range<3> CopyExtent, event DepEvent,
16191619
const detail::code_location &CodeLoc) {
16201620
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
16211621
return submit(
16221622
[&](handler &CGH) {
16231623
CGH.depends_on(DepEvent);
1624-
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImageDesc, Dest, DestOffset,
1625-
DestImageDesc, CopyExtent);
1624+
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImgDesc, Dest, DestOffset,
1625+
DestImgDesc, CopyExtent);
16261626
},
16271627
CodeLoc);
16281628
}
16291629

16301630
inline event queue::ext_oneapi_copy(
16311631
const ext::oneapi::experimental::image_mem_handle Src,
16321632
sycl::range<3> SrcOffset,
1633-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1633+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
16341634
ext::oneapi::experimental::image_mem_handle Dest, sycl::range<3> DestOffset,
1635-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1635+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
16361636
sycl::range<3> CopyExtent, const std::vector<event> &DepEvents,
16371637
const detail::code_location &CodeLoc) {
16381638
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
16391639
return submit(
16401640
[&](handler &CGH) {
16411641
CGH.depends_on(DepEvents);
1642-
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImageDesc, Dest, DestOffset,
1643-
DestImageDesc, CopyExtent);
1642+
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImgDesc, Dest, DestOffset,
1643+
DestImgDesc, CopyExtent);
16441644
},
16451645
CodeLoc);
16461646
}
16471647

16481648
inline event queue::ext_oneapi_copy(
16491649
const ext::oneapi::experimental::image_mem_handle Src,
16501650
sycl::range<3> SrcOffset,
1651-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1651+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
16521652
ext::oneapi::experimental::image_mem_handle Dest, sycl::range<3> DestOffset,
1653-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1653+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
16541654
sycl::range<3> CopyExtent, const detail::code_location &CodeLoc) {
16551655
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
16561656
return submit(
16571657
[&](handler &CGH) {
1658-
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImageDesc, Dest, DestOffset,
1659-
DestImageDesc, CopyExtent);
1658+
CGH.ext_oneapi_copy(Src, SrcOffset, SrcImgDesc, Dest, DestOffset,
1659+
DestImgDesc, CopyExtent);
16601660
},
16611661
CodeLoc);
16621662
}

‎sycl/include/sycl/handler.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3197,22 +3197,22 @@ class __SYCL_EXPORT handler {
31973197
///
31983198
/// \param Src is an opaque image memory handle to the source memory.
31993199
/// \param SrcOffset is an offset from the source origin measured in pixels
3200-
/// (pixel size determined by \p SrcImageDesc )
3201-
/// \param SrcImageDesc is the source image descriptor
3200+
/// (pixel size determined by \p SrcImgDesc )
3201+
/// \param SrcImgDesc is the source image descriptor
32023202
/// \param Dest is an opaque image memory handle to the destination memory.
32033203
/// \param DestOffset is an offset from the destination origin measured in
3204-
/// pixels (pixel size determined by \p DestImageDesc )
3205-
/// \param DestImageDesc is the destination image descriptor
3204+
/// pixels (pixel size determined by \p DestImgDesc )
3205+
/// \param DestImgDesc is the destination image descriptor
32063206
/// \param CopyExtent is the width, height, and depth of the region to copy
32073207
/// measured in pixels (pixel size determined by
3208-
/// \p SrcImageDesc )
3208+
/// \p SrcImgDesc )
32093209
void ext_oneapi_copy(
32103210
const ext::oneapi::experimental::image_mem_handle Src,
32113211
sycl::range<3> SrcOffset,
3212-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
3212+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
32133213
ext::oneapi::experimental::image_mem_handle Dest,
32143214
sycl::range<3> DestOffset,
3215-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
3215+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
32163216
sycl::range<3> CopyExtent);
32173217

32183218
/// Copies data from one memory region to another, where \p Src and \p Dest

‎sycl/include/sycl/queue.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,23 +1765,23 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
17651765
///
17661766
/// \param Src is an opaque image memory handle to the source memory.
17671767
/// \param SrcOffset is an offset from the origin of source measured in pixels
1768-
/// (pixel size determined by \p SrcImageDesc )
1769-
/// \param SrcImageDesc is the source image descriptor
1768+
/// (pixel size determined by \p SrcImgDesc )
1769+
/// \param SrcImgDesc is the source image descriptor
17701770
/// \param Dest is an opaque image memory handle to the destination memory.
17711771
/// \param DestOffset is an offset from the origin of destination measured in
1772-
/// pixels (pixel size determined by \p DestImageDesc )
1773-
/// \param DestImageDesc is the destination image descriptor
1772+
/// pixels (pixel size determined by \p DestImgDesc )
1773+
/// \param DestImgDesc is the destination image descriptor
17741774
/// \param CopyExtent is the width, height, and depth of the region to copy
17751775
/// measured in pixels (pixel size determined by
1776-
/// \p SrcImageDesc )
1776+
/// \p SrcImgDesc )
17771777
/// \return an event representing the copy operation.
17781778
event ext_oneapi_copy(
17791779
const ext::oneapi::experimental::image_mem_handle Src,
17801780
sycl::range<3> SrcOffset,
1781-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1781+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
17821782
ext::oneapi::experimental::image_mem_handle Dest,
17831783
sycl::range<3> DestOffset,
1784-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1784+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
17851785
sycl::range<3> CopyExtent,
17861786
const detail::code_location &CodeLoc = detail::code_location::current());
17871787

@@ -1793,24 +1793,24 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
17931793
///
17941794
/// \param Src is an opaque image memory handle to the source memory.
17951795
/// \param SrcOffset is an offset from the origin of source measured in pixels
1796-
/// (pixel size determined by \p SrcImageDesc )
1797-
/// \param SrcImageDesc is the source image descriptor
1796+
/// (pixel size determined by \p SrcImgDesc )
1797+
/// \param SrcImgDesc is the source image descriptor
17981798
/// \param Dest is an opaque image memory handle to the destination memory.
17991799
/// \param DestOffset is an offset from the origin of destination measured in
1800-
/// pixels (pixel size determined by \p DestImageDesc )
1801-
/// \param DestImageDesc is the destination image descriptor
1800+
/// pixels (pixel size determined by \p DestImgDesc )
1801+
/// \param DestImgDesc is the destination image descriptor
18021802
/// \param CopyExtent is the width, height, and depth of the region to copy
18031803
/// measured in pixels (pixel size determined by
1804-
/// \p SrcImageDesc )
1804+
/// \p SrcImgDesc )
18051805
/// \param DepEvent is an event that specifies the kernel dependencies.
18061806
/// \return an event representing the copy operation.
18071807
event ext_oneapi_copy(
18081808
const ext::oneapi::experimental::image_mem_handle Src,
18091809
sycl::range<3> SrcOffset,
1810-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1810+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
18111811
ext::oneapi::experimental::image_mem_handle Dest,
18121812
sycl::range<3> DestOffset,
1813-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1813+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
18141814
sycl::range<3> CopyExtent, event DepEvent,
18151815
const detail::code_location &CodeLoc = detail::code_location::current());
18161816

@@ -1822,25 +1822,25 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
18221822
///
18231823
/// \param Src is an opaque image memory handle to the source memory.
18241824
/// \param SrcOffset is an offset from the origin of source measured in pixels
1825-
/// (pixel size determined by \p SrcImageDesc )
1826-
/// \param SrcImageDesc is the source image descriptor
1825+
/// (pixel size determined by \p SrcImgDesc )
1826+
/// \param srcImgDesc is the source image descriptor
18271827
/// \param Dest is an opaque image memory handle to the destination memory.
18281828
/// \param DestOffset is an offset from the origin of destination measured in
1829-
/// pixels (pixel size determined by \p DestImageDesc )
1830-
/// \param DestImageDesc is the destination image descriptor
1829+
/// pixels (pixel size determined by \p DestImgDesc )
1830+
/// \param DestImgDesc is the destination image descriptor
18311831
/// \param CopyExtent is the width, height, and depth of the region to copy
18321832
/// measured in pixels (pixel size determined by
1833-
/// \p SrcImageDesc )
1833+
/// \p SrcImgDesc )
18341834
/// \param DepEvents is a vector of events that specifies the kernel
18351835
/// dependencies.
18361836
/// \return an event representing the copy operation.
18371837
event ext_oneapi_copy(
18381838
const ext::oneapi::experimental::image_mem_handle Src,
18391839
sycl::range<3> SrcOffset,
1840-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1840+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
18411841
ext::oneapi::experimental::image_mem_handle Dest,
18421842
sycl::range<3> DestOffset,
1843-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1843+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
18441844
sycl::range<3> CopyExtent, const std::vector<event> &DepEvents,
18451845
const detail::code_location &CodeLoc = detail::code_location::current());
18461846

‎sycl/source/handler.cpp‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,16 +1251,15 @@ void handler::ext_oneapi_copy(
12511251
void handler::ext_oneapi_copy(
12521252
const ext::oneapi::experimental::image_mem_handle Src,
12531253
sycl::range<3> SrcOffset,
1254-
const ext::oneapi::experimental::image_descriptor &SrcImageDesc,
1255-
ext::oneapi::experimental::image_mem_handle Dest,
1256-
sycl::range<3> DestOffset,
1257-
const ext::oneapi::experimental::image_descriptor &DestImageDesc,
1254+
const ext::oneapi::experimental::image_descriptor &SrcImgDesc,
1255+
ext::oneapi::experimental::image_mem_handle Dest, sycl::range<3> DestOffset,
1256+
const ext::oneapi::experimental::image_descriptor &DestImgDesc,
12581257
sycl::range<3> CopyExtent) {
12591258
throwIfGraphAssociated<
12601259
ext::oneapi::experimental::detail::UnsupportedGraphFeatures::
12611260
sycl_ext_oneapi_bindless_images>();
1262-
SrcImageDesc.verify();
1263-
DestImageDesc.verify();
1261+
SrcImgDesc.verify();
1262+
DestImgDesc.verify();
12641263

12651264
auto isOutOfRange = [](const sycl::range<3> &range,
12661265
const sycl::range<3> &offset,
@@ -1271,10 +1270,10 @@ void handler::ext_oneapi_copy(
12711270
static_cast<bool>(result[2]));
12721271
};
12731272

1274-
sycl::range<3> SrcImageSize = {SrcImageDesc.width, SrcImageDesc.height,
1275-
SrcImageDesc.depth};
1276-
sycl::range<3> DestImageSize = {DestImageDesc.width, DestImageDesc.height,
1277-
DestImageDesc.depth};
1273+
sycl::range<3> SrcImageSize = {SrcImgDesc.width, SrcImgDesc.height,
1274+
SrcImgDesc.depth};
1275+
sycl::range<3> DestImageSize = {DestImgDesc.width, DestImgDesc.height,
1276+
DestImgDesc.depth};
12781277

12791278
if (isOutOfRange(SrcImageSize, SrcOffset, CopyExtent) ||
12801279
isOutOfRange(DestImageSize, DestOffset, CopyExtent)) {
@@ -1287,16 +1286,16 @@ void handler::ext_oneapi_copy(
12871286
MDstPtr = reinterpret_cast<void *>(Dest.raw_handle);
12881287

12891288
ur_image_desc_t UrSrcDesc = {};
1290-
UrSrcDesc.width = SrcImageDesc.width;
1291-
UrSrcDesc.height = SrcImageDesc.height;
1292-
UrSrcDesc.depth = SrcImageDesc.depth;
1293-
UrSrcDesc.arraySize = SrcImageDesc.array_size;
1289+
UrSrcDesc.width = SrcImgDesc.width;
1290+
UrSrcDesc.height = SrcImgDesc.height;
1291+
UrSrcDesc.depth = SrcImgDesc.depth;
1292+
UrSrcDesc.arraySize = SrcImgDesc.array_size;
12941293

12951294
ur_image_desc_t UrDestDesc = {};
1296-
UrDestDesc.width = DestImageDesc.width;
1297-
UrDestDesc.height = DestImageDesc.height;
1298-
UrDestDesc.depth = DestImageDesc.depth;
1299-
UrDestDesc.arraySize = DestImageDesc.array_size;
1295+
UrDestDesc.width = DestImgDesc.width;
1296+
UrDestDesc.height = DestImgDesc.height;
1297+
UrDestDesc.depth = DestImgDesc.depth;
1298+
UrDestDesc.arraySize = DestImgDesc.array_size;
13001299

13011300
auto fill_image_type =
13021301
[](const ext::oneapi::experimental::image_descriptor &Desc,
@@ -1319,8 +1318,8 @@ void handler::ext_oneapi_copy(
13191318
}
13201319
};
13211320

1322-
fill_image_type(SrcImageDesc, UrSrcDesc);
1323-
fill_image_type(DestImageDesc, UrDestDesc);
1321+
fill_image_type(SrcImgDesc, UrSrcDesc);
1322+
fill_image_type(DestImgDesc, UrDestDesc);
13241323

13251324
auto fill_format = [](const ext::oneapi::experimental::image_descriptor &Desc,
13261325
ur_image_format_t &UrFormat) {
@@ -1334,8 +1333,8 @@ void handler::ext_oneapi_copy(
13341333
ur_image_format_t UrSrcFormat;
13351334
ur_image_format_t UrDestFormat;
13361335

1337-
fill_format(SrcImageDesc, UrSrcFormat);
1338-
fill_format(DestImageDesc, UrDestFormat);
1336+
fill_format(SrcImgDesc, UrSrcFormat);
1337+
fill_format(DestImgDesc, UrDestFormat);
13391338

13401339
impl->MSrcOffset = {SrcOffset[0], SrcOffset[1], SrcOffset[2]};
13411340
impl->MDestOffset = {DestOffset[0], DestOffset[1], DestOffset[2]};

0 commit comments

Comments
 (0)