Skip to content

Commit 4db517d

Browse files
committed
[CTS] Run buffer creation tests for all flags
1 parent 4e7f99f commit 4db517d

File tree

2 files changed

+29
-21
lines changed

2 files changed

+29
-21
lines changed

test/conformance/memory/memory_adapter_level_zero.match

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
urMemBufferCreateTest.InvalidBufferSizeZero/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
1+
urMemBufferCreateWithFlagsTest.InvalidBufferSizeZero/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
22
urMemBufferPartitionTest.InvalidBufferSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
33
urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
44
urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_

test/conformance/memory/urMemBufferCreate.cpp

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,42 @@
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55
#include <uur/fixtures.h>
66

7-
using urMemBufferCreateTest = uur::urContextTest;
8-
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemBufferCreateTest);
7+
using urMemBufferCreateTestWithFlagsParam =
8+
uur::urContextTestWithParam<ur_mem_flag_t>;
99

10-
TEST_P(urMemBufferCreateTest, Success) {
10+
using urMemBufferCreateWithFlagsTest = urMemBufferCreateTestWithFlagsParam;
11+
UUR_TEST_SUITE_P(urMemBufferCreateWithFlagsTest,
12+
::testing::Values(UR_MEM_FLAG_READ_WRITE,
13+
UR_MEM_FLAG_WRITE_ONLY,
14+
UR_MEM_FLAG_READ_ONLY,
15+
UR_MEM_FLAG_ALLOC_HOST_POINTER),
16+
uur::deviceTestWithParamPrinter<ur_mem_flag_t>);
17+
18+
TEST_P(urMemBufferCreateWithFlagsTest, Success) {
1119
ur_mem_handle_t buffer = nullptr;
12-
ASSERT_SUCCESS(urMemBufferCreate(context, UR_MEM_FLAG_READ_WRITE, 4096,
13-
nullptr, &buffer));
20+
ASSERT_SUCCESS(
21+
urMemBufferCreate(context, getParam(), 4096, nullptr, &buffer));
1422
ASSERT_NE(nullptr, buffer);
1523
ASSERT_SUCCESS(urMemRelease(buffer));
1624
}
1725

18-
TEST_P(urMemBufferCreateTest, InvalidNullHandleContext) {
26+
TEST_P(urMemBufferCreateWithFlagsTest, InvalidNullHandleContext) {
1927
ur_mem_handle_t buffer = nullptr;
20-
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
21-
urMemBufferCreate(nullptr, UR_MEM_FLAG_READ_WRITE, 4096,
22-
nullptr, &buffer));
28+
ASSERT_EQ_RESULT(
29+
UR_RESULT_ERROR_INVALID_NULL_HANDLE,
30+
urMemBufferCreate(nullptr, getParam(), 4096, nullptr, &buffer));
2331
}
2432

33+
using urMemBufferCreateTest = uur::urContextTest;
34+
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemBufferCreateTest);
35+
2536
TEST_P(urMemBufferCreateTest, InvalidEnumerationFlags) {
2637
ur_mem_handle_t buffer = nullptr;
2738
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_ENUMERATION,
2839
urMemBufferCreate(context, UR_MEM_FLAG_FORCE_UINT32, 4096,
2940
nullptr, &buffer));
3041
}
3142

32-
using urMemBufferCreateTestWithFlagsParam =
33-
uur::urContextTestWithParam<ur_mem_flag_t>;
34-
3543
using urMemBufferCreateWithHostPtrFlagsTest =
3644
urMemBufferCreateTestWithFlagsParam;
3745
UUR_TEST_SUITE_P(urMemBufferCreateWithHostPtrFlagsTest,
@@ -46,15 +54,15 @@ TEST_P(urMemBufferCreateWithHostPtrFlagsTest, InvalidHostPtr) {
4654
urMemBufferCreate(context, getParam(), 4096, nullptr, &buffer));
4755
}
4856

49-
TEST_P(urMemBufferCreateTest, InvalidNullPointerBuffer) {
50-
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
51-
urMemBufferCreate(context, UR_MEM_FLAG_READ_WRITE, 4096,
52-
nullptr, nullptr));
57+
TEST_P(urMemBufferCreateWithFlagsTest, InvalidNullPointerBuffer) {
58+
ASSERT_EQ_RESULT(
59+
UR_RESULT_ERROR_INVALID_NULL_POINTER,
60+
urMemBufferCreate(context, getParam(), 4096, nullptr, nullptr));
5361
}
5462

55-
TEST_P(urMemBufferCreateTest, InvalidBufferSizeZero) {
63+
TEST_P(urMemBufferCreateWithFlagsTest, InvalidBufferSizeZero) {
5664
ur_mem_handle_t buffer = nullptr;
57-
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_BUFFER_SIZE,
58-
urMemBufferCreate(context, UR_MEM_FLAG_READ_WRITE, 0,
59-
nullptr, &buffer));
65+
ASSERT_EQ_RESULT(
66+
UR_RESULT_ERROR_INVALID_BUFFER_SIZE,
67+
urMemBufferCreate(context, getParam(), 0, nullptr, &buffer));
6068
}

0 commit comments

Comments
 (0)