Skip to content

Commit 526e595

Browse files
Closes gh-1358
Removes deprecated DPCTLDevice_GetMaxWorkItemSizes. Added Null_DRef tests for DPCTLDevice_GetMaxWorkItemSizes1d, DPCTLDevice_GetMaxWorkItemSizes2d, DPCTLDevice_GetMaxWorkItemSizes3d
1 parent abc8c80 commit 526e595

File tree

3 files changed

+17
-33
lines changed

3 files changed

+17
-33
lines changed

libsyclinterface/include/dpctl_sycl_device_interface.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,6 @@ DPCTL_API
233233
__dpctl_keep size_t *
234234
DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef);
235235

236-
/*!
237-
* @brief Wrapper for deprecated get_info<info::device::max_work_item_sizes>().
238-
*
239-
* @param DRef Opaque pointer to a ``sycl::device``
240-
* @return Returns the valid result if device exists else returns NULL.
241-
* @ingroup DeviceInterface
242-
*/
243-
#if __cplusplus || (defined(__GNUC__) && __GNUC__ > 10)
244-
[[deprecated("Use DPCTLDevice_WorkItemSizes3d instead")]]
245-
#endif
246-
DPCTL_API __dpctl_keep size_t *
247-
DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef);
248-
249236
/*!
250237
* @brief Wrapper for get_info<info::device::max_work_group_size>().
251238
*

libsyclinterface/source/dpctl_sycl_device_interface.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,6 @@ DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef)
266266
return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef);
267267
}
268268

269-
__dpctl_keep size_t *
270-
DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef)
271-
{
272-
return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef);
273-
}
274-
275269
size_t
276270
DPCTLDevice_GetMaxWorkGroupSize(__dpctl_keep const DPCTLSyclDeviceRef DRef)
277271
{

libsyclinterface/tests/test_sycl_device_interface.cpp

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ struct TestDPCTLSyclDeviceInterface
5757
}
5858
}
5959

60-
~TestDPCTLSyclDeviceInterface()
61-
{
62-
DPCTLDevice_Delete(DRef);
63-
}
60+
~TestDPCTLSyclDeviceInterface() { DPCTLDevice_Delete(DRef); }
6461
};
6562

6663
TEST_P(TestDPCTLSyclDeviceInterface, ChkCopy)
@@ -175,14 +172,6 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes3d)
175172
EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes));
176173
}
177174

178-
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes)
179-
{
180-
size_t *sizes = nullptr;
181-
EXPECT_NO_FATAL_FAILURE(sizes = DPCTLDevice_GetMaxWorkItemSizes(DRef));
182-
EXPECT_TRUE(sizes != nullptr);
183-
EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes));
184-
}
185-
186175
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkGroupSize)
187176
{
188177
size_t n = 0;
@@ -625,10 +614,24 @@ TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemDims)
625614
ASSERT_TRUE(md == 0);
626615
}
627616

628-
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes)
617+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes1d)
618+
{
619+
size_t *sz = nullptr;
620+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes1d(Null_DRef));
621+
ASSERT_TRUE(sz == nullptr);
622+
}
623+
624+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes2d)
625+
{
626+
size_t *sz = nullptr;
627+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes2d(Null_DRef));
628+
ASSERT_TRUE(sz == nullptr);
629+
}
630+
631+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes3d)
629632
{
630633
size_t *sz = nullptr;
631-
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes(Null_DRef));
634+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes3d(Null_DRef));
632635
ASSERT_TRUE(sz == nullptr);
633636
}
634637

0 commit comments

Comments
 (0)