Skip to content

Commit 735f1ee

Browse files
aarongreigaarongreig
authored
[ABI-Break][SYCL] Remove deprecated property use_primary_context (#13378)
1 parent fd439fb commit 735f1ee

File tree

10 files changed

+3
-159
lines changed

10 files changed

+3
-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>
@@ -63,21 +62,8 @@ context_impl::context_impl(const std::vector<sycl::device> Devices,
6362
DeviceIds.push_back(getSyclObjImpl(D)->getHandleRef());
6463
}
6564

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

8268
MKernelProgramCache.setContextPtr(this);
8369
}

‎sycl/source/detail/queue_impl.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <sycl/exception_list.hpp>
2828
#include <sycl/ext/codeplay/experimental/fusion_properties.hpp>
2929
#include <sycl/handler.hpp>
30-
#include <sycl/properties/context_properties.hpp>
3130
#include <sycl/properties/queue_properties.hpp>
3231
#include <sycl/property_list.hpp>
3332
#include <sycl/queue.hpp>

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int main() {
5353
assert(Context == WillContextCopy);
5454
}
5555
{
56-
auto AsyncHandler = [](const sycl::exception_list &EL) {};
56+
auto AsyncHandler = [](const sycl::exception_list) {};
5757
sycl::context Context1(sycl::property_list{});
5858
sycl::context Context2(AsyncHandler, sycl::property_list{});
5959
sycl::context Context3(deviceA, sycl::property_list{});
@@ -63,19 +63,5 @@ int main() {
6363
sycl::property_list{});
6464
sycl::context Context7(std::vector<sycl::device>{deviceA},
6565
sycl::property_list{});
66-
sycl::context Context8(
67-
std::vector<sycl::device>{deviceA}, AsyncHandler,
68-
sycl::property_list{
69-
sycl::ext::oneapi::cuda::property::context::use_primary_context{}});
70-
71-
if (!Context8.has_property<sycl::ext::oneapi::cuda::property::context::
72-
use_primary_context>()) {
73-
std::cerr << "Line " << __LINE__ << ": Property was not found"
74-
<< std::endl;
75-
return 1;
76-
}
77-
78-
auto Prop = Context8.get_property<
79-
sycl::ext::oneapi::cuda::property::context::use_primary_context>();
8066
}
8167
}

