Skip to content

Commit

Permalink
Merge pull request oneapi-src#1336 from aarongreig/aaron/renameMemAll…
Browse files Browse the repository at this point in the history 
…ocInfotest

Rename urUSMGetMemAllocInfoTest to match entry point name
  • Loading branch information
@aarongreig
aarongreig committed Feb 13, 2024
2 parents 8ff738f + 05f66bc commit 78ef1ca
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
19 changes: 9 additions & 10 deletions test/conformance/usm/urUSMGetMemAllocInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
// See LICENSE.TXT
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <map>
#include <uur/fixtures.h>

struct urUSMAllocInfoTest
struct urUSMGetMemAllocInfoTest
: uur::urUSMDeviceAllocTestWithParam<ur_usm_alloc_info_t> {
void SetUp() override {
use_pool = getParam() == UR_USM_ALLOC_INFO_POOL;
Expand All @@ -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,
Expand All @@ -31,7 +30,7 @@ static std::unordered_map<ur_usm_alloc_info_t, size_t> 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(
Expand All @@ -48,34 +47,34 @@ 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,
sizeof(ur_usm_type_t), &USMType,
nullptr));
}

TEST_P(urUSMGetMemAllocInfoTest, InvalidNullPointerMem) {
TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullPointerMem) {
ur_usm_type_t USMType;
ASSERT_EQ_RESULT(
UR_RESULT_ERROR_INVALID_NULL_POINTER,
urUSMGetMemAllocInfo(context, nullptr, UR_USM_ALLOC_INFO_TYPE,
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,
urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_FORCE_UINT32,
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,
Expand Down
6 changes: 3 additions & 3 deletions test/conformance/usm/usm_adapter_hip.match
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions test/conformance/usm/usm_adapter_native_cpu.match
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/conformance/usm/usm_adapter_opencl.match
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 78ef1ca

Please sign in to comment.