From 05f66bcf5494adb18601e55be5b08fccbcb14cbf Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Mon, 12 Feb 2024 15:17:26 +0000 Subject: [PATCH] Rename urUSMGetMemAllocInfoTest to match entry point name --- test/conformance/usm/urUSMGetMemAllocInfo.cpp | 19 +++++++++---------- test/conformance/usm/usm_adapter_hip.match | 6 +++--- .../usm/usm_adapter_native_cpu.match | 18 +++++++++--------- test/conformance/usm/usm_adapter_opencl.match | 2 +- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/test/conformance/usm/urUSMGetMemAllocInfo.cpp b/test/conformance/usm/urUSMGetMemAllocInfo.cpp index 5ccbf37a70..6bb256b97c 100644 --- a/test/conformance/usm/urUSMGetMemAllocInfo.cpp +++ b/test/conformance/usm/urUSMGetMemAllocInfo.cpp @@ -3,10 +3,9 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include #include -struct urUSMAllocInfoTest +struct urUSMGetMemAllocInfoTest : uur::urUSMDeviceAllocTestWithParam { void SetUp() override { use_pool = getParam() == UR_USM_ALLOC_INFO_POOL; @@ -15,7 +14,7 @@ struct urUSMAllocInfoTest } }; -UUR_TEST_SUITE_P(urUSMAllocInfoTest, +UUR_TEST_SUITE_P(urUSMGetMemAllocInfoTest, ::testing::Values(UR_USM_ALLOC_INFO_TYPE, UR_USM_ALLOC_INFO_BASE_PTR, UR_USM_ALLOC_INFO_SIZE, @@ -31,7 +30,7 @@ static std::unordered_map usm_info_size_map = { {UR_USM_ALLOC_INFO_POOL, sizeof(ur_usm_pool_handle_t)}, }; -TEST_P(urUSMAllocInfoTest, Success) { +TEST_P(urUSMGetMemAllocInfoTest, Success) { size_t size = 0; auto alloc_info = getParam(); ASSERT_SUCCESS( @@ -48,10 +47,10 @@ TEST_P(urUSMAllocInfoTest, Success) { info_data.data(), nullptr)); } -using urUSMGetMemAllocInfoTest = uur::urUSMDeviceAllocTest; -UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoTest); +using urUSMGetMemAllocInfoNegativeTest = uur::urUSMDeviceAllocTest; +UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoNegativeTest); -TEST_P(urUSMGetMemAllocInfoTest, InvalidNullHandleContext) { +TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullHandleContext) { ur_usm_type_t USMType; ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE, urUSMGetMemAllocInfo(nullptr, ptr, UR_USM_ALLOC_INFO_TYPE, @@ -59,7 +58,7 @@ TEST_P(urUSMGetMemAllocInfoTest, InvalidNullHandleContext) { nullptr)); } -TEST_P(urUSMGetMemAllocInfoTest, InvalidNullPointerMem) { +TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullPointerMem) { ur_usm_type_t USMType; ASSERT_EQ_RESULT( UR_RESULT_ERROR_INVALID_NULL_POINTER, @@ -67,7 +66,7 @@ TEST_P(urUSMGetMemAllocInfoTest, InvalidNullPointerMem) { sizeof(ur_usm_type_t), &USMType, nullptr)); } -TEST_P(urUSMGetMemAllocInfoTest, InvalidEnumeration) { +TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidEnumeration) { ur_usm_type_t USMType; ASSERT_EQ_RESULT( UR_RESULT_ERROR_INVALID_ENUMERATION, @@ -75,7 +74,7 @@ TEST_P(urUSMGetMemAllocInfoTest, InvalidEnumeration) { sizeof(ur_usm_type_t), &USMType, nullptr)); } -TEST_P(urUSMGetMemAllocInfoTest, InvalidValuePropSize) { +TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidValuePropSize) { ur_usm_type_t USMType; ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_SIZE, urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_TYPE, diff --git a/test/conformance/usm/usm_adapter_hip.match b/test/conformance/usm/usm_adapter_hip.match index dbc530bb76..695035aadb 100644 --- a/test/conformance/usm/usm_adapter_hip.match +++ b/test/conformance/usm/usm_adapter_hip.match @@ -6,9 +6,9 @@ {{OPT}}urUSMDeviceAllocTest.InvalidUSMSize/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled {{OPT}}urUSMDeviceAllocTest.InvalidUSMSize/AMD_HIP_BACKEND___{{.*}}___UsePoolDisabled {{OPT}}urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled -{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_BASE_PTR -{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_SIZE -{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_POOL +{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_BASE_PTR +{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_SIZE +{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_POOL {{OPT}}urUSMHostAllocTest.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled {{OPT}}urUSMHostAllocTest.SuccessWithDescriptors/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled {{OPT}}urUSMHostAllocTest.InvalidNullHandleContext/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled diff --git a/test/conformance/usm/usm_adapter_native_cpu.match b/test/conformance/usm/usm_adapter_native_cpu.match index 6719495375..33b882a508 100644 --- a/test/conformance/usm/usm_adapter_native_cpu.match +++ b/test/conformance/usm/usm_adapter_native_cpu.match @@ -15,15 +15,15 @@ urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/SYCL_NATIVE_CPU___SYCL_Native_C urUSMFreeTest.SuccessDeviceAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_ urUSMFreeTest.SuccessHostAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_ urUSMFreeTest.SuccessSharedAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_ -urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_TYPE -urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_BASE_PTR -urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_SIZE -urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_DEVICE -urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_POOL -urUSMGetMemAllocInfoTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_ -urUSMGetMemAllocInfoTest.InvalidNullPointerMem/SYCL_NATIVE_CPU___SYCL_Native_CPU_ -urUSMGetMemAllocInfoTest.InvalidEnumeration/SYCL_NATIVE_CPU___SYCL_Native_CPU_ -urUSMGetMemAllocInfoTest.InvalidValuePropSize/SYCL_NATIVE_CPU___SYCL_Native_CPU_ +urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_TYPE +urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_BASE_PTR +urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_SIZE +urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_DEVICE +urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_POOL +urUSMGetMemAllocInfoNegativeTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_ +urUSMGetMemAllocInfoNegativeTest.InvalidNullPointerMem/SYCL_NATIVE_CPU___SYCL_Native_CPU_ +urUSMGetMemAllocInfoNegativeTest.InvalidEnumeration/SYCL_NATIVE_CPU___SYCL_Native_CPU_ +urUSMGetMemAllocInfoNegativeTest.InvalidValuePropSize/SYCL_NATIVE_CPU___SYCL_Native_CPU_ urUSMHostAllocTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolEnabled urUSMHostAllocTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolDisabled urUSMHostAllocTest.SuccessWithDescriptors/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolEnabled diff --git a/test/conformance/usm/usm_adapter_opencl.match b/test/conformance/usm/usm_adapter_opencl.match index 3e729141b9..dfcee1b60e 100644 --- a/test/conformance/usm/usm_adapter_opencl.match +++ b/test/conformance/usm/usm_adapter_opencl.match @@ -5,7 +5,7 @@ urUSMDeviceAllocTest.InvalidNullHandleDevice/Intel_R__OpenCL___{{.*}}___UsePoolE urUSMDeviceAllocTest.InvalidNullPtrResult/Intel_R__OpenCL___{{.*}}___UsePoolEnabled urUSMDeviceAllocTest.InvalidUSMSize/Intel_R__OpenCL___{{.*}}___UsePoolEnabled urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/Intel_R__OpenCL___{{.*}}___UsePoolEnabled -urUSMAllocInfoTest.Success/Intel_R__OpenCL___{{.*}}___UR_USM_ALLOC_INFO_POOL +urUSMGetMemAllocInfoTest.Success/Intel_R__OpenCL___{{.*}}___UR_USM_ALLOC_INFO_POOL urUSMHostAllocTest.Success/Intel_R__OpenCL___{{.*}}___UsePoolEnabled urUSMHostAllocTest.SuccessWithDescriptors/Intel_R__OpenCL___{{.*}}___UsePoolEnabled urUSMHostAllocTest.InvalidNullHandleContext/Intel_R__OpenCL___{{.*}}___UsePoolEnabled