Skip to content

Commit b52be5b

Browse files
martygrantmartygrant
committed
Reorganised urEventGetProfilingInfo test into separate tests instead of a switch and rework various urXGetInfo tests:
- Housekeeping pass to tidy up tests, renaming and adding consts where appropriate - Added ASSERT_QUERY_RETURNS_VALUE and uur::stringPropertyIsValid helpers from #2597 - Used above helpers across all tests to better validate numerical and char[] queries, and reworked some char[] queries - Removed any non useful checks on vector sizes after passing them into a urXGetInfo query
1 parent 0e6adfb commit b52be5b

20 files changed

+830
-660
lines changed

‎test/conformance/adapter/urAdapterGetInfo.cpp‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,53 @@ using urAdapterGetInfoTest = uur::urAdapterTest;
1313
UUR_INSTANTIATE_ADAPTER_TEST_SUITE(urAdapterGetInfoTest);
1414

1515
TEST_P(urAdapterGetInfoTest, SuccessBackend) {
16-
ur_adapter_info_t property_name = UR_ADAPTER_INFO_BACKEND;
16+
const ur_adapter_info_t property_name = UR_ADAPTER_INFO_BACKEND;
1717
size_t property_size = 0;
1818

1919
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
2020
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
2121
property_name);
2222
ASSERT_EQ(property_size, sizeof(ur_adapter_backend_t));
2323

24-
ur_adapter_backend_t backend = UR_ADAPTER_BACKEND_UNKNOWN;
24+
ur_adapter_backend_t property_value = UR_ADAPTER_BACKEND_UNKNOWN;
2525
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
26-
&backend, nullptr));
26+
&property_value, nullptr));
2727

28-
ASSERT_TRUE(backend >= UR_ADAPTER_BACKEND_LEVEL_ZERO &&
29-
backend <= UR_ADAPTER_BACKEND_NATIVE_CPU);
28+
ASSERT_TRUE(property_value >= UR_ADAPTER_BACKEND_LEVEL_ZERO &&
29+
property_value <= UR_ADAPTER_BACKEND_NATIVE_CPU);
3030
}
3131

3232
TEST_P(urAdapterGetInfoTest, SuccessReferenceCount) {
33-
ur_adapter_info_t property_name = UR_ADAPTER_INFO_REFERENCE_COUNT;
33+
const ur_adapter_info_t property_name = UR_ADAPTER_INFO_REFERENCE_COUNT;
3434
size_t property_size = 0;
3535

3636
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
3737
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
3838
property_name);
3939
ASSERT_EQ(property_size, sizeof(uint32_t));
4040

41-
uint32_t reference_count = 0;
42-
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
43-
&reference_count, nullptr));
44-
ASSERT_GE(reference_count, 0);
41+
uint32_t property_value = 0;
42+
ASSERT_QUERY_RETURNS_VALUE(urAdapterGetInfo(adapter, property_name,
43+
property_size, &property_value,
44+
nullptr),
45+
property_value);
46+
ASSERT_GE(property_value, 0);
4547
}
4648

4749
TEST_P(urAdapterGetInfoTest, SuccessVersion) {
48-
ur_adapter_info_t property_name = UR_ADAPTER_INFO_VERSION;
50+
const ur_adapter_info_t property_name = UR_ADAPTER_INFO_VERSION;
4951
size_t property_size = 0;
5052

5153
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
5254
urAdapterGetInfo(adapter, property_name, 0, nullptr, &property_size),
5355
property_name);
5456
ASSERT_EQ(property_size, sizeof(uint32_t));
5557

56-
uint32_t returned_version = 46;
57-
ASSERT_SUCCESS(urAdapterGetInfo(adapter, property_name, property_size,
58-
&returned_version, nullptr));
59-
ASSERT_NE(42, returned_version);
58+
uint32_t property_value = 0;
59+
ASSERT_QUERY_RETURNS_VALUE(urAdapterGetInfo(adapter, property_name,
60+
property_size, &property_value,
61+
nullptr),
62+
property_value);
6063
}
6164

