Skip to content

Commit 4c8ba45

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web' (2 commits)
2 parents d06bba0 + a6a1a39 commit 4c8ba45

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

devops/dependencies.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2020
},
2121
"level_zero": {
22-
"github_tag": "v1.21.2",
23-
"version": "v1.21.2",
24-
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.21.2",
22+
"github_tag": "v1.20.2",
23+
"version": "v1.20.2",
24+
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.20.2",
2525
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2626
},
2727
"tbb": {

sycl/source/accessor.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,25 @@ const sycl::range<3> &LocalAccessorBaseHost::getSize() const {
119119
return impl->MSize;
120120
}
121121
void *LocalAccessorBaseHost::getPtr() {
122+
// `local_accessor_base::GDBMethodsAnchor` was/is inline and used to call
123+
// `(void)getPtr()` inside. As such, binaries compiled with older toolchain
124+
// are calling this method from the `sycl::local_accessor` ctor on host and we
125+
// cannot "abort" for them.
126+
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
122127
// Must not be/isn't called, user-facing APIs do error-checking.
123128
std::abort();
129+
#endif
124130
return nullptr;
125131
}
126132
void *LocalAccessorBaseHost::getPtr() const {
133+
// `local_accessor_base::GDBMethodsAnchor` was/is inline and used to call
134+
// `(void)getPtr()` inside. As such, binaries compiled with older toolchain
135+
// are calling this method from the `sycl::local_accessor` ctor on host and we
136+
// cannot "abort" for them.
137+
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
127138
// Must not be/isn't called, user-facing APIs do error-checking.
128139
std::abort();
140+
#endif
129141
return nullptr;
130142
}
131143
const property_list &LocalAccessorBaseHost::getPropList() const {

0 commit comments

Comments
 (0)