Skip to content

Commit 48c7618

Browse files
martygrantmartygrant
authored
Merge pull request #2565 from martygrant/martin/urgetinfo-optional
Redo various urXGetInfo query tests so the first call uses the ASSERT_SUCCESS_OR_OPTIONAL_QUERY macro
2 parents f281a88 + 8f24088 commit 48c7618

14 files changed

+759
-577
lines changed

‎test/conformance/adapter/urAdapterGetInfo.cpp

+34-24
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,65 @@ using urAdapterGetInfoTest = uur::urAdapterTest;
1212
UUR_INSTANTIATE_ADAPTER_TEST_SUITE_P(urAdapterGetInfoTest);
1313

1414
TEST_P(urAdapterGetInfoTest, SuccessBackend) {
15-
auto info_type = UR_ADAPTER_INFO_BACKEND;
16-
size_t size = 0;
17-
ASSERT_SUCCESS(urAdapterGetInfo(adapter, info_type, 0, nullptr, &size));
18-
ASSERT_EQ(size, sizeof(ur_adapter_backend_t));
15+
ur_adapter_info_t property_name = UR_ADAPTER_INFO_BACKEND;
16+
size_t property_size = 0;
17+
18+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
19+
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
20+
property_name);
21+
ASSERT_EQ(property_size, sizeof(ur_adapter_backend_t));
1922

2023
ur_adapter_backend_t backend = UR_ADAPTER_BACKEND_UNKNOWN;
21-
ASSERT_SUCCESS(
22-
urAdapterGetInfo(adapter, info_type, size, &backend, nullptr));
24+
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
25+
&backend, nullptr));
2326

2427
ASSERT_TRUE(backend >= UR_ADAPTER_BACKEND_LEVEL_ZERO &&
2528
backend <= UR_ADAPTER_BACKEND_NATIVE_CPU);
2629
}
2730

2831
TEST_P(urAdapterGetInfoTest, SuccessReferenceCount) {
29-
auto info_type = UR_ADAPTER_INFO_REFERENCE_COUNT;
30-
size_t size = 0;
31-
ASSERT_SUCCESS(urAdapterGetInfo(adapter, info_type, 0, nullptr, &size));
32-
ASSERT_EQ(size, sizeof(uint32_t));
32+
ur_adapter_info_t property_name = UR_ADAPTER_INFO_REFERENCE_COUNT;
33+
size_t property_size = 0;
34+
35+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
36+
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
37+
property_name);
38+
ASSERT_EQ(property_size, sizeof(uint32_t));
3339

3440
uint32_t reference_count = 0;
35-
ASSERT_SUCCESS(
36-
urAdapterGetInfo(adapter, info_type, size, &reference_count, nullptr));
41+
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
42+
&reference_count, nullptr));
3743
ASSERT_GE(reference_count, 0);
3844
}
3945

4046
TEST_P(urAdapterGetInfoTest, SuccessVersion) {
41-
auto info_type = UR_ADAPTER_INFO_VERSION;
42-
size_t size = 0;
43-
ASSERT_SUCCESS(urAdapterGetInfo(adapter, info_type, 0, nullptr, &size));
44-
ASSERT_EQ(size, sizeof(uint32_t));
47+
ur_adapter_info_t property_name = UR_ADAPTER_INFO_VERSION;
48+
size_t property_size = 0;
49+
50+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
51+
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
52+
property_name);
53+
ASSERT_EQ(property_size, sizeof(uint32_t));
4554

4655
uint32_t returned_version = 46;
47-
ASSERT_SUCCESS(
48-
urAdapterGetInfo(adapter, info_type, size, &returned_version, nullptr));
56+
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
57+
&returned_version, nullptr));
4958
ASSERT_NE(42, returned_version);
5059
}
5160

