Skip to content

Commit 21015af

Browse files
martygrantmartygrant
committed
[CTS] Move duplicated mem buffer parameters values into helpers header.
1 parent c981308 commit 21015af

File tree

5 files changed

+26
-80
lines changed

5 files changed

+26
-80
lines changed

‎test/conformance/enqueue/helpers.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,25 @@ struct mem_buffer_test_parameters_t {
101101
ur_mem_flag_t mem_flag;
102102
};
103103

104+
static std::vector<mem_buffer_test_parameters_t> mem_buffer_test_parameters{
105+
{1024, UR_MEM_FLAG_READ_WRITE},
106+
{2500, UR_MEM_FLAG_READ_WRITE},
107+
{4096, UR_MEM_FLAG_READ_WRITE},
108+
{6000, UR_MEM_FLAG_READ_WRITE},
109+
{1024, UR_MEM_FLAG_WRITE_ONLY},
110+
{2500, UR_MEM_FLAG_WRITE_ONLY},
111+
{4096, UR_MEM_FLAG_WRITE_ONLY},
112+
{6000, UR_MEM_FLAG_WRITE_ONLY},
113+
{1024, UR_MEM_FLAG_READ_ONLY},
114+
{2500, UR_MEM_FLAG_READ_ONLY},
115+
{4096, UR_MEM_FLAG_READ_ONLY},
116+
{6000, UR_MEM_FLAG_READ_ONLY},
117+
{1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
118+
{2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
119+
{4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
120+
{6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
121+
};
122+
104123
struct mem_buffer_map_write_test_parameters_t {
105124
size_t count;
106125
ur_mem_flag_t mem_flag;

‎test/conformance/enqueue/urEnqueueMemBufferMap.cpp‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
using urEnqueueMemBufferMapTestWithParam =
99
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
1010

11-
static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
12-
{1024, UR_MEM_FLAG_READ_WRITE},
13-
{2500, UR_MEM_FLAG_READ_WRITE},
14-
{4096, UR_MEM_FLAG_READ_WRITE},
15-
{6000, UR_MEM_FLAG_READ_WRITE},
16-
{1024, UR_MEM_FLAG_WRITE_ONLY},
17-
{2500, UR_MEM_FLAG_WRITE_ONLY},
18-
{4096, UR_MEM_FLAG_WRITE_ONLY},
19-
{6000, UR_MEM_FLAG_WRITE_ONLY},
20-
{1024, UR_MEM_FLAG_READ_ONLY},
21-
{2500, UR_MEM_FLAG_READ_ONLY},
22-
{4096, UR_MEM_FLAG_READ_ONLY},
23-
{6000, UR_MEM_FLAG_READ_ONLY},
24-
{1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
25-
{2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
26-
{4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
27-
{6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
28-
};
29-
3011
UUR_TEST_SUITE_P(
31-
urEnqueueMemBufferMapTestWithParam, ::testing::ValuesIn(test_parameters),
12+
urEnqueueMemBufferMapTestWithParam,
13+
::testing::ValuesIn(uur::mem_buffer_test_parameters),
3214
uur::printMemBufferTestString<urEnqueueMemBufferMapTestWithParam>);
3315

3416
TEST_P(urEnqueueMemBufferMapTestWithParam, SuccessRead) {

‎test/conformance/enqueue/urEnqueueMemBufferRead.cpp‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
using urEnqueueMemBufferReadTestWithParam =
99
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
1010

11-
static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
12-
{1024, UR_MEM_FLAG_READ_WRITE},
13-
{2500, UR_MEM_FLAG_READ_WRITE},
14-
{4096, UR_MEM_FLAG_READ_WRITE},
15-
{6000, UR_MEM_FLAG_READ_WRITE},
16-
{1024, UR_MEM_FLAG_WRITE_ONLY},
17-
{2500, UR_MEM_FLAG_WRITE_ONLY},
18-
{4096, UR_MEM_FLAG_WRITE_ONLY},
19-
{6000, UR_MEM_FLAG_WRITE_ONLY},
20-
{1024, UR_MEM_FLAG_READ_ONLY},
21-
{2500, UR_MEM_FLAG_READ_ONLY},
22-
{4096, UR_MEM_FLAG_READ_ONLY},
23-
{6000, UR_MEM_FLAG_READ_ONLY},
24-
{1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
25-
{2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
26-
{4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
27-
{6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
28-
};
29-
3011
UUR_TEST_SUITE_P(
31-
urEnqueueMemBufferReadTestWithParam, ::testing::ValuesIn(test_parameters),
12+
urEnqueueMemBufferReadTestWithParam,
13+
::testing::ValuesIn(uur::mem_buffer_test_parameters),
3214
uur::printMemBufferTestString<urEnqueueMemBufferReadTestWithParam>);
3315

3416
TEST_P(urEnqueueMemBufferReadTestWithParam, Success) {

‎test/conformance/enqueue/urEnqueueMemBufferWrite.cpp‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
using urEnqueueMemBufferWriteTestWithParam =
99
uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
1010

11-
static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
12-
{1024, UR_MEM_FLAG_READ_WRITE},
13-
{2500, UR_MEM_FLAG_READ_WRITE},
14-
{4096, UR_MEM_FLAG_READ_WRITE},
15-
{6000, UR_MEM_FLAG_READ_WRITE},
16-
{1024, UR_MEM_FLAG_WRITE_ONLY},
17-
{2500, UR_MEM_FLAG_WRITE_ONLY},
18-
{4096, UR_MEM_FLAG_WRITE_ONLY},
19-
{6000, UR_MEM_FLAG_WRITE_ONLY},
20-
{1024, UR_MEM_FLAG_READ_ONLY},
21-
{2500, UR_MEM_FLAG_READ_ONLY},
22-
{4096, UR_MEM_FLAG_READ_ONLY},
23-
{6000, UR_MEM_FLAG_READ_ONLY},
24-
{1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
25-
{2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
26-
{4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
27-
{6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
28-
};
29-
3011
UUR_TEST_SUITE_P(
31-
urEnqueueMemBufferWriteTestWithParam, ::testing::ValuesIn(test_parameters),
12+
urEnqueueMemBufferWriteTestWithParam,
13+
::testing::ValuesIn(uur::mem_buffer_test_parameters),
3214
uur::printMemBufferTestString<urEnqueueMemBufferWriteTestWithParam>);
3315

3416
TEST_P(urEnqueueMemBufferWriteTestWithParam, Success) {

‎test/conformance/enqueue/urEnqueueMemUnmap.cpp‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,8 @@ struct urEnqueueMemUnmapTestWithParam
2424
uint32_t *map = nullptr;
2525
};
2626

27-
static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
28-
{1024, UR_MEM_FLAG_READ_WRITE},
29-
{2500, UR_MEM_FLAG_READ_WRITE},
30-
{4096, UR_MEM_FLAG_READ_WRITE},
31-
{6000, UR_MEM_FLAG_READ_WRITE},
32-
{1024, UR_MEM_FLAG_WRITE_ONLY},
33-
{2500, UR_MEM_FLAG_WRITE_ONLY},
34-
{4096, UR_MEM_FLAG_WRITE_ONLY},
35-
{6000, UR_MEM_FLAG_WRITE_ONLY},
36-
{1024, UR_MEM_FLAG_READ_ONLY},
37-
{2500, UR_MEM_FLAG_READ_ONLY},
38-
{4096, UR_MEM_FLAG_READ_ONLY},
39-
{6000, UR_MEM_FLAG_READ_ONLY},
40-
{1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
41-
{2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
42-
{4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
43-
{6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
44-
};
45-
4627
UUR_TEST_SUITE_P(urEnqueueMemUnmapTestWithParam,
47-
::testing::ValuesIn(test_parameters),
28+
::testing::ValuesIn(uur::mem_buffer_test_parameters),
4829
uur::printMemBufferTestString<urEnqueueMemUnmapTestWithParam>);
4930

5031
TEST_P(urEnqueueMemUnmapTestWithParam, Success) {

0 commit comments

Comments
 (0)