Skip to content

Commit dbddb82

Browse files
aarongreigaarongreig
authored
[ABI-Break][SYCL] Remove deprecated property use_primary_context (#13496)
1 parent ac556f9 commit dbddb82

File tree

10 files changed

+4
-159
lines changed

10 files changed

+4
-159
lines changed

‎sycl/include/sycl/detail/cuda_definitions.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
// Mem Object info: Retrieve the raw CUDA pointer from a cl_mem
1515
#define __SYCL_PI_CUDA_RAW_POINTER (0xFF01)
16-
// Context creation: Use a primary CUDA context instead of a custom one by
17-
// providing a property value of PI_TRUE for the following
18-
// property ID.
19-
#define __SYCL_PI_CONTEXT_PROPERTIES_CUDA_PRIMARY (0xFF02)
2016

2117
// PI Command Queue using Default stream
2218
#define __SYCL_PI_CUDA_USE_DEFAULT_STREAM (0xFF03)

‎sycl/include/sycl/detail/properties_traits.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ __SYCL_PARAM_TRAITS_SPEC(
88
sycl::ext::oneapi::property::buffer::use_pinned_host_memory)
99
__SYCL_PARAM_TRAITS_SPEC(sycl::property::noinit)
1010
__SYCL_PARAM_TRAITS_SPEC(sycl::property::no_init)
11-
__SYCL_PARAM_TRAITS_SPEC(
12-
sycl::property::context::cuda::use_primary_context) // Deprecated
13-
__SYCL_PARAM_TRAITS_SPEC(
14-
sycl::ext::oneapi::cuda::property::context::use_primary_context) // Deprecated
1511
__SYCL_PARAM_TRAITS_SPEC(sycl::property::queue::in_order)
1612
__SYCL_PARAM_TRAITS_SPEC(sycl::property::reduction::initialize_to_identity)
1713
__SYCL_PARAM_TRAITS_SPEC(sycl::ext::oneapi::property::queue::priority_low)

‎sycl/include/sycl/properties/all_properties.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <sycl/ext/codeplay/experimental/fusion_properties.hpp>
1212
#include <sycl/properties/accessor_properties.hpp>
1313
#include <sycl/properties/buffer_properties.hpp>
14-
#include <sycl/properties/context_properties.hpp>
1514
#include <sycl/properties/image_properties.hpp>
1615
#include <sycl/properties/queue_properties.hpp>
1716
#include <sycl/properties/reduction_properties.hpp>

‎sycl/include/sycl/properties/context_properties.hpp

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎sycl/source/detail/context_impl.cpp

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <sycl/exception_list.hpp>
2020
#include <sycl/info/info_desc.hpp>
2121
#include <sycl/platform.hpp>
22-
#include <sycl/properties/context_properties.hpp>
2322
#include <sycl/property_list.hpp>
2423

2524
#include <algorithm>
@@ -61,21 +60,8 @@ context_impl::context_impl(const std::vector<sycl::device> Devices,
6160
DeviceIds.push_back(getSyclObjImpl(D)->getHandleRef());
6261
}
6362

64-
if (getBackend() == backend::ext_oneapi_cuda) {
65-
const bool UseCUDAPrimaryContext = MPropList.has_property<
66-
ext::oneapi::cuda::property::context::use_primary_context>();
67-
const pi_context_properties Props[] = {
68-
static_cast<pi_context_properties>(
69-
__SYCL_PI_CONTEXT_PROPERTIES_CUDA_PRIMARY),
70-
static_cast<pi_context_properties>(UseCUDAPrimaryContext), 0};
71-
72-
getPlugin()->call<PiApiKind::piContextCreate>(
73-
Props, DeviceIds.size(), DeviceIds.data(), nullptr, nullptr, &MContext);
74-
} else {
75-
getPlugin()->call<PiApiKind::piContextCreate>(nullptr, DeviceIds.size(),
76-
DeviceIds.data(), nullptr,
77-
nullptr, &MContext);
78-
}
63+
getPlugin()->call<PiApiKind::piContextCreate>(
64+
nullptr, DeviceIds.size(), DeviceIds.data(), nullptr, nullptr, &MContext);
7965

8066
MKernelProgramCache.setContextPtr(this);
8167
}