5261
TEST_P(urAdapterGetInfoTest, InvalidNullHandleAdapter) {
53-
size_t size = 0;
54-
ASSERT_EQ_RESULT(
55-
UR_RESULT_ERROR_INVALID_NULL_HANDLE,
56-
urAdapterGetInfo(nullptr, UR_ADAPTER_INFO_BACKEND, 0, nullptr, &size));
62+
size_t property_size = 0;
63+
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
64+
urAdapterGetInfo(nullptr, UR_ADAPTER_INFO_BACKEND, 0,
65+
nullptr, &property_size));
5766
}
5867

5968
TEST_P(urAdapterGetInfoTest, InvalidEnumerationAdapterInfoType) {
60-
size_t size = 0;
69+
size_t property_size = 0;
70+
6171
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_ENUMERATION,
6272
urAdapterGetInfo(adapter, UR_ADAPTER_INFO_FORCE_UINT32, 0,
63-
nullptr, &size));
73+
nullptr, &property_size));
6474
}
6575

6676
TEST_P(urAdapterGetInfoTest, InvalidSizeZero) {

‎test/conformance/context/urContextGetInfo.cpp

+65-47
Original file line numberDiff line numberDiff line change
@@ -8,120 +8,138 @@ using urContextGetInfoTest = uur::urContextTest;
88
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urContextGetInfoTest);
99

1010
TEST_P(urContextGetInfoTest, SuccessNumDevices) {
11-
ur_context_info_t info_type = UR_CONTEXT_INFO_NUM_DEVICES;
12-
size_t size = 0;
11+
ur_context_info_t property_name = UR_CONTEXT_INFO_NUM_DEVICES;
12+
size_t property_size = 0;
1313

14-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
15-
ASSERT_EQ(size, sizeof(uint32_t));
14+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
15+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
16+
property_name);
17+
ASSERT_EQ(property_size, sizeof(uint32_t));
1618

1719
uint32_t nDevices = 0;
18-
ASSERT_SUCCESS(
19-
urContextGetInfo(context, info_type, size, &nDevices, nullptr));
20+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
21+
&nDevices, nullptr));
2022

2123
ASSERT_EQ(nDevices, 1);
2224
}
2325

2426
TEST_P(urContextGetInfoTest, SuccessDevices) {
25-
ur_context_info_t info_type = UR_CONTEXT_INFO_DEVICES;
26-
size_t size = 0;
27+
ur_context_info_t property_name = UR_CONTEXT_INFO_DEVICES;
28+
size_t property_size = 0;
2729

28-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
29-
ASSERT_NE(size, 0);
30+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
31+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
32+
property_name);
33+
ASSERT_NE(property_size, 0);
3034

3135
ur_device_handle_t queried_device = nullptr;
32-
ASSERT_SUCCESS(
33-
urContextGetInfo(context, info_type, size, &queried_device, nullptr));
36+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
37+
&queried_device, nullptr));
3438

35-
size_t devices_count = size / sizeof(ur_device_handle_t);
39+
size_t devices_count = property_size / sizeof(ur_device_handle_t);
3640
ASSERT_EQ(devices_count, 1);
3741
ASSERT_EQ(queried_device, device);
3842
}
3943

4044
TEST_P(urContextGetInfoTest, SuccessUSMMemCpy2DSupport) {
41-
ur_context_info_t info_type = UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT;
42-
size_t size = 0;
45+
ur_context_info_t property_name = UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT;
46+
size_t property_size = 0;
4347

44-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
45-
ASSERT_EQ(size, sizeof(ur_bool_t));
48+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
49+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
50+
property_name);
51+
ASSERT_EQ(property_size, sizeof(ur_bool_t));
4652
}
4753

4854
TEST_P(urContextGetInfoTest, SuccessUSMFill2DSupport) {
49-
ur_context_info_t info_type = UR_CONTEXT_INFO_USM_FILL2D_SUPPORT;
50-
size_t size = 0;
55+
ur_context_info_t property_name = UR_CONTEXT_INFO_USM_FILL2D_SUPPORT;
56+
size_t property_size = 0;
5157

52-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
53-
ASSERT_EQ(size, sizeof(ur_bool_t));
58+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
59+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
60+
property_name);
61+
ASSERT_EQ(property_size, sizeof(ur_bool_t));
5462
}
5563