6265
TEST_P(urAdapterGetInfoTest, InvalidNullHandleAdapter) {
@@ -89,7 +92,7 @@ TEST_P(urAdapterGetInfoTest, InvalidSizeSmall) {
8992
}
9093

9194
TEST_P(urAdapterGetInfoTest, InvalidNullPointerPropValue) {
92-
ur_adapter_backend_t backend = UR_ADAPTER_BACKEND_UNKNOWN;
95+
const ur_adapter_backend_t backend = UR_ADAPTER_BACKEND_UNKNOWN;
9396
ASSERT_EQ_RESULT(urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND,
9497
sizeof(backend), nullptr, nullptr),
9598
UR_RESULT_ERROR_INVALID_NULL_POINTER);

‎test/conformance/context/urContextGetInfo.cpp‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,41 @@ using urContextGetInfoTest = uur::urContextTest;
99
UUR_INSTANTIATE_DEVICE_TEST_SUITE(urContextGetInfoTest);
1010

1111
TEST_P(urContextGetInfoTest, SuccessNumDevices) {
12-
ur_context_info_t property_name = UR_CONTEXT_INFO_NUM_DEVICES;
12+
const ur_context_info_t property_name = UR_CONTEXT_INFO_NUM_DEVICES;
1313
size_t property_size = 0;
1414

1515
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
1616
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
1717
property_name);
1818
ASSERT_EQ(property_size, sizeof(uint32_t));
1919

20-
uint32_t nDevices = 0;
21-
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
22-
&nDevices, nullptr));
23-
24-
ASSERT_EQ(nDevices, 1);
20+
uint32_t property_value = 0;
21+
ASSERT_QUERY_RETURNS_VALUE(urContextGetInfo(context, property_name,
22+
property_size, &property_value,
23+
nullptr),
24+
property_value);
2525
}
2626

2727
TEST_P(urContextGetInfoTest, SuccessDevices) {
28-
ur_context_info_t property_name = UR_CONTEXT_INFO_DEVICES;
28+
const ur_context_info_t property_name = UR_CONTEXT_INFO_DEVICES;
2929
size_t property_size = 0;
3030

3131
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
3232
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
3333
property_name);
3434
ASSERT_NE(property_size, 0);
3535

36-
ur_device_handle_t queried_device = nullptr;
36+
ur_device_handle_t property_value = nullptr;
3737
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
38-
&queried_device, nullptr));
38+
&property_value, nullptr));
3939

4040
size_t devices_count = property_size / sizeof(ur_device_handle_t);
4141
ASSERT_EQ(devices_count, 1);
42-
ASSERT_EQ(queried_device, device);
42+
ASSERT_EQ(property_value, device);
4343
}
4444

4545
TEST_P(urContextGetInfoTest, SuccessUSMMemCpy2DSupport) {
46-
ur_context_info_t property_name = UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT;
46+
const ur_context_info_t property_name = UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT;
4747
size_t property_size = 0;
4848

4949
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
@@ -53,7 +53,7 @@ TEST_P(urContextGetInfoTest, SuccessUSMMemCpy2DSupport) {
5353
}
5454

5555
TEST_P(urContextGetInfoTest, SuccessUSMFill2DSupport) {
56-
ur_context_info_t property_name = UR_CONTEXT_INFO_USM_FILL2D_SUPPORT;
56+
const ur_context_info_t property_name = UR_CONTEXT_INFO_USM_FILL2D_SUPPORT;
5757
size_t property_size = 0;
5858

5959
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
@@ -63,22 +63,24 @@ TEST_P(urContextGetInfoTest, SuccessUSMFill2DSupport) {
6363
}
6464

6565
TEST_P(urContextGetInfoTest, SuccessReferenceCount) {
66-
ur_context_info_t property_name = UR_CONTEXT_INFO_REFERENCE_COUNT;
66+
const ur_context_info_t property_name = UR_CONTEXT_INFO_REFERENCE_COUNT;
6767
size_t property_size = 0;
6868

6969
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
7070
urContextGetInfo(context, property_name, 0, nullptr, &property_size),
7171
property_name);
7272
ASSERT_EQ(property_size, sizeof(uint32_t));
7373

74-
uint32_t reference_count = 0;
75-
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
76-
&reference_count, nullptr));
77-
ASSERT_GT(reference_count, 0U);
74+
uint32_t property_value = 0;
75+
ASSERT_QUERY_RETURNS_VALUE(urContextGetInfo(context, property_name,
76+
property_size, &property_value,
77+
nullptr),
78+
property_value);
79+
ASSERT_GT(property_value, 0U);
7880
}
7981

8082
TEST_P(urContextGetInfoTest, SuccessAtomicMemoryOrderCapabilities) {
81-
ur_context_info_t property_name =
83+
const ur_context_info_t property_name =
8284
UR_CONTEXT_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES;
8385
size_t property_size = 0;
8486

@@ -87,15 +89,15 @@ TEST_P(urContextGetInfoTest, SuccessAtomicMemoryOrderCapabilities) {
8789
property_name);
8890
ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
8991

90-
ur_memory_order_capability_flags_t flags = 0;
91-
ASSERT_SUCCESS(
92-
urContextGetInfo(context, property_name, property_size, &flags, nullptr));
92+
ur_memory_order_capability_flags_t property_value = 0;
93+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
94+
&property_value, nullptr));
9395

