Skip to content

Commit 3892fe6

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][ABI Break] Remove AccessorImplHost::MIsESIMDAcc field (#6679)
It had been marked for removal during ABI break window. Do it.
1 parent 65a7365 commit 3892fe6

File tree

3 files changed

+43
-51
lines changed

3 files changed

+43
-51
lines changed

‎sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(SYCL_MINOR_VERSION 7)
3030
set(SYCL_PATCH_VERSION 0)
3131
# Don't forget to re-enable sycl_symbols_windows.dump once we leave ABI-breaking
3232
# window!
33-
set(SYCL_DEV_ABI_VERSION 13)
33+
set(SYCL_DEV_ABI_VERSION 14)
3434
if (SYCL_ADD_DEV_VERSION_POSTFIX)
3535
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
3636
endif()

‎sycl/include/sycl/detail/accessor_impl.hpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ class __SYCL_EXPORT AccessorImplHost {
8282
AccessorImplHost(id<3> Offset, range<3> AccessRange, range<3> MemoryRange,
8383
access::mode AccessMode, void *SYCLMemObject, int Dims,
8484
int ElemSize, int OffsetInBytes = 0,
85-
bool IsSubBuffer = false, bool IsESIMDAcc = false,
85+
bool IsSubBuffer = false,
8686
const property_list &PropertyList = {})
8787
: MOffset(Offset), MAccessRange(AccessRange), MMemoryRange(MemoryRange),
8888
MAccessMode(AccessMode),
8989
MSYCLMemObj((detail::SYCLMemObjI *)SYCLMemObject), MDims(Dims),
9090
MElemSize(ElemSize), MOffsetInBytes(OffsetInBytes),
91-
MIsSubBuffer(IsSubBuffer), MIsESIMDAcc(IsESIMDAcc),
92-
MPropertyList(PropertyList) {}
91+
MIsSubBuffer(IsSubBuffer), MPropertyList(PropertyList) {}
9392

9493
~AccessorImplHost();
9594

@@ -98,7 +97,7 @@ class __SYCL_EXPORT AccessorImplHost {
9897
MMemoryRange(Other.MMemoryRange), MAccessMode(Other.MAccessMode),
9998
MSYCLMemObj(Other.MSYCLMemObj), MDims(Other.MDims),
10099
MElemSize(Other.MElemSize), MOffsetInBytes(Other.MOffsetInBytes),
101-
MIsSubBuffer(Other.MIsSubBuffer), MIsESIMDAcc(Other.MIsESIMDAcc) {}
100+
MIsSubBuffer(Other.MIsSubBuffer) {}
102101

103102
// The resize method provides a way to change the size of the
104103
// allocated memory and corresponding properties for the accessor.
@@ -131,10 +130,6 @@ class __SYCL_EXPORT AccessorImplHost {
131130

132131
bool PerWI = false;
133132

134-
// Outdated, leaving to preserve ABI.
135-
// TODO: Remove during next major release.
136-
bool MIsESIMDAcc;
137-
138133
// To preserve runtime properties
139134
property_list MPropertyList;
140135
};
@@ -149,12 +144,10 @@ class AccessorBaseHost {
149144
int ElemSize, int OffsetInBytes = 0,
150145
bool IsSubBuffer = false,
151146
const PropertyListT &PropertyList = {}) {
152-
impl = std::shared_ptr<AccessorImplHost>(
153-
new AccessorImplHost(Offset, AccessRange, MemoryRange, AccessMode,
154-
(detail::SYCLMemObjI *)SYCLMemObject, Dims,
155-
ElemSize, OffsetInBytes, IsSubBuffer,
156-
/* IsESIMDAcc = */ false,
157-
PropertyList));
147+
impl = std::shared_ptr<AccessorImplHost>(new AccessorImplHost(
148+
Offset, AccessRange, MemoryRange, AccessMode,
149+
(detail::SYCLMemObjI *)SYCLMemObject, Dims, ElemSize, OffsetInBytes,
150+
IsSubBuffer, PropertyList));
158151
}
159152

160153
protected:

‎sycl/test/abi/layout_accessors_host.cpp

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,41 @@
88

99
using namespace sycl;
1010

11-
// CHECK: 0 | class sycl::detail::AccessorImplHost
12-
// CHECK-NEXT: 0 | class sycl::id<3> MOffset
13-
// CHECK-NEXT: 0 | class sycl::detail::array<3> (base)
14-
// CHECK-NEXT: 0 | size_t[3] common_array
15-
// CHECK-NEXT: 24 | class sycl::range<3> MAccessRange
16-
// CHECK-NEXT: 24 | class sycl::detail::array<3> (base)
17-
// CHECK-NEXT: 24 | size_t[3] common_array
18-
// CHECK-NEXT: 48 | class sycl::range<3> MMemoryRange
19-
// CHECK-NEXT: 48 | class sycl::detail::array<3> (base)
20-
// CHECK-NEXT: 48 | size_t[3] common_array
21-
// CHECK-NEXT: 72 | access::mode MAccessMode
22-
// CHECK-NEXT: 80 | detail::SYCLMemObjI * MSYCLMemObj
23-
// CHECK-NEXT: 88 | unsigned int MDims
24-
// CHECK-NEXT: 92 | unsigned int MElemSize
25-
// CHECK-NEXT: 96 | unsigned int MOffsetInBytes
26-
// CHECK-NEXT: 100 | _Bool MIsSubBuffer
27-
// CHECK-NEXT: 104 | void * MData
28-
// CHECK-NEXT: 112 | Command * MBlockedCmd
29-
// CHECK-NEXT: 120 | _Bool PerWI
30-
// CHECK-NEXT: 121 | _Bool MIsESIMDAcc
31-
// CHECK-NEXT: 128 | class sycl::property_list MPropertyList
32-
// CHECK-NEXT: 128 | class sycl::detail::PropertyListBase (base)
33-
// CHECK-NEXT: 128 | class std::bitset<32> MDataLessProps
34-
// CHECK-NEXT: 128 | struct std::_Base_bitset<1> (base)
35-
// CHECK-NEXT: 128 | _WordT _M_w
36-
// CHECK-NEXT: 136 | class std::vector<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > MPropsWithData
37-
// CHECK-NEXT: 136 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > > (base)
38-
// CHECK-NEXT: 136 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl _M_impl
39-
// CHECK-NEXT: 136 | class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
40-
// CHECK-NEXT: 136 | class __gnu_cxx::new_allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
41-
// CHECK-NEXT: 136 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl_data (base)
42-
// CHECK-NEXT: 136 | pointer _M_start
43-
// CHECK-NEXT: 144 | pointer _M_finish
44-
// CHECK-NEXT: 152 | pointer _M_end_of_storage
45-
// CHECK-NEXT: | [sizeof=160, dsize=160, align=8,
46-
// CHECK-NEXT: | nvsize=160, nvalign=8]
11+
// CHECK: 0 | class sycl::detail::AccessorImplHost
12+
// CHECK-NEXT: 0 | class sycl::id<3> MOffset
13+
// CHECK-NEXT: 0 | class sycl::detail::array<3> (base)
14+
// CHECK-NEXT: 0 | size_t[3] common_array
15+
// CHECK-NEXT: 24 | class sycl::range<3> MAccessRange
16+
// CHECK-NEXT: 24 | class sycl::detail::array<3> (base)
17+
// CHECK-NEXT: 24 | size_t[3] common_array
18+
// CHECK-NEXT: 48 | class sycl::range<3> MMemoryRange
19+
// CHECK-NEXT: 48 | class sycl::detail::array<3> (base)
20+
// CHECK-NEXT: 48 | size_t[3] common_array
21+
// CHECK-NEXT: 72 | access::mode MAccessMode
22+
// CHECK-NEXT: 80 | detail::SYCLMemObjI * MSYCLMemObj
23+
// CHECK-NEXT: 88 | unsigned int MDims
24+
// CHECK-NEXT: 92 | unsigned int MElemSize
25+
// CHECK-NEXT: 96 | unsigned int MOffsetInBytes
26+
// CHECK-NEXT: 00 | _Bool MIsSubBuffer
27+
// CHECK-NEXT: 04 | void * MData
28+
// CHECK-NEXT: 12 | Command * MBlockedCmd
29+
// CHECK-NEXT: 20 | _Bool PerWI
30+
// CHECK-NEXT: 28 | class sycl::property_list MPropertyList
31+
// CHECK-NEXT: 28 | class sycl::detail::PropertyListBase (base)
32+
// CHECK-NEXT: 28 | class std::bitset<32> MDataLessProps
33+
// CHECK-NEXT: 28 | struct std::_Base_bitset<1> (base)
34+
// CHECK-NEXT: 28 | _WordT _M_w
35+
// CHECK-NEXT: 36 | class std::vector<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > MPropsWithData
36+
// CHECK-NEXT: 36 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > > (base)
37+
// CHECK-NEXT: 36 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl _M_impl
38+
// CHECK-NEXT: 36 | class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
39+
// CHECK-NEXT: 36 | class __gnu_cxx::new_allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
40+
// CHECK-NEXT: 36 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl_data (base)
41+
// CHECK-NEXT: 36 | pointer _M_start
42+
// CHECK-NEXT: 44 | pointer _M_finish
43+
// CHECK-NEXT: 52 | pointer _M_end_of_storage
44+
// CHECK-NEXT: | [sizeof=160, dsize=160, align=8,
45+
// CHECK-NEXT: | nvsize=160, nvalign=8]
4746

4847
// CHECK: 0 | class sycl::detail::LocalAccessorImplHost
4948
// CHECK-NEXT: 0 | class sycl::range<3> MSize

0 commit comments

Comments
 (0)