Skip to content

Commit 2f80b12

Browse files
committed
Revert some ABI breaking changes
1 parent 35f87a7 commit 2f80b12

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

sycl/include/sycl/handler.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,9 +1641,7 @@ class __SYCL_EXPORT handler {
16411641
|| ext::oneapi::experimental::detail::is_struct_with_special_type<
16421642
remove_cv_ref_t<T>>::value; // Structs that contain special types
16431643
};
1644-
1645-
constexpr static int AccessTargetMask = 0x7ff;
1646-
1644+
16471645
/// Sets argument for OpenCL interoperability kernels.
16481646
///
16491647
/// Registers Arg passed as argument # ArgIndex.
@@ -1674,6 +1672,7 @@ class __SYCL_EXPORT handler {
16741672
// accessor object itself.
16751673
if (type::kinds[NumArgs] ==
16761674
detail::kernel_param_kind_t::kind_accessor) {
1675+
constexpr int AccessTargetMask = 0x7ff;
16771676
const access::target target = static_cast<access::target>(
16781677
type::sizes[NumArgs] & AccessTargetMask);
16791678
if (target == target::local) {
@@ -3571,6 +3570,7 @@ class __SYCL_EXPORT handler {
35713570
// during device compilations (by reducing amount of templates we have to
35723571
// instantiate), those are only available during host compilation pass.
35733572
#ifndef __SYCL_DEVICE_ONLY__
3573+
constexpr static int AccessTargetMask = 0x7ff;
35743574
/// According to section 4.7.6.11. of the SYCL specification, a local accessor
35753575
/// must not be used in a SYCL kernel function that is invoked via single_task
35763576
/// or via the simple form of parallel_for that takes a range parameter.

sycl/test/abi/sycl_symbols_windows-sycl-rel-6_3.dump

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@
707707
??_Dexception@_V1@sycl@@QEAAXXZ
708708
??_Fcontext@_V1@sycl@@QEAAXXZ
709709
??_Fqueue@_V1@sycl@@QEAAXXZ
710+
?AccessTargetMask@handler@_V1@sycl@@0HB
710711
?Clear@exception_list@_V1@sycl@@AEAAXXZ
711712
?DirSep@OSUtil@detail@_V1@sycl@@2QEBDEB
712713
?DisableRangeRounding@handler@_V1@sycl@@AEAA_NXZ

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@
715715
??_Dexception@_V1@sycl@@QEAAXXZ
716716
??_Fcontext@_V1@sycl@@QEAAXXZ
717717
??_Fqueue@_V1@sycl@@QEAAXXZ
718+
?AccessTargetMask@handler@_V1@sycl@@0HB
718719
?Clear@exception_list@_V1@sycl@@AEAAXXZ
719720
?DirSep@OSUtil@detail@_V1@sycl@@2QEBDEB
720721
?DisableRangeRounding@handler@_V1@sycl@@AEAA_NXZ
@@ -3836,7 +3837,6 @@
38363837
?category@exception@_V1@sycl@@QEBAAEBVerror_category@std@@XZ
38373838
?checkNodePropertiesAndThrow@modifiable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@KAXAEBVproperty_list@67@@Z
38383839
?clearArgs@handler@_V1@sycl@@AEAAXXZ
3839-
?AccessTargetMask@handler@_V1@sycl@@2HB
38403840
?incrementArgShift@handler@_V1@sycl@@AEAAXH@Z
38413841
?code@exception@_V1@sycl@@QEBAAEBVerror_code@std@@XZ
38423842
?compile_from_source@detail@experimental@oneapi@ext@_V1@sycl@@YA?AV?$kernel_bundle@$00@56@AEAV?$kernel_bundle@$02@56@AEBV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@AEBV?$vector@Vstring_view@detail@_V1@sycl@@V?$allocator@Vstring_view@detail@_V1@sycl@@@std@@@std@@PEAVstring@156@2@Z

0 commit comments

Comments
 (0)