Skip to content

Commit 78ef1ca

Browse files
aarongreigaarongreig
authored
Merge pull request #1336 from aarongreig/aaron/renameMemAllocInfotest
Rename urUSMGetMemAllocInfoTest to match entry point name
2 parents 8ff738f + 05f66bc commit 78ef1ca

File tree

4 files changed

+22
-23
lines changed

4 files changed

+22
-23
lines changed

‎test/conformance/usm/urUSMGetMemAllocInfo.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <map>
76
#include <uur/fixtures.h>
87

9-
struct urUSMAllocInfoTest
8+
struct urUSMGetMemAllocInfoTest
109
: uur::urUSMDeviceAllocTestWithParam<ur_usm_alloc_info_t> {
1110
void SetUp() override {
1211
use_pool = getParam() == UR_USM_ALLOC_INFO_POOL;
@@ -15,7 +14,7 @@ struct urUSMAllocInfoTest
1514
}
1615
};
1716

18-
UUR_TEST_SUITE_P(urUSMAllocInfoTest,
17+
UUR_TEST_SUITE_P(urUSMGetMemAllocInfoTest,
1918
::testing::Values(UR_USM_ALLOC_INFO_TYPE,
2019
UR_USM_ALLOC_INFO_BASE_PTR,
2120
UR_USM_ALLOC_INFO_SIZE,
@@ -31,7 +30,7 @@ static std::unordered_map<ur_usm_alloc_info_t, size_t> usm_info_size_map = {
3130
{UR_USM_ALLOC_INFO_POOL, sizeof(ur_usm_pool_handle_t)},
3231
};
3332

34-
TEST_P(urUSMAllocInfoTest, Success) {
33+
TEST_P(urUSMGetMemAllocInfoTest, Success) {
3534
size_t size = 0;
3635
auto alloc_info = getParam();
3736
ASSERT_SUCCESS(
@@ -48,34 +47,34 @@ TEST_P(urUSMAllocInfoTest, Success) {
4847
info_data.data(), nullptr));
4948
}
5049

51-
using urUSMGetMemAllocInfoTest = uur::urUSMDeviceAllocTest;
52-
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoTest);
50+
using urUSMGetMemAllocInfoNegativeTest = uur::urUSMDeviceAllocTest;
51+
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urUSMGetMemAllocInfoNegativeTest);
5352

54-
TEST_P(urUSMGetMemAllocInfoTest, InvalidNullHandleContext) {
53+
TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullHandleContext) {
5554
ur_usm_type_t USMType;
5655
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
5756
urUSMGetMemAllocInfo(nullptr, ptr, UR_USM_ALLOC_INFO_TYPE,
5857
sizeof(ur_usm_type_t), &USMType,
5958
nullptr));
6059
}
6160

62-
TEST_P(urUSMGetMemAllocInfoTest, InvalidNullPointerMem) {
61+
TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidNullPointerMem) {
6362
ur_usm_type_t USMType;
6463
ASSERT_EQ_RESULT(
6564
UR_RESULT_ERROR_INVALID_NULL_POINTER,
6665
urUSMGetMemAllocInfo(context, nullptr, UR_USM_ALLOC_INFO_TYPE,
6766
sizeof(ur_usm_type_t), &USMType, nullptr));
6867
}
6968

70-
TEST_P(urUSMGetMemAllocInfoTest, InvalidEnumeration) {
69+
TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidEnumeration) {
7170
ur_usm_type_t USMType;
7271
ASSERT_EQ_RESULT(
7372
UR_RESULT_ERROR_INVALID_ENUMERATION,
7473
urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_FORCE_UINT32,
7574
sizeof(ur_usm_type_t), &USMType, nullptr));
7675
}
7776

