From f772c0df7226b9c036ad8b3c7d4af794b3097915 Mon Sep 17 00:00:00 2001
From: Michael Platings <michael.platings@arm.com>
Date: Mon, 6 Jan 2025 15:17:36 +0000
Subject: [PATCH] Fix some magic numbers

Use KLEIDICV_MAXIMUM_CHANNEL_COUNT instead of the magic number 4 in some
test code.
---
 test/api/test_morphology.cpp   | 19 +++++++++++--------
 test/framework/kernel.h        | 15 ++++++++++-----
 test/framework/test_kernel.cpp |  5 +++--
 test/framework/utils.h         | 10 ++++++----
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/test/api/test_morphology.cpp b/test/api/test_morphology.cpp
index 50430eb92..eb8a9bbbd 100644
--- a/test/api/test_morphology.cpp
+++ b/test/api/test_morphology.cpp
@@ -57,21 +57,24 @@ static constexpr std::array<kleidicv_border_type_t, 1> kConstantBorder = {
     KLEIDICV_BORDER_TYPE_CONSTANT};
 
 template <typename ElementType>
-static const std::array<std::array<uint8_t, 4>, 4> &more_border_values() {
+static const std::array<std::array<uint8_t, KLEIDICV_MAXIMUM_CHANNEL_COUNT>,
+                        4> &
+more_border_values() {
   using limit = std::numeric_limits<ElementType>;
-  static const std::array<std::array<uint8_t, 4>, 4> values = {
-      {{0, 0, 0, 0},  // default
-       {7, 42, 99, 9},
-       {limit::min(), limit::max(), limit::min(), limit::max()},
-       {0, limit::min(), limit::max(), 0}}};
+  static const std::array<std::array<uint8_t, KLEIDICV_MAXIMUM_CHANNEL_COUNT>,
+                          4>
+      values = {{{0, 0, 0, 0},  // default
+                 {7, 42, 99, 9},
+                 {limit::min(), limit::max(), limit::min(), limit::max()},
+                 {0, limit::min(), limit::max(), 0}}};
   return values;
 }
 
 template <class MorphologyKernelTestParams,
           typename ArrayLayoutsGetterType = decltype(test::small_array_layouts),
           typename BorderContainerType = decltype(kDefaultBorder),
-          typename BorderValuesContainerType =
-              std::array<std::array<uint8_t, 4>, 1>>
+          typename BorderValuesContainerType = std::array<
+              std::array<uint8_t, KLEIDICV_MAXIMUM_CHANNEL_COUNT>, 1>>
 class MorphologyTest : public test::KernelTest<MorphologyKernelTestParams> {
   using Base = test::KernelTest<MorphologyKernelTestParams>;
   using typename Base::InputType;
diff --git a/test/framework/kernel.h b/test/framework/kernel.h
index 4579cac9a..5db22e3cc 100644
--- a/test/framework/kernel.h
+++ b/test/framework/kernel.h
@@ -85,7 +85,8 @@ class KernelTest {
   void test(Generator<Kernel<IntermediateType>>& kernel_generator,
             Generator<ArrayLayout>& array_layout_generator,
             Generator<kleidicv_border_type_t>& border_type_generator,
-            Generator<std::array<InputType, 4>>& border_values_generator,
+            Generator<std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>>&
+                border_values_generator,
             Generator<InputType>& element_generator) {
     kernel_generator.reset();
 
@@ -100,7 +101,8 @@ class KernelTest {
   void test(const Kernel<IntermediateType>& kernel,
             Generator<ArrayLayout>& array_layout_generator,
             Generator<kleidicv_border_type_t>& border_type_generator,
-            Generator<std::array<InputType, 4>>& border_values_generator,
+            Generator<std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>>&
+                border_values_generator,
             Generator<InputType>& element_generator) {
     array_layout_generator.reset();
 
@@ -118,7 +120,8 @@ class KernelTest {
 
   void test(const Kernel<IntermediateType>& kernel, ArrayLayout array_layout,
             Generator<kleidicv_border_type_t>& border_type_generator,
-            Generator<std::array<InputType, 4>>& border_values_generator,
+            Generator<std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>>&
+                border_values_generator,
             Generator<InputType>& element_generator) {
     border_type_generator.reset();
 
@@ -132,10 +135,12 @@ class KernelTest {
 
   void test(const Kernel<IntermediateType>& kernel, ArrayLayout array_layout,
             kleidicv_border_type_t border_type,
-            Generator<std::array<InputType, 4>>& border_values_generator,
+            Generator<std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>>&
+                border_values_generator,
             Generator<InputType>& element_generator) {
     border_values_generator.reset();
-    std::optional<std::array<InputType, 4>> maybe_border_values;
+    std::optional<std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>>
+        maybe_border_values;
     while ((maybe_border_values = border_values_generator.next()) !=
            std::nullopt) {
       test(kernel, array_layout, border_type, maybe_border_values->data(),
diff --git a/test/framework/test_kernel.cpp b/test/framework/test_kernel.cpp
index 31900ffce..9ba3a6984 100644
--- a/test/framework/test_kernel.cpp
+++ b/test/framework/test_kernel.cpp
@@ -151,8 +151,9 @@ class ExampleKernelTest : public test::KernelTest<KernelTestParams> {
   static constexpr std::array<kleidicv_border_type_t, 2> kBorders = {
       KLEIDICV_BORDER_TYPE_REPLICATE, KLEIDICV_BORDER_TYPE_CONSTANT};
 
-  static constexpr std::array<std::array<InputType, 4>, 2> kBorderValues = {
-      {{0, 0, 0, 0}, {1, 2, 3, 4}}};
+  static constexpr std::array<
+      std::array<InputType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>, 2>
+      kBorderValues = {{{0, 0, 0, 0}, {1, 2, 3, 4}}};
 
   size_t api_calls_{0};
   size_t array_layouts_{0};
diff --git a/test/framework/utils.h b/test/framework/utils.h
index 87bfcd70a..b697bf8b2 100644
--- a/test/framework/utils.h
+++ b/test/framework/utils.h
@@ -16,7 +16,7 @@
 
 #include "framework/abstract.h"
 #include "framework/types.h"
-#include "kleidicv/ctypes.h"
+#include "kleidicv/kleidicv.h"
 
 #define KLEIDICV_API(name, impl, type)                                        \
   template <typename ElementType,                                             \
@@ -115,9 +115,11 @@ void dump(const TwoDimensional<ElementType> *elements);
 
 // Returns default border values.
 template <typename ElementType>
-const std::array<std::array<ElementType, 4>, 1> &default_border_values() {
-  static std::array<std::array<ElementType, 4>, 1> result{
-      std::array<ElementType, 4>{0, 0, 0, 0}};
+const std::array<std::array<ElementType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>, 1> &
+default_border_values() {
+  static std::array<std::array<ElementType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>, 1>
+      result{
+          std::array<ElementType, KLEIDICV_MAXIMUM_CHANNEL_COUNT>{0, 0, 0, 0}};
   return result;
 }
 
-- 
GitLab