Merge pull request #1077 from AlexeySachkov/private/asachkov/split-common-h-1

[NFC] Split `common.h` header [1/N]

Author: bader

tests/common/common.h

@@ -481,45 +481,6 @@ inline bool is_linker_available(
     }                                                   \
   } while (0);
 
-/// Linearizes a multi-dimensional index according to the specification.
-template <unsigned int dimension>
-size_t linearize(sycl::range<dimension> range, sycl::id<dimension> id);
-
-inline size_t linearize(sycl::range<1> range, sycl::id<1> id) {
-  static_cast<void>(range);
-  return id[0];
-}
-
-inline size_t linearize(sycl::range<2> range, sycl::id<2> id) {
-  return id[1] + id[0] * range[1];
-}
-
-inline size_t linearize(sycl::range<3> range, sycl::id<3> id) {
-  return id[2] + id[1] * range[2] + id[0] * range[1] * range[2];
-}
-
-/**
-Computes a multi-dimensional index such that id = unlinearize(range,
-linearize(range, id)) if id is a valid index in range. */
-template <unsigned int dimension>
-sycl::id<dimension> unlinearize(sycl::range<dimension> range, size_t id);
-
-inline sycl::id<1> unlinearize(sycl::range<1>, size_t id) { return {id}; }
-
-inline sycl::id<2> unlinearize(sycl::range<2> range, size_t id) {
-  size_t id0 = id / range[1];
-  size_t id1 = id % range[1];
-  return {id0, id1};
-}
-
-inline sycl::id<3> unlinearize(sycl::range<3> range, size_t id) {
-  size_t id0 = id / (range[1] * range[2]);
-  size_t rem = id % (range[1] * range[2]);
-  size_t id1 = rem / range[2];
-  size_t id2 = rem % range[2];
-  return {id0, id1, id2};
-}
-
 /** @brief Checks that two vectors of devices have the exact same devices,
  *         ignoring order and repeated devices.
  *  @param lhs std::vector with sycl::device

tests/common/range_index_space_id.h

@@ -19,10 +19,15 @@
 //
 *******************************************************************************/
 
+#ifndef __SYCLCTS_TESTS_COMMON_RANGE_INDEX_SPACE_ID_H
+#define __SYCLCTS_TESTS_COMMON_RANGE_INDEX_SPACE_ID_H
+
 #ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP
 #include "../common/type_coverage.h"
 #endif
 
+#include "once_per_unit.h"
+
 namespace range_index_space_id {
 
 enum class check_codes : size_t {
@@ -95,3 +100,44 @@ void check_members_test(const std::string& type_name) {
 }
 
 }  // namespace range_index_space_id
+
+/// Linearizes a multi-dimensional index according to the specification.
+template <unsigned int dimension>
+size_t linearize(sycl::range<dimension> range, sycl::id<dimension> id);
+
+inline size_t linearize(sycl::range<1> range, sycl::id<1> id) {
+  static_cast<void>(range);
+  return id[0];
+}
+
+inline size_t linearize(sycl::range<2> range, sycl::id<2> id) {
+  return id[1] + id[0] * range[1];
+}
+
+inline size_t linearize(sycl::range<3> range, sycl::id<3> id) {
+  return id[2] + id[1] * range[2] + id[0] * range[1] * range[2];
+}
+
+/**
+Computes a multi-dimensional index such that id = unlinearize(range,
+linearize(range, id)) if id is a valid index in range. */
+template <unsigned int dimension>
+sycl::id<dimension> unlinearize(sycl::range<dimension> range, size_t id);
+
+inline sycl::id<1> unlinearize(sycl::range<1>, size_t id) { return {id}; }
+
+inline sycl::id<2> unlinearize(sycl::range<2> range, size_t id) {
+  size_t id0 = id / range[1];
+  size_t id1 = id % range[1];
+  return {id0, id1};
+}
+
+inline sycl::id<3> unlinearize(sycl::range<3> range, size_t id) {
+  size_t id0 = id / (range[1] * range[2]);
+  size_t rem = id % (range[1] * range[2]);
+  size_t id1 = rem / range[2];
+  size_t id2 = rem % range[2];
+  return {id0, id1, id2};
+}
+
+#endif // __SYCLCTS_TESTS_COMMON_RANGE_INDEX_SPACE_ID_H

tests/extension/oneapi_auto_local_range/auto_local_range.cpp

@@ -19,6 +19,7 @@
 *******************************************************************************/
 
 #include "../../common/common.h"
+#include "../../common/range_index_space_id.h"
 #include <type_traits>
 
 namespace auto_local_range::tests {

tests/group/group_api.cpp

@@ -21,6 +21,7 @@
 
 #include "../../util/array.h"
 #include "../common/common.h"
+#include "../common/range_index_space_id.h"
 
 #include <cstddef>
 #include <limits>

tests/host_accessor/host_accessor_api_common.h

@@ -8,6 +8,7 @@
 #ifndef SYCL_CTS_HOST_ACCESSOR_API_COMMON_H
 #define SYCL_CTS_HOST_ACCESSOR_API_COMMON_H
 #include "../accessor_basic/accessor_common.h"
+#include "../common/range_index_space_id.h"
 #include <cmath>
 
 namespace host_accessor_api_common {