COMPMID-1563: Fix name of NEGEMMInterleavedWrapper

Change-Id: I5f868091cae7bd86eeeb7216d44f32c190c5a604
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/147804
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

2 files changed, 131 insertions, 7 deletions

diff --git a/src/core/NEON/kernels/assembly/Helpers.cpp b/src/core/NEON/kernels/assembly/Helpers.cpp
new file mode 100644
index 0000000000..09ac08c0a4
--- /dev/null
+++ b/src/core/NEON/kernels/assembly/Helpers.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2018 ARM Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "arm_compute/core/NEON/kernels/assembly/Helpers.h"
+
+#include "NEGEMMInterleavedStrategies.h"
+
+namespace arm_compute
+{
+namespace
+{
+template <typename InputType, bool use_dot = false>
+BlockSizes calculate_block_sizes_template(const CPUInfo &ci, unsigned int M, unsigned int N, unsigned int K)
+{
+    using strategy = typename Kernel<InputType, use_dot>::strategy;
+    return calculate_block_sizes<strategy>(ci, M, N, K);
+}
+} // namespace
+
+const char *get_strategy_name(DataType input_type, bool use_dot)
+{
+    switch(input_type)
+    {
+        case DataType::F32:
+            return Kernel<float>::name;
+#ifdef __aarch64__
+        case DataType::U8:
+        case DataType::QASYMM8:
+            if(use_dot)
+            {
+                return Kernel<uint8_t, true>::name;
+            }
+            else
+            {
+                return Kernel<uint8_t, false>::name;
+            }
+        case DataType::S8:
+            if(use_dot)
+            {
+                return Kernel<int8_t, true>::name;
+            }
+            else
+            {
+                return Kernel<int8_t, false>::name;
+            }
+#endif /* __aarch64__ */
+#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
+        case DataType::F16:
+            return Kernel<__fp16>::name;
+#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */
+        default:
+            ARM_COMPUTE_ERROR("DataType not supported");
+            break;
+    }
+}
+
+BlockSizes calculate_block_sizes_from_data_type(const CPUInfo &ci, unsigned int M, unsigned int N, unsigned int K, DataType input_type, bool use_dot)
+{
+    switch(input_type)
+    {
+        case DataType::F32:
+            return calculate_block_sizes_template<float>(ci, M, N, K);
+#ifdef __aarch64__
+        case DataType::U8:
+        case DataType::QASYMM8:
+            if(use_dot)
+            {
+                return calculate_block_sizes_template<uint8_t, true>(ci, M, N, K);
+            }
+            else
+            {
+                return calculate_block_sizes_template<uint8_t, false>(ci, M, N, K);
+            }
+        case DataType::S8:
+            if(use_dot)
+            {
+                return calculate_block_sizes_template<int8_t, true>(ci, M, N, K);
+            }
+            else
+            {
+                return calculate_block_sizes_template<int8_t, false>(ci, M, N, K);
+            }
+#endif /* __aarch64__ */
+#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
+        case DataType::F16:
+            return calculate_block_sizes_template<__fp16>(ci, M, N, K);
+#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */
+        default:
+            ARM_COMPUTE_ERROR("DataType not supported");
+            break;
+    }
+}
+} // namespace arm_compute
diff --git a/src/core/NEON/kernels/assembly/NEGEMMInterleavedStrategies.h b/src/core/NEON/kernels/assembly/NEGEMMInterleavedStrategies.h
index 26a8ade461..00e483c0f8 100644
--- a/src/core/NEON/kernels/assembly/NEGEMMInterleavedStrategies.h
+++ b/src/core/NEON/kernels/assembly/NEGEMMInterleavedStrategies.h
@@ -47,49 +47,59 @@ struct Kernel
 {
 };
 
+#define DEFINE_STRATEGY_SUFFIX(strat, suffix)            \
+    using strategy                    = arm_gemm::strat; \
+    static constexpr const char *name = #strat suffix;
+
+#define DEFINE_STRATEGY(strat) \
+    DEFINE_STRATEGY_SUFFIX(strat, "")
+
 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 template <>
 struct Kernel<float16_t, false>
 {
-    using strategy = arm_gemm::hgemm_24x8;
+    DEFINE_STRATEGY(hgemm_24x8)
 };
 #endif /*__ARM_FEATURE_FP16_VECTOR_ARITHMETIC */
 #ifdef __aarch64__
 template <>
 struct Kernel<float, false>
 {
-    using strategy = arm_gemm::sgemm_12x8;
+    DEFINE_STRATEGY(sgemm_12x8)
 };
 template <>
 struct Kernel<int8_t, false>
 {
-    using strategy = arm_gemm::gemm_s8_4x4;
+    DEFINE_STRATEGY(gemm_s8_4x4)
 };
 template <>
 struct Kernel<uint8_t, false>
 {
-    using strategy = arm_gemm::gemm_u8_4x4;
+    DEFINE_STRATEGY(gemm_u8_4x4)
 };
 
 //Use different strategies for 8bit dot product:
 template <>
 struct Kernel<int8_t, true>
 {
-    using strategy = arm_gemm::gemm_s8_12x8;
+    DEFINE_STRATEGY_SUFFIX(gemm_s8_12x8, "_dot")
 };
 template <>
 struct Kernel<uint8_t, true>
 {
-    using strategy = arm_gemm::gemm_u8_12x8;
+    DEFINE_STRATEGY_SUFFIX(gemm_u8_12x8, "_dot")
 };
 #else
 template <>
 struct Kernel<float, false>
 {
-    using strategy = arm_gemm::sgemm_8x6;
+    DEFINE_STRATEGY(sgemm_8x6)
 };
 #endif /* __aarch64__ */
 
+#undef DEFINE_STRATEGY
+#undef DEFINE_STRATEGY_SUFFIX
+
 } // namespace
 } // namespace arm_compute
 #endif /* __ARM_COMPUTE_NEGEMMINTERLEAVEDSTRATEGIES_H__ */