‎sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3795,7 +3795,6 @@ _ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext8codeplay12experimental4info6
37953795
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext8codeplay12experimental4info6device28max_registers_per_work_groupEEENT_11return_typeEv
37963796
_ZNK4sycl3_V16detail11image_plain10getSamplerEv
37973797
_ZNK4sycl3_V16detail11image_plain11getRowPitchEv
3798-
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
37993798
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
38003799
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
38013800
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -3809,10 +3808,8 @@ _ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer12use_host_p
38093808
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer13context_boundEEET_v
38103809
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6buffer9use_mutexEEET_v
38113810
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property6noinitEEET_v
3812-
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
38133811
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property7no_initEEET_v
38143812
_ZNK4sycl3_V16detail11image_plain12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
3815-
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
38163813
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
38173814
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
38183815
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -3826,7 +3823,6 @@ _ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer12use_host_p
38263823
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer13context_boundEEEbv
38273824
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6buffer9use_mutexEEEbv
38283825
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property6noinitEEEbv
3829-
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
38303826
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property7no_initEEEbv
38313827
_ZNK4sycl3_V16detail11image_plain12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
38323828
_ZNK4sycl3_V16detail11image_plain13getSlicePitchEv
@@ -3842,7 +3838,6 @@ _ZNK4sycl3_V16detail11stream_impl22get_max_statement_sizeEv
38423838
_ZNK4sycl3_V16detail11stream_impl25get_work_item_buffer_sizeEv
38433839
_ZNK4sycl3_V16detail11stream_impl4sizeEv
38443840
_ZNK4sycl3_V16detail11stream_impl8get_sizeEv
3845-
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
38463841
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
38473842
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
38483843
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -3856,10 +3851,8 @@ _ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer12use_host_
38563851
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer13context_boundEEET_v
38573852
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6buffer9use_mutexEEET_v
38583853
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property6noinitEEET_v
3859-
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
38603854
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property7no_initEEET_v
38613855
_ZNK4sycl3_V16detail12buffer_plain12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
3862-
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
38633856
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
38643857
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
38653858
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -3873,7 +3866,6 @@ _ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer12use_host_
38733866
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer13context_boundEEEbv
38743867
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6buffer9use_mutexEEEbv
38753868
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property6noinitEEEbv
3876-
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
38773869
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property7no_initEEEbv
38783870
_ZNK4sycl3_V16detail12buffer_plain12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
38793871
_ZNK4sycl3_V16detail12buffer_plain13handleReleaseEv
@@ -4117,7 +4109,6 @@ _ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific22compile_sub_gro
41174109
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific23compile_work_group_sizeEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE
41184110
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific34preferred_work_group_size_multipleEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE
41194111
_ZNK4sycl3_V16kernel9getNativeEv
4120-
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
41214112
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
41224113
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
41234114
_ZNK4sycl3_V16stream12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4131,10 +4122,8 @@ _ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
41314122
_ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer13context_boundEEET_v
41324123
_ZNK4sycl3_V16stream12get_propertyINS0_8property6buffer9use_mutexEEET_v
41334124
_ZNK4sycl3_V16stream12get_propertyINS0_8property6noinitEEET_v
4134-
_ZNK4sycl3_V16stream12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
41354125
_ZNK4sycl3_V16stream12get_propertyINS0_8property7no_initEEET_v
41364126
_ZNK4sycl3_V16stream12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4137-
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
41384127
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
41394128
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
41404129
_ZNK4sycl3_V16stream12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4148,7 +4137,6 @@ _ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
41484137
_ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer13context_boundEEEbv
41494138
_ZNK4sycl3_V16stream12has_propertyINS0_8property6buffer9use_mutexEEEbv
41504139
_ZNK4sycl3_V16stream12has_propertyINS0_8property6noinitEEEbv
4151-
_ZNK4sycl3_V16stream12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
41524140
_ZNK4sycl3_V16stream12has_propertyINS0_8property7no_initEEEbv
41534141
_ZNK4sycl3_V16stream12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
41544142
_ZNK4sycl3_V16stream22get_max_statement_sizeEv
@@ -4160,7 +4148,6 @@ _ZNK4sycl3_V16streamneERKS1_
41604148
_ZNK4sycl3_V17context11get_backendEv
41614149
_ZNK4sycl3_V17context11get_devicesEv
41624150
_ZNK4sycl3_V17context12get_platformEv
4163-
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
41644151
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
41654152
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
41664153
_ZNK4sycl3_V17context12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4174,10 +4161,8 @@ _ZNK4sycl3_V17context12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
41744161
_ZNK4sycl3_V17context12get_propertyINS0_8property6buffer13context_boundEEET_v
41754162
_ZNK4sycl3_V17context12get_propertyINS0_8property6buffer9use_mutexEEET_v
41764163
_ZNK4sycl3_V17context12get_propertyINS0_8property6noinitEEET_v
4177-
_ZNK4sycl3_V17context12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
41784164
_ZNK4sycl3_V17context12get_propertyINS0_8property7no_initEEET_v
41794165
_ZNK4sycl3_V17context12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4180-
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
41814166
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
41824167
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
41834168
_ZNK4sycl3_V17context12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4191,7 +4176,6 @@ _ZNK4sycl3_V17context12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
41914176
_ZNK4sycl3_V17context12has_propertyINS0_8property6buffer13context_boundEEEbv
41924177
_ZNK4sycl3_V17context12has_propertyINS0_8property6buffer9use_mutexEEEbv
41934178
_ZNK4sycl3_V17context12has_propertyINS0_8property6noinitEEEbv
4194-
_ZNK4sycl3_V17context12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
41954179
_ZNK4sycl3_V17context12has_propertyINS0_8property7no_initEEEbv
41964180
_ZNK4sycl3_V17context12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
41974181
_ZNK4sycl3_V17context16get_backend_infoINS0_4info6device15backend_versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
@@ -4211,7 +4195,6 @@ _ZNK4sycl3_V17handler15getCommandGraphEv
42114195
_ZNK4sycl3_V17handler17getContextImplPtrEv
42124196
_ZNK4sycl3_V17handler27isStateExplicitKernelBundleEv
42134197
_ZNK4sycl3_V17handler30getOrInsertHandlerKernelBundleEb
4214-
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEET_v
42154198
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue12priority_lowEEET_v
42164199
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue13priority_highEEET_v
42174200
_ZNK4sycl3_V17sampler12get_propertyINS0_3ext6oneapi8property5queue15priority_normalEEET_v
@@ -4225,10 +4208,8 @@ _ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer12use_host_ptrEEET_v
42254208
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer13context_boundEEET_v
42264209
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6buffer9use_mutexEEET_v
42274210
_ZNK4sycl3_V17sampler12get_propertyINS0_8property6noinitEEET_v
4228-
_ZNK4sycl3_V17sampler12get_propertyINS0_8property7context4cuda19use_primary_contextEEET_v
42294211
_ZNK4sycl3_V17sampler12get_propertyINS0_8property7no_initEEET_v
42304212
_ZNK4sycl3_V17sampler12get_propertyINS0_8property9reduction22initialize_to_identityEEET_v
4231-
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi4cuda8property7context19use_primary_contextEEEbv
42324213
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue12priority_lowEEEbv
42334214
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue13priority_highEEEbv
42344215
_ZNK4sycl3_V17sampler12has_propertyINS0_3ext6oneapi8property5queue15priority_normalEEEbv
@@ -4242,7 +4223,6 @@ _ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer12use_host_ptrEEEbv
42424223
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer13context_boundEEEbv
42434224
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6buffer9use_mutexEEEbv
42444225
_ZNK4sycl3_V17sampler12has_propertyINS0_8property6noinitEEEbv
4245-
_ZNK4sycl3_V17sampler12has_propertyINS0_8property7context4cuda19use_primary_contextEEEbv
42464226
_ZNK4sycl3_V17sampler12has_propertyINS0_8property7no_initEEEbv
42474227
_ZNK4sycl3_V17sampler12has_propertyINS0_8property9reduction22initialize_to_identityEEEbv
42484228
_ZNK4sycl3_V17sampler18get_filtering_modeEv

0 commit comments

Comments
 (0)