‎sycl/source/detail/queue_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <sycl/exception.hpp>
2929
#include <sycl/exception_list.hpp>
3030
#include <sycl/ext/codeplay/experimental/fusion_properties.hpp>
31-
#include <sycl/properties/context_properties.hpp>
31+
#include <sycl/handler.hpp>
3232
#include <sycl/properties/queue_properties.hpp>
3333
#include <sycl/property_list.hpp>
3434
#include <sycl/queue.hpp>

‎sycl/test-e2e/Basic/context.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main() {
5757
assert(Context == WillContextCopy);
5858
}
5959
{
60-
auto AsyncHandler = [](const sycl::exception_list &EL) {};
60+
auto AsyncHandler = [](const sycl::exception_list) {};
6161
sycl::context Context1(sycl::property_list{});
6262
sycl::context Context2(AsyncHandler, sycl::property_list{});
6363
sycl::context Context3(deviceA, sycl::property_list{});
@@ -67,19 +67,5 @@ int main() {
6767
sycl::property_list{});
6868
sycl::context Context7(std::vector<sycl::device>{deviceA},
6969
sycl::property_list{});
70-
sycl::context Context8(
71-
std::vector<sycl::device>{deviceA}, AsyncHandler,
72-
sycl::property_list{
73-
sycl::ext::oneapi::cuda::property::context::use_primary_context{}});
74-
75-
if (!Context8.has_property<sycl::ext::oneapi::cuda::property::context::
76-
use_primary_context>()) {
77-
std::cerr << "Line " << __LINE__ << ": Property was not found"
78-
<< std::endl;
79-
return 1;
80-
}
81-
82-
auto Prop = Context8.get_property<
83-
sycl::ext::oneapi::cuda::property::context::use_primary_context>();
8470
}
8571
}