5664
TEST_P(urContextGetInfoTest, SuccessReferenceCount) {
57-
ur_context_info_t info_type = UR_CONTEXT_INFO_REFERENCE_COUNT;
58-
size_t size = 0;
65+
ur_context_info_t property_name = UR_CONTEXT_INFO_REFERENCE_COUNT;
66+
size_t property_size = 0;
5967

60-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
61-
ASSERT_EQ(size, sizeof(uint32_t));
68+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
69+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
70+
property_name);
71+
ASSERT_EQ(property_size, sizeof(uint32_t));
6272

6373
uint32_t reference_count = 0;
64-
ASSERT_SUCCESS(
65-
urContextGetInfo(context, info_type, size, &reference_count, nullptr));
74+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
75+
&reference_count, nullptr));
6676
ASSERT_GT(reference_count, 0U);
6777
}
6878

6979
TEST_P(urContextGetInfoTest, SuccessAtomicMemoryOrderCapabilities) {
70-
ur_context_info_t info_type =
80+
ur_context_info_t property_name =
7181
UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES;
72-
size_t size = 0;
82+
size_t property_size = 0;
7383

7484
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
75-
urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
76-
ASSERT_EQ(size, sizeof(ur_memory_order_capability_flags_t));
85+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
86+
property_name);
87+
ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
7788

7889
ur_memory_order_capability_flags_t flags = 0;
79-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, size, &flags, nullptr));
90+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
91+
&flags, nullptr));
8092

8193
ASSERT_EQ(flags & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
8294
}
8395

8496
TEST_P(urContextGetInfoTest, SuccessAtomicMemoryScopeCapabilities) {
85-
ur_context_info_t info_type =
97+
ur_context_info_t property_name =
8698
UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES;
87-
size_t size = 0;
99+
size_t property_size = 0;
88100

89101
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
90-
urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
91-
ASSERT_EQ(size, sizeof(ur_memory_scope_capability_flags_t));
102+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
103+
property_name);
104+
ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
92105

93106
ur_memory_scope_capability_flags_t flags = 0;
94-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, size, &flags, nullptr));
107+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
108+
&flags, nullptr));
95109

96110
ASSERT_EQ(flags & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
97111
}
98112

99113
TEST_P(urContextGetInfoTest, SuccessAtomicFenceOrderCapabilities) {
100-
ur_context_info_t info_type =
114+
ur_context_info_t property_name =
101115
UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES;
102-
size_t size = 0;
116+
size_t property_size = 0;
103117

104118
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
105-
urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
106-
ASSERT_EQ(size, sizeof(ur_memory_order_capability_flags_t));
119+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
120+
property_name);
121+
ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
107122

108123
ur_memory_order_capability_flags_t flags = 0;
109-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, size, &flags, nullptr));
124+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
125+
&flags, nullptr));
110126

111127
ASSERT_EQ(flags & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
112128
}
113129

114130
TEST_P(urContextGetInfoTest, SuccessAtomicFenceScopeCapabilities) {
115-
ur_context_info_t info_type =
131+
ur_context_info_t property_name =
116132
UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES;
117-
size_t size = 0;
133+
size_t property_size = 0;
118134

119135
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
120-
urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
121-
ASSERT_EQ(size, sizeof(ur_memory_scope_capability_flags_t));
136+
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
137+
property_name);
138+
ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
122139

123140
ur_memory_scope_capability_flags_t flags = 0;
124-
ASSERT_SUCCESS(urContextGetInfo(context, info_type, size, &flags, nullptr));
141+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
142+
&flags, nullptr));
125143

126144
ASSERT_EQ(flags & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
127145
}

0 commit comments

Comments
 (0)