[CTS] Move duplicated mem buffer parameters values into helpers header.

oneapi-src · Mar 27, 2024 · 21015af · 21015af
1 parent c981308
commit 21015af
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 80 deletions.
diff --git a/test/conformance/enqueue/helpers.h b/test/conformance/enqueue/helpers.h
@@ -101,6 +101,25 @@ struct mem_buffer_test_parameters_t {
  ur_mem_flag_t mem_flag;
 };
 
+static std::vector<mem_buffer_test_parameters_t> mem_buffer_test_parameters{
+ {1024, UR_MEM_FLAG_READ_WRITE},
+ {2500, UR_MEM_FLAG_READ_WRITE},
+ {4096, UR_MEM_FLAG_READ_WRITE},
+ {6000, UR_MEM_FLAG_READ_WRITE},
+ {1024, UR_MEM_FLAG_WRITE_ONLY},
+ {2500, UR_MEM_FLAG_WRITE_ONLY},
+ {4096, UR_MEM_FLAG_WRITE_ONLY},
+ {6000, UR_MEM_FLAG_WRITE_ONLY},
+ {1024, UR_MEM_FLAG_READ_ONLY},
+ {2500, UR_MEM_FLAG_READ_ONLY},
+ {4096, UR_MEM_FLAG_READ_ONLY},
+ {6000, UR_MEM_FLAG_READ_ONLY},
+ {1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
+ {2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
+ {4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
+ {6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
+};
+
 struct mem_buffer_map_write_test_parameters_t {
  size_t count;
  ur_mem_flag_t mem_flag;

diff --git a/test/conformance/enqueue/urEnqueueMemBufferMap.cpp b/test/conformance/enqueue/urEnqueueMemBufferMap.cpp
@@ -8,27 +8,9 @@
 using urEnqueueMemBufferMapTestWithParam =
  uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
 
-static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
- {1024, UR_MEM_FLAG_READ_WRITE},
- {2500, UR_MEM_FLAG_READ_WRITE},
- {4096, UR_MEM_FLAG_READ_WRITE},
- {6000, UR_MEM_FLAG_READ_WRITE},
- {1024, UR_MEM_FLAG_WRITE_ONLY},
- {2500, UR_MEM_FLAG_WRITE_ONLY},
- {4096, UR_MEM_FLAG_WRITE_ONLY},
- {6000, UR_MEM_FLAG_WRITE_ONLY},
- {1024, UR_MEM_FLAG_READ_ONLY},
- {2500, UR_MEM_FLAG_READ_ONLY},
- {4096, UR_MEM_FLAG_READ_ONLY},
- {6000, UR_MEM_FLAG_READ_ONLY},
- {1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
-};
-
 UUR_TEST_SUITE_P(
- urEnqueueMemBufferMapTestWithParam, ::testing::ValuesIn(test_parameters),
+ urEnqueueMemBufferMapTestWithParam,
+ ::testing::ValuesIn(uur::mem_buffer_test_parameters),
  uur::printMemBufferTestString<urEnqueueMemBufferMapTestWithParam>);
 
 TEST_P(urEnqueueMemBufferMapTestWithParam, SuccessRead) {

diff --git a/test/conformance/enqueue/urEnqueueMemBufferRead.cpp b/test/conformance/enqueue/urEnqueueMemBufferRead.cpp
@@ -8,27 +8,9 @@
 using urEnqueueMemBufferReadTestWithParam =
  uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
 
-static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
- {1024, UR_MEM_FLAG_READ_WRITE},
- {2500, UR_MEM_FLAG_READ_WRITE},
- {4096, UR_MEM_FLAG_READ_WRITE},
- {6000, UR_MEM_FLAG_READ_WRITE},
- {1024, UR_MEM_FLAG_WRITE_ONLY},
- {2500, UR_MEM_FLAG_WRITE_ONLY},
- {4096, UR_MEM_FLAG_WRITE_ONLY},
- {6000, UR_MEM_FLAG_WRITE_ONLY},
- {1024, UR_MEM_FLAG_READ_ONLY},
- {2500, UR_MEM_FLAG_READ_ONLY},
- {4096, UR_MEM_FLAG_READ_ONLY},
- {6000, UR_MEM_FLAG_READ_ONLY},
- {1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
-};
-
 UUR_TEST_SUITE_P(
- urEnqueueMemBufferReadTestWithParam, ::testing::ValuesIn(test_parameters),
+ urEnqueueMemBufferReadTestWithParam,
+ ::testing::ValuesIn(uur::mem_buffer_test_parameters),
  uur::printMemBufferTestString<urEnqueueMemBufferReadTestWithParam>);
 
 TEST_P(urEnqueueMemBufferReadTestWithParam, Success) {

diff --git a/test/conformance/enqueue/urEnqueueMemBufferWrite.cpp b/test/conformance/enqueue/urEnqueueMemBufferWrite.cpp
@@ -8,27 +8,9 @@
 using urEnqueueMemBufferWriteTestWithParam =
  uur::urMemBufferQueueTestWithParam<uur::mem_buffer_test_parameters_t>;
 
-static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
- {1024, UR_MEM_FLAG_READ_WRITE},
- {2500, UR_MEM_FLAG_READ_WRITE},
- {4096, UR_MEM_FLAG_READ_WRITE},
- {6000, UR_MEM_FLAG_READ_WRITE},
- {1024, UR_MEM_FLAG_WRITE_ONLY},
- {2500, UR_MEM_FLAG_WRITE_ONLY},
- {4096, UR_MEM_FLAG_WRITE_ONLY},
- {6000, UR_MEM_FLAG_WRITE_ONLY},
- {1024, UR_MEM_FLAG_READ_ONLY},
- {2500, UR_MEM_FLAG_READ_ONLY},
- {4096, UR_MEM_FLAG_READ_ONLY},
- {6000, UR_MEM_FLAG_READ_ONLY},
- {1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
-};
-
 UUR_TEST_SUITE_P(
- urEnqueueMemBufferWriteTestWithParam, ::testing::ValuesIn(test_parameters),
+ urEnqueueMemBufferWriteTestWithParam,
+ ::testing::ValuesIn(uur::mem_buffer_test_parameters),
  uur::printMemBufferTestString<urEnqueueMemBufferWriteTestWithParam>);
 
 TEST_P(urEnqueueMemBufferWriteTestWithParam, Success) {

diff --git a/test/conformance/enqueue/urEnqueueMemUnmap.cpp b/test/conformance/enqueue/urEnqueueMemUnmap.cpp
@@ -24,27 +24,8 @@ struct urEnqueueMemUnmapTestWithParam
  uint32_t *map = nullptr;
 };
 
-static std::vector<uur::mem_buffer_test_parameters_t> test_parameters{
- {1024, UR_MEM_FLAG_READ_WRITE},
- {2500, UR_MEM_FLAG_READ_WRITE},
- {4096, UR_MEM_FLAG_READ_WRITE},
- {6000, UR_MEM_FLAG_READ_WRITE},
- {1024, UR_MEM_FLAG_WRITE_ONLY},
- {2500, UR_MEM_FLAG_WRITE_ONLY},
- {4096, UR_MEM_FLAG_WRITE_ONLY},
- {6000, UR_MEM_FLAG_WRITE_ONLY},
- {1024, UR_MEM_FLAG_READ_ONLY},
- {2500, UR_MEM_FLAG_READ_ONLY},
- {4096, UR_MEM_FLAG_READ_ONLY},
- {6000, UR_MEM_FLAG_READ_ONLY},
- {1024, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {2500, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {4096, UR_MEM_FLAG_ALLOC_HOST_POINTER},
- {6000, UR_MEM_FLAG_ALLOC_HOST_POINTER},
-};
-
 UUR_TEST_SUITE_P(urEnqueueMemUnmapTestWithParam,
- ::testing::ValuesIn(test_parameters),
+ ::testing::ValuesIn(uur::mem_buffer_test_parameters),
  uur::printMemBufferTestString<urEnqueueMemUnmapTestWithParam>);
 
 TEST_P(urEnqueueMemUnmapTestWithParam, Success) {