Skip to content

Commit 0e98f26

Browse files
DBDuncanDBDuncan
authored
[SYCL] Re-add removed symbols breaking ABI (#19274)
These symbols were accidentality removed in #18851
1 parent 49405f5 commit 0e98f26

File tree

4 files changed

+90
-0
lines changed

4 files changed

+90
-0
lines changed

‎sycl/include/sycl/handler.hpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,6 +3716,9 @@ class __SYCL_EXPORT handler {
37163716
void setKernelIsCooperative(bool);
37173717

37183718
// Set using cuda thread block cluster launch flag and set the launch bounds.
3719+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
3720+
void setKernelClusterLaunch(sycl::range<3> ClusterSize, int Dims);
3721+
#endif
37193722
void setKernelClusterLaunch(sycl::range<3> ClusterSize);
37203723
void setKernelClusterLaunch(sycl::range<2> ClusterSize);
37213724
void setKernelClusterLaunch(sycl::range<1> ClusterSize);
@@ -3819,6 +3822,16 @@ class __SYCL_EXPORT handler {
38193822
bool HasAssociatedAccessor(detail::AccessorImplHost *Req,
38203823
access::target AccessTarget) const;
38213824

3825+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
3826+
void setNDRangeDescriptorPadded(sycl::range<3> N, bool SetNumWorkGroups,
3827+
int Dims);
3828+
void setNDRangeDescriptorPadded(sycl::range<3> NumWorkItems,
3829+
sycl::id<3> Offset, int Dims);
3830+
void setNDRangeDescriptorPadded(sycl::range<3> NumWorkItems,
3831+
sycl::range<3> LocalSize, sycl::id<3> Offset,
3832+
int Dims);
3833+
#endif
3834+
38223835
template <int Dims>
38233836
void setNDRangeDescriptor(sycl::range<Dims> N,
38243837
bool SetNumWorkGroups = false) {

‎sycl/source/handler.cpp

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,6 +2241,25 @@ void handler::setKernelIsCooperative(bool KernelIsCooperative) {
22412241
impl->MKernelIsCooperative = KernelIsCooperative;
22422242
}
22432243

2244+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
2245+
void handler::setKernelClusterLaunch(sycl::range<3> ClusterSize, int Dims) {
2246+
throwIfGraphAssociated<
2247+
syclex::detail::UnsupportedGraphFeatures::
2248+
sycl_ext_oneapi_experimental_cuda_cluster_launch>();
2249+
impl->MKernelUsesClusterLaunch = true;
2250+
2251+
if (Dims == 1) {
2252+
sycl::range<1> ClusterSizeTrimmed = {ClusterSize[0]};
2253+
impl->MNDRDesc.setClusterDimensions(ClusterSizeTrimmed);
2254+
} else if (Dims == 2) {
2255+
sycl::range<2> ClusterSizeTrimmed = {ClusterSize[0], ClusterSize[1]};
2256+
impl->MNDRDesc.setClusterDimensions(ClusterSizeTrimmed);
2257+
} else if (Dims == 3) {
2258+
impl->MNDRDesc.setClusterDimensions(ClusterSize);
2259+
}
2260+
}
2261+
#endif
2262+
22442263
void handler::setKernelClusterLaunch(sycl::range<3> ClusterSize) {
22452264
throwIfGraphAssociated<
22462265
syclex::detail::UnsupportedGraphFeatures::
@@ -2417,6 +2436,56 @@ bool handler::HasAssociatedAccessor(detail::AccessorImplHost *Req,
24172436
void handler::setType(sycl::detail::CGType Type) { impl->MCGType = Type; }
24182437
sycl::detail::CGType handler::getType() const { return impl->MCGType; }
24192438

2439+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
2440+
void handler::setNDRangeDescriptorPadded(sycl::range<3> N,
2441+
bool SetNumWorkGroups, int Dims) {
2442+
if (Dims == 1) {
2443+
sycl::range<1> Range = {N[0]};
2444+
impl->MNDRDesc = NDRDescT{Range, SetNumWorkGroups};
2445+
} else if (Dims == 2) {
2446+
sycl::range<2> Range = {N[0], N[1]};
2447+
impl->MNDRDesc = NDRDescT{Range, SetNumWorkGroups};
2448+
} else if (Dims == 3) {
2449+
impl->MNDRDesc = NDRDescT{N, SetNumWorkGroups};
2450+
}
2451+
}
2452+
2453+
void handler::setNDRangeDescriptorPadded(sycl::range<3> NumWorkItems,
2454+
sycl::id<3> Offset, int Dims) {
2455+
if (Dims == 1) {
2456+
sycl::range<1> NumWorkItemsTrimmed = {NumWorkItems[0]};
2457+
sycl::id<1> OffsetTrimmed = {Offset[0]};
2458+
impl->MNDRDesc = NDRDescT{NumWorkItemsTrimmed, OffsetTrimmed};
2459+
} else if (Dims == 2) {
2460+
sycl::range<2> NumWorkItemsTrimmed = {NumWorkItems[0], NumWorkItems[1]};
2461+
sycl::id<2> OffsetTrimmed = {Offset[0], Offset[1]};
2462+
impl->MNDRDesc = NDRDescT{NumWorkItemsTrimmed, OffsetTrimmed};
2463+
} else if (Dims == 3) {
2464+
impl->MNDRDesc = NDRDescT{NumWorkItems, Offset};
2465+
}
2466+
}
2467+
2468+
void handler::setNDRangeDescriptorPadded(sycl::range<3> NumWorkItems,
2469+
sycl::range<3> LocalSize,
2470+
sycl::id<3> Offset, int Dims) {
2471+
if (Dims == 1) {
2472+
sycl::range<1> NumWorkItemsTrimmed = {NumWorkItems[0]};
2473+
sycl::range<1> LocalSizeTrimmed = {LocalSize[0]};
2474+
sycl::id<1> OffsetTrimmed = {Offset[0]};
2475+
impl->MNDRDesc =
2476+
NDRDescT{NumWorkItemsTrimmed, LocalSizeTrimmed, OffsetTrimmed};
2477+
} else if (Dims == 2) {
2478+
sycl::range<2> NumWorkItemsTrimmed = {NumWorkItems[0], NumWorkItems[1]};
2479+
sycl::range<2> LocalSizeTrimmed = {LocalSize[0], LocalSize[1]};
2480+
sycl::id<2> OffsetTrimmed = {Offset[0], Offset[1]};
2481+
impl->MNDRDesc =
2482+
NDRDescT{NumWorkItemsTrimmed, LocalSizeTrimmed, OffsetTrimmed};
2483+
} else if (Dims == 3) {
2484+
impl->MNDRDesc = NDRDescT{NumWorkItems, LocalSize, Offset};
2485+
}
2486+
}
2487+
#endif
2488+
24202489
void handler::setNDRangeDescriptor(sycl::range<3> N, bool SetNumWorkGroups) {
24212490
impl->MNDRDesc = NDRDescT{N, SetNumWorkGroups};
24222491
}

‎sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3591,6 +3591,7 @@ _ZN4sycl3_V17handler22setHandlerKernelBundleERKSt10shared_ptrINS0_6detail18kerne
35913591
_ZN4sycl3_V17handler22setKernelClusterLaunchENS0_5rangeILi1EEE
35923592
_ZN4sycl3_V17handler22setKernelClusterLaunchENS0_5rangeILi2EEE
35933593
_ZN4sycl3_V17handler22setKernelClusterLaunchENS0_5rangeILi3EEE
3594+
_ZN4sycl3_V17handler22setKernelClusterLaunchENS0_5rangeILi3EEEi
35943595
_ZN4sycl3_V17handler22setKernelIsCooperativeEb
35953596
_ZN4sycl3_V17handler23instantiateKernelOnHostEPv
35963597
_ZN4sycl3_V17handler24GetRangeRoundingSettingsERmS2_S2_
@@ -3602,6 +3603,9 @@ _ZN4sycl3_V17handler24registerDynamicParameterERNS0_3ext6oneapi12experimental6de
36023603
_ZN4sycl3_V17handler25ext_intel_write_host_pipeENS0_6detail11string_viewEPvmb
36033604
_ZN4sycl3_V17handler26associateWithHandlerCommonESt10shared_ptrINS0_6detail16AccessorImplHostEEi
36043605
_ZN4sycl3_V17handler26setKernelNameBasedCachePtrEPNS0_6detail21KernelNameBasedCacheTE
3606+
_ZN4sycl3_V17handler26setNDRangeDescriptorPaddedENS0_5rangeILi3EEENS0_2idILi3EEEi
3607+
_ZN4sycl3_V17handler26setNDRangeDescriptorPaddedENS0_5rangeILi3EEES3_NS0_2idILi3EEEi
3608+
_ZN4sycl3_V17handler26setNDRangeDescriptorPaddedENS0_5rangeILi3EEEbi
36053609
_ZN4sycl3_V17handler27addLifetimeSharedPtrStorageESt10shared_ptrIKvE
36063610
_ZN4sycl3_V17handler27computeFallbackKernelBoundsEmm
36073611
_ZN4sycl3_V17handler28extractArgsAndReqsFromLambdaEPcPFNS0_6detail19kernel_param_desc_tEiEmb

‎sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4405,6 +4405,7 @@
44054405
?setKernelClusterLaunch@handler@_V1@sycl@@AEAAXV?$range@$00@23@@Z
44064406
?setKernelClusterLaunch@handler@_V1@sycl@@AEAAXV?$range@$01@23@@Z
44074407
?setKernelClusterLaunch@handler@_V1@sycl@@AEAAXV?$range@$02@23@@Z
4408+
?setKernelClusterLaunch@handler@_V1@sycl@@AEAAXV?$range@$02@23@H@Z
44084409
?setKernelInfo@handler@_V1@sycl@@AEAAXPEAXHP6A?AUkernel_param_desc_t@detail@23@H@Z_N2@Z
44094410
?setKernelIsCooperative@handler@_V1@sycl@@AEAAX_N@Z
44104411
?setKernelNameBasedCachePtr@handler@_V1@sycl@@AEAAXPEAUKernelNameBasedCacheT@detail@23@@Z
@@ -4419,6 +4420,9 @@
44194420
?setNDRangeDescriptor@handler@_V1@sycl@@AEAAXV?$range@$02@23@0V?$id@$02@23@@Z
44204421
?setNDRangeDescriptor@handler@_V1@sycl@@AEAAXV?$range@$02@23@V?$id@$02@23@@Z
44214422
?setNDRangeDescriptor@handler@_V1@sycl@@AEAAXV?$range@$02@23@_N@Z
4423+
?setNDRangeDescriptorPadded@handler@_V1@sycl@@AEAAXV?$range@$02@23@V?$id@$02@23@H@Z
4424+
?setNDRangeDescriptorPadded@handler@_V1@sycl@@AEAAXV?$range@$02@23@0V?$id@$02@23@H@Z
4425+
?setNDRangeDescriptorPadded@handler@_V1@sycl@@AEAAXV?$range@$02@23@_NH@Z
44224426
?setNDRangeUsed@handler@_V1@sycl@@AEAAX_N@Z
44234427
?setStateExplicitKernelBundle@handler@_V1@sycl@@AEAAXXZ
44244428
?setStateSpecConstSet@handler@_V1@sycl@@AEAAXXZ

0 commit comments

Comments
 (0)