94-
ASSERT_EQ(flags & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
96+
ASSERT_EQ(property_value & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
9597
}
9698

9799
TEST_P(urContextGetInfoTest, SuccessAtomicMemoryScopeCapabilities) {
98-
ur_context_info_t property_name =
100+
const ur_context_info_t property_name =
99101
UR_CONTEXT_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES;
100102
size_t property_size = 0;
101103

@@ -104,15 +106,15 @@ TEST_P(urContextGetInfoTest, SuccessAtomicMemoryScopeCapabilities) {
104106
property_name);
105107
ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
106108

107-
ur_memory_scope_capability_flags_t flags = 0;
108-
ASSERT_SUCCESS(
109-
urContextGetInfo(context, property_name, property_size, &flags, nullptr));
109+
ur_memory_scope_capability_flags_t property_value = 0;
110+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
111+
&property_value, nullptr));
110112

111-
ASSERT_EQ(flags & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
113+
ASSERT_EQ(property_value & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
112114
}
113115

114116
TEST_P(urContextGetInfoTest, SuccessAtomicFenceOrderCapabilities) {
115-
ur_context_info_t property_name =
117+
const ur_context_info_t property_name =
116118
UR_CONTEXT_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES;
117119
size_t property_size = 0;
118120

@@ -121,15 +123,15 @@ TEST_P(urContextGetInfoTest, SuccessAtomicFenceOrderCapabilities) {
121123
property_name);
122124
ASSERT_EQ(property_size, sizeof(ur_memory_order_capability_flags_t));
123125

124-
ur_memory_order_capability_flags_t flags = 0;
125-
ASSERT_SUCCESS(
126-
urContextGetInfo(context, property_name, property_size, &flags, nullptr));
126+
ur_memory_order_capability_flags_t property_value = 0;
127+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
128+
&property_value, nullptr));
127129

128-
ASSERT_EQ(flags & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
130+
ASSERT_EQ(property_value & UR_MEMORY_ORDER_CAPABILITY_FLAGS_MASK, 0);
129131
}
130132

131133
TEST_P(urContextGetInfoTest, SuccessAtomicFenceScopeCapabilities) {
132-
ur_context_info_t property_name =
134+
const ur_context_info_t property_name =
133135
UR_CONTEXT_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES;
134136
size_t property_size = 0;
135137

@@ -138,11 +140,11 @@ TEST_P(urContextGetInfoTest, SuccessAtomicFenceScopeCapabilities) {
138140
property_name);
139141
ASSERT_EQ(property_size, sizeof(ur_memory_scope_capability_flags_t));
140142

141-
ur_memory_scope_capability_flags_t flags = 0;
142-
ASSERT_SUCCESS(
143-
urContextGetInfo(context, property_name, property_size, &flags, nullptr));
143+
ur_memory_scope_capability_flags_t property_value = 0;
144+
ASSERT_SUCCESS(urContextGetInfo(context, property_name, property_size,
145+
&property_value, nullptr));
144146

145-
ASSERT_EQ(flags & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
147+
ASSERT_EQ(property_value & UR_MEMORY_SCOPE_CAPABILITY_FLAGS_MASK, 0);
146148
}
147149

148150
TEST_P(urContextGetInfoTest, InvalidNullHandleContext) {

‎test/conformance/event/urEventGetInfo.cpp‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,97 +10,96 @@
1010
using urEventGetInfoTest = uur::event::urEventTest;
1111

1212
TEST_P(urEventGetInfoTest, SuccessCommandQueue) {
13-
ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
13+
const ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
1414
size_t property_size = 0;
1515

1616
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
1717
urEventGetInfo(event, property_name, 0, nullptr, &property_size),
1818
property_name);
1919
ASSERT_EQ(property_size, sizeof(ur_queue_handle_t));
2020

21-
ur_queue_handle_t returned_queue = nullptr;
21+
ur_queue_handle_t property_value = nullptr;
2222
ASSERT_SUCCESS(urEventGetInfo(event, property_name, property_size,
23-
&returned_queue, nullptr));
23+
&property_value, nullptr));
2424

25-
ASSERT_EQ(queue, returned_queue);
25+
ASSERT_EQ(queue, property_value);
2626
}
2727

2828
TEST_P(urEventGetInfoTest, SuccessContext) {
29-
ur_event_info_t property_name = UR_EVENT_INFO_CONTEXT;
29+
const ur_event_info_t property_name = UR_EVENT_INFO_CONTEXT;
3030
size_t property_size = 0;
3131

3232
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
3333
urEventGetInfo(event, property_name, 0, nullptr, &property_size),
3434
property_name);
3535
ASSERT_EQ(property_size, sizeof(ur_context_handle_t));
3636

37-
ur_context_handle_t returned_context = nullptr;
37+
ur_context_handle_t property_value = nullptr;
3838
ASSERT_SUCCESS(urEventGetInfo(event, property_name, property_size,
39-
&returned_context, nullptr));
39+
&property_value, nullptr));
4040

