diff --git a/libsyclinterface/include/dpctl_sycl_device_interface.h b/libsyclinterface/include/dpctl_sycl_device_interface.h index 50c4d1f1f2..3050d7449f 100644 --- a/libsyclinterface/include/dpctl_sycl_device_interface.h +++ b/libsyclinterface/include/dpctl_sycl_device_interface.h @@ -233,19 +233,6 @@ DPCTL_API __dpctl_keep size_t * DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef); -/*! - * @brief Wrapper for deprecated get_info(). - * - * @param DRef Opaque pointer to a ``sycl::device`` - * @return Returns the valid result if device exists else returns NULL. - * @ingroup DeviceInterface - */ -#if __cplusplus || (defined(__GNUC__) && __GNUC__ > 10) -[[deprecated("Use DPCTLDevice_WorkItemSizes3d instead")]] -#endif -DPCTL_API __dpctl_keep size_t * -DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef); - /*! * @brief Wrapper for get_info(). * diff --git a/libsyclinterface/source/dpctl_sycl_device_interface.cpp b/libsyclinterface/source/dpctl_sycl_device_interface.cpp index bcdd46a9fd..73dfcc7e11 100644 --- a/libsyclinterface/source/dpctl_sycl_device_interface.cpp +++ b/libsyclinterface/source/dpctl_sycl_device_interface.cpp @@ -266,12 +266,6 @@ DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef) return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef); } -__dpctl_keep size_t * -DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef) -{ - return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef); -} - size_t DPCTLDevice_GetMaxWorkGroupSize(__dpctl_keep const DPCTLSyclDeviceRef DRef) { diff --git a/libsyclinterface/tests/test_sycl_device_interface.cpp b/libsyclinterface/tests/test_sycl_device_interface.cpp index 7e92c8c9de..dd20c738df 100644 --- a/libsyclinterface/tests/test_sycl_device_interface.cpp +++ b/libsyclinterface/tests/test_sycl_device_interface.cpp @@ -175,14 +175,6 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes3d) EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes)); } -TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes) -{ - size_t *sizes = nullptr; - EXPECT_NO_FATAL_FAILURE(sizes = DPCTLDevice_GetMaxWorkItemSizes(DRef)); - EXPECT_TRUE(sizes != nullptr); - EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes)); -} - TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkGroupSize) { size_t n = 0; @@ -625,10 +617,24 @@ TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemDims) ASSERT_TRUE(md == 0); } -TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes) +TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes1d) +{ + size_t *sz = nullptr; + EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes1d(Null_DRef)); + ASSERT_TRUE(sz == nullptr); +} + +TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes2d) +{ + size_t *sz = nullptr; + EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes2d(Null_DRef)); + ASSERT_TRUE(sz == nullptr); +} + +TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes3d) { size_t *sz = nullptr; - EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes(Null_DRef)); + EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes3d(Null_DRef)); ASSERT_TRUE(sz == nullptr); }