Skip to content

Commit f8d9e9e

Browse files
committed
Fix remaining conformance tests
1 parent dce122c commit f8d9e9e

File tree

1 file changed

+31
-18
lines changed

1 file changed

+31
-18
lines changed

test/conformance/program/urProgramCreateWithBinary.cpp

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,45 +38,54 @@ struct urProgramCreateWithBinaryTest : uur::urProgramTest {
3838
UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urProgramCreateWithBinaryTest);
3939

4040
TEST_P(urProgramCreateWithBinaryTest, Success) {
41-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, binary.size(),
42-
binary.data(), nullptr,
43-
&binary_program));
41+
auto size = binary.size();
42+
const uint8_t *data = binary.data();
43+
ASSERT_SUCCESS(urProgramCreateWithBinary(context, 1, &device, &size, &data,
44+
nullptr, &binary_program));
4445
}
4546

4647
TEST_P(urProgramCreateWithBinaryTest, InvalidNullHandleContext) {
48+
auto size = binary.size();
49+
const uint8_t *data = binary.data();
4750
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
48-
urProgramCreateWithBinary(nullptr, device, binary.size(),
49-
binary.data(), nullptr,
51+
urProgramCreateWithBinary(nullptr, 1, &device, &size,
52+
&data, nullptr,
5053
&binary_program));
5154
}
5255

5356
TEST_P(urProgramCreateWithBinaryTest, InvalidNullHandleDevice) {
54-
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
55-
urProgramCreateWithBinary(context, nullptr, binary.size(),
56-
binary.data(), nullptr,
57+
auto size = binary.size();
58+
const uint8_t *data = binary.data();
59+
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
60+
urProgramCreateWithBinary(context, 0, nullptr, &size,
61+
&data, nullptr,
5762
&binary_program));
5863
}
5964

6065
TEST_P(urProgramCreateWithBinaryTest, InvalidNullPointerBinary) {
66+
auto size = binary.size();
6167
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
62-
urProgramCreateWithBinary(context, device, binary.size(),
68+
urProgramCreateWithBinary(context, 1, &device, &size,
6369
nullptr, nullptr,
6470
&binary_program));
6571
}
6672

6773
TEST_P(urProgramCreateWithBinaryTest, InvalidNullPointerProgram) {
74+
auto size = binary.size();
75+
const uint8_t *data = binary.data();
6876
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
69-
urProgramCreateWithBinary(context, device, binary.size(),
70-
binary.data(), nullptr,
71-
nullptr));
77+
urProgramCreateWithBinary(context, 1, &device, &size,
78+
&data, nullptr, nullptr));
7279
}
7380

7481
TEST_P(urProgramCreateWithBinaryTest, InvalidNullPointerMetadata) {
7582
ur_program_properties_t properties = {};
7683
properties.count = 1;
84+
auto size = binary.size();
85+
const uint8_t *data = binary.data();
7786
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
78-
urProgramCreateWithBinary(context, device, binary.size(),
79-
binary.data(), &properties,
87+
urProgramCreateWithBinary(context, 1, &device, &size,
88+
&data, &properties,
8089
&binary_program));
8190
}
8291

@@ -89,17 +98,21 @@ TEST_P(urProgramCreateWithBinaryTest, InvalidSizePropertyCount) {
8998
md_string.size(), md_value};
9099
ur_program_properties_t properties = {};
91100
properties.pMetadatas = &md;
101+
auto size = binary.size();
102+
const uint8_t *data = binary.data();
92103
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_SIZE,
93-
urProgramCreateWithBinary(context, device, binary.size(),
94-
binary.data(), &properties,
104+
urProgramCreateWithBinary(context, 1, &device, &size,
105+
&data, &properties,
95106
&binary_program));
96107
}
97108

98109
TEST_P(urProgramCreateWithBinaryTest, BuildInvalidProgramBinary) {
99110
ur_program_handle_t program = nullptr;
100111
uint8_t binary[] = {0, 1, 2, 3, 4};
101-
auto result = urProgramCreateWithBinary(context, device, 5, binary, nullptr,
102-
&program);
112+
const uint8_t *data = binary;
113+
size_t size = 5;
114+
auto result = urProgramCreateWithBinary(context, 1, &device, &size, &data,
115+
nullptr, &program);
103116
// The driver is not required to reject the binary
104117
ASSERT_TRUE(result == UR_RESULT_ERROR_INVALID_BINARY ||
105118
result == UR_RESULT_SUCCESS);

0 commit comments

Comments
 (0)