41-
ASSERT_EQ(context, returned_context);
41+
ASSERT_EQ(context, property_value);
4242
}
4343

4444
TEST_P(urEventGetInfoTest, SuccessCommandType) {
4545
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
4646

47-
ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_TYPE;
47+
const ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_TYPE;
4848
size_t property_size = 0;
4949

5050
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
5151
urEventGetInfo(event, property_name, 0, nullptr, &property_size),
5252
property_name);
5353
ASSERT_EQ(property_size, sizeof(ur_command_t));
5454

55-
ur_command_t returned_command_type = UR_COMMAND_FORCE_UINT32;
55+
ur_command_t property_value = UR_COMMAND_FORCE_UINT32;
5656
ASSERT_SUCCESS(urEventGetInfo(event, property_name, property_size,
57-
&returned_command_type, nullptr));
57+
&property_value, nullptr));
5858

59-
ASSERT_EQ(UR_COMMAND_MEM_BUFFER_WRITE, returned_command_type);
59+
ASSERT_EQ(UR_COMMAND_MEM_BUFFER_WRITE, property_value);
6060
}
6161

6262
TEST_P(urEventGetInfoTest, SuccessCommandExecutionStatus) {
63-
ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_EXECUTION_STATUS;
63+
const ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_EXECUTION_STATUS;
6464
size_t property_size = 0;
6565

6666
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
6767
urEventGetInfo(event, property_name, 0, nullptr, &property_size),
6868
property_name);
6969
ASSERT_EQ(property_size, sizeof(ur_event_status_t));
7070

71-
ur_event_status_t returned_status = UR_EVENT_STATUS_FORCE_UINT32;
71+
ur_event_status_t property_value = UR_EVENT_STATUS_FORCE_UINT32;
7272
ASSERT_SUCCESS(urEventGetInfo(event, property_name, property_size,
73-
&returned_status, nullptr));
73+
&property_value, nullptr));
7474

75-
ASSERT_EQ(UR_EVENT_STATUS_COMPLETE, returned_status);
75+
ASSERT_EQ(UR_EVENT_STATUS_COMPLETE, property_value);
7676
}
7777

7878
TEST_P(urEventGetInfoTest, SuccessReferenceCount) {
79-
ur_event_info_t property_name = UR_EVENT_INFO_REFERENCE_COUNT;
79+
const ur_event_info_t property_name = UR_EVENT_INFO_REFERENCE_COUNT;
8080
size_t property_size = 0;
8181

8282
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
8383
urEventGetInfo(event, property_name, 0, nullptr, &property_size),
8484
property_name);
8585
ASSERT_EQ(property_size, sizeof(uint32_t));
8686

87-
uint32_t returned_reference_count = 0;
88-
ASSERT_SUCCESS(urEventGetInfo(event, property_name, property_size,
89-
&returned_reference_count, nullptr));
87+
uint32_t property_value = 0;
88+
ASSERT_QUERY_RETURNS_VALUE(urEventGetInfo(event, property_name, property_size,
89+
&property_value, nullptr),
90+
property_value);
9091

91-
ASSERT_GT(returned_reference_count, 0U);
92+
ASSERT_GT(property_value, 0U);
9293
}
9394

9495
TEST_P(urEventGetInfoTest, InvalidNullHandle) {
95-
ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
96+
const ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
9697
size_t property_size;
9798

9899
ASSERT_SUCCESS(
99100
urEventGetInfo(event, property_name, 0, nullptr, &property_size));
100101
ASSERT_NE(property_size, 0);
101-
std::vector<uint8_t> data(property_size);
102102

103-
/* Invalid hEvent */
104103
ASSERT_EQ_RESULT(urEventGetInfo(nullptr, UR_EVENT_INFO_COMMAND_QUEUE, 0,
105104
nullptr, &property_size),
106105
UR_RESULT_ERROR_INVALID_NULL_HANDLE);
@@ -115,15 +114,14 @@ TEST_P(urEventGetInfoTest, InvalidEnumeration) {
115114
}
116115

117116
TEST_P(urEventGetInfoTest, InvalidSizePropSize) {
118-
ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
117+
const ur_event_info_t property_name = UR_EVENT_INFO_COMMAND_QUEUE;
119118
size_t property_size = 0;
120119

121120
ASSERT_SUCCESS(
122121
urEventGetInfo(event, property_name, 0, nullptr, &property_size));
123122
ASSERT_NE(property_size, 0);
124123
std::vector<uint8_t> data(property_size);
125124

126-
/* Invalid propSize */
127125
ASSERT_EQ_RESULT(urEventGetInfo(event, UR_EVENT_INFO_COMMAND_QUEUE, 0,
128126
data.data(), nullptr),
129127
UR_RESULT_ERROR_INVALID_SIZE);

0 commit comments

Comments
 (0)