78-
TEST_P(urUSMGetMemAllocInfoTest, InvalidValuePropSize) {
77+
TEST_P(urUSMGetMemAllocInfoNegativeTest, InvalidValuePropSize) {
7978
ur_usm_type_t USMType;
8079
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_SIZE,
8180
urUSMGetMemAllocInfo(context, ptr, UR_USM_ALLOC_INFO_TYPE,

‎test/conformance/usm/usm_adapter_hip.match

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{{OPT}}urUSMDeviceAllocTest.InvalidUSMSize/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
77
{{OPT}}urUSMDeviceAllocTest.InvalidUSMSize/AMD_HIP_BACKEND___{{.*}}___UsePoolDisabled
88
{{OPT}}urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
9-
{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_BASE_PTR
10-
{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_SIZE
11-
{{OPT}}urUSMAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_POOL
9+
{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_BASE_PTR
10+
{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_SIZE
11+
{{OPT}}urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_POOL
1212
{{OPT}}urUSMHostAllocTest.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
1313
{{OPT}}urUSMHostAllocTest.SuccessWithDescriptors/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
1414
{{OPT}}urUSMHostAllocTest.InvalidNullHandleContext/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled

‎test/conformance/usm/usm_adapter_native_cpu.match

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/SYCL_NATIVE_CPU___SYCL_Native_C
1515
urUSMFreeTest.SuccessDeviceAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1616
urUSMFreeTest.SuccessHostAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_
1717
urUSMFreeTest.SuccessSharedAlloc/SYCL_NATIVE_CPU___SYCL_Native_CPU_
18-
urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_TYPE
19-
urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_BASE_PTR
20-
urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_SIZE
21-
urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_DEVICE
22-
urUSMAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_POOL
23-
urUSMGetMemAllocInfoTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_
24-
urUSMGetMemAllocInfoTest.InvalidNullPointerMem/SYCL_NATIVE_CPU___SYCL_Native_CPU_
25-
urUSMGetMemAllocInfoTest.InvalidEnumeration/SYCL_NATIVE_CPU___SYCL_Native_CPU_
26-
urUSMGetMemAllocInfoTest.InvalidValuePropSize/SYCL_NATIVE_CPU___SYCL_Native_CPU_
18+
urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_TYPE
19+
urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_BASE_PTR
20+
urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_SIZE
21+
urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_DEVICE
22+
urUSMGetMemAllocInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_USM_ALLOC_INFO_POOL
23+
urUSMGetMemAllocInfoNegativeTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_
24+
urUSMGetMemAllocInfoNegativeTest.InvalidNullPointerMem/SYCL_NATIVE_CPU___SYCL_Native_CPU_
25+
urUSMGetMemAllocInfoNegativeTest.InvalidEnumeration/SYCL_NATIVE_CPU___SYCL_Native_CPU_
26+
urUSMGetMemAllocInfoNegativeTest.InvalidValuePropSize/SYCL_NATIVE_CPU___SYCL_Native_CPU_
2727
urUSMHostAllocTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolEnabled
2828
urUSMHostAllocTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolDisabled
2929
urUSMHostAllocTest.SuccessWithDescriptors/SYCL_NATIVE_CPU___SYCL_Native_CPU___UsePoolEnabled

‎test/conformance/usm/usm_adapter_opencl.match

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ urUSMDeviceAllocTest.InvalidNullHandleDevice/Intel_R__OpenCL___{{.*}}___UsePoolE
55
urUSMDeviceAllocTest.InvalidNullPtrResult/Intel_R__OpenCL___{{.*}}___UsePoolEnabled
66
urUSMDeviceAllocTest.InvalidUSMSize/Intel_R__OpenCL___{{.*}}___UsePoolEnabled
77
urUSMDeviceAllocTest.InvalidValueAlignPowerOfTwo/Intel_R__OpenCL___{{.*}}___UsePoolEnabled
8-
urUSMAllocInfoTest.Success/Intel_R__OpenCL___{{.*}}___UR_USM_ALLOC_INFO_POOL
8+
urUSMGetMemAllocInfoTest.Success/Intel_R__OpenCL___{{.*}}___UR_USM_ALLOC_INFO_POOL
99
urUSMHostAllocTest.Success/Intel_R__OpenCL___{{.*}}___UsePoolEnabled
1010
urUSMHostAllocTest.SuccessWithDescriptors/Intel_R__OpenCL___{{.*}}___UsePoolEnabled
1111
urUSMHostAllocTest.InvalidNullHandleContext/Intel_R__OpenCL___{{.*}}___UsePoolEnabled

0 commit comments

Comments
 (0)