‎sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,7 +3713,6 @@ _ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext8codeplay12experimental4info6
37133713
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext8codeplay12experimental4info6device28max_registers_per_work_groupEEENT_11return_typeEv
37143714
_ZNK4sycl3_V16detail11image_plain10getSamplerEv
37153715
_ZNK4sycl3_V16detail11image_plain11getRowPitchEv
3716-
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
37173716
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
37183717
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
37193718
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -3727,10 +3726,8 @@ _ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer12use_host_p
37273726
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer13context_boundEEET_v
37283727
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer9use_mutexEEET_v
37293728
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6noinitEEET_v
3730-
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
37313729
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property7no_initEEET_v
37323730
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
3733-
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
37343731
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
37353732
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
37363733
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -3744,7 +3741,6 @@ _ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer12use_host_p
37443741
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer13context_boundEEEbv
37453742
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer9use_mutexEEEbv
37463743
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6noinitEEEbv
3747-
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
37483744
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property7no_initEEEbv
37493745
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
37503746
_ZNK4sycl3_V16detail11image_plain13getSlicePitchEv
@@ -3756,7 +3752,6 @@ _ZNK4sycl3_V16detail11image_plain8get_sizeEv
37563752
_ZNK4sycl3_V16detail11image_plain9get_countEv
37573753
_ZNK4sycl3_V16detail11image_plain9get_pitchEv
37583754
_ZNK4sycl3_V16detail11image_plain9get_rangeEv
3759-
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
37603755
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
37613756
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
37623757
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -3770,10 +3765,8 @@ _ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer12use_host_
37703765
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer13context_boundEEET_v
37713766
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer9use_mutexEEET_v
37723767
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6noinitEEET_v
3773-
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
37743768
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property7no_initEEET_v
37753769
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
3776-
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
37773770
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
37783771
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
37793772
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -3787,7 +3780,6 @@ _ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer12use_host_
37873780
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer13context_boundEEEbv
37883781
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer9use_mutexEEEbv
37893782
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6noinitEEEbv
3790-
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
37913783
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property7no_initEEEbv
37923784
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
37933785
_ZNK4sycl3_V16detail12buffer_plain13handleReleaseEv
@@ -4032,7 +4024,6 @@ _ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific22compile_sub_gro
40324024
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific23compile_work_group_sizeEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE
40334025
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific34preferred_work_group_size_multipleEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE
40344026
_ZNK4sycl3_V16kernel9getNativeEv
4035-
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
40364027
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
40374028
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
40384029
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4046,10 +4037,8 @@ _ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
40464037
_ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer13context_boundEEET_v
40474038
_ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer9use_mutexEEET_v
40484039
_ZNK4sycl3_V16stream12get_propertyINS0_8property6noinitEEET_v
4049-
_ZNK4sycl3_V16stream12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
40504040
_ZNK4sycl3_V16stream12get_propertyINS0_8property7no_initEEET_v
40514041
_ZNK4sycl3_V16stream12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4052-
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
40534042
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
40544043
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
40554044
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4063,7 +4052,6 @@ _ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
40634052
_ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer13context_boundEEEbv
40644053
_ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer9use_mutexEEEbv
40654054
_ZNK4sycl3_V16stream12has_propertyINS0_8property6noinitEEEbv
4066-
_ZNK4sycl3_V16stream12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
40674055
_ZNK4sycl3_V16stream12has_propertyINS0_8property7no_initEEEbv
40684056
_ZNK4sycl3_V16stream12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
40694057
_ZNK4sycl3_V16stream22get_max_statement_sizeEv
@@ -4075,7 +4063,6 @@ _ZNK4sycl3_V16streamneERKS1_
40754063
_ZNK4sycl3_V17context11get_backendEv
40764064
_ZNK4sycl3_V17context11get_devicesEv
40774065
_ZNK4sycl3_V17context12get_platformEv
4078-
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
40794066
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
40804067
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
40814068
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4089,10 +4076,8 @@ _ZNK4sycl3_V17context12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
40894076
_ZNK4sycl3_V17context12get_propertyINS0_8property6buffer13context_boundEEET_v
40904077
_ZNK4sycl3_V17context12get_propertyINS0_8property6buffer9use_mutexEEET_v
40914078
_ZNK4sycl3_V17context12get_propertyINS0_8property6noinitEEET_v
4092-
_ZNK4sycl3_V17context12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
40934079
_ZNK4sycl3_V17context12get_propertyINS0_8property7no_initEEET_v
40944080
_ZNK4sycl3_V17context12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4095-
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
40964081
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
40974082
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
40984083
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4106,7 +4091,6 @@ _ZNK4sycl3_V17context12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
41064091
_ZNK4sycl3_V17context12has_propertyINS0_8property6buffer13context_boundEEEbv
41074092
_ZNK4sycl3_V17context12has_propertyINS0_8property6buffer9use_mutexEEEbv
41084093
_ZNK4sycl3_V17context12has_propertyINS0_8property6noinitEEEbv
4109-
_ZNK4sycl3_V17context12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
41104094
_ZNK4sycl3_V17context12has_propertyINS0_8property7no_initEEEbv
41114095
_ZNK4sycl3_V17context12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
41124096
_ZNK4sycl3_V17context16get_backend_infoINS0_4info6device15backend_versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
@@ -4127,7 +4111,6 @@ _ZNK4sycl3_V17handler16getDeviceBackendEv
41274111
_ZNK4sycl3_V17handler17getContextImplPtrEv
41284112
_ZNK4sycl3_V17handler27isStateExplicitKernelBundleEv
41294113
_ZNK4sycl3_V17handler30getOrInsertHandlerKernelBundleEb
4130-
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
41314114
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
41324115
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
41334116
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4141,10 +4124,8 @@ _ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
41414124
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer13context_boundEEET_v
41424125
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer9use_mutexEEET_v
41434126
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6noinitEEET_v
4144-
_ZNK4sycl3_V17sampler12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
41454127
_ZNK4sycl3_V17sampler12get_propertyINS0_8property7no_initEEET_v
41464128
_ZNK4sycl3_V17sampler12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4147-
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
41484129
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
41494130
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
41504131
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4158,7 +4139,6 @@ _ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
41584139
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer13context_boundEEEbv
41594140
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer9use_mutexEEEbv
41604141
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6noinitEEEbv
4161-
_ZNK4sycl3_V17sampler12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
41624142
_ZNK4sycl3_V17sampler12has_propertyINS0_8property7no_initEEEbv
41634143
_ZNK4sycl3_V17sampler12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
41644144
_ZNK4sycl3_V17sampler18get_filtering_modeEv

0 commit comments

Comments
 (0)