From ac314c25f41e3b2be2ef9073377079584fc88861 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Tue, 11 Sep 2018 17:49:10 +0100 Subject: COMPMID-1563: Fix name of NEGEMMInterleavedWrapper Change-Id: I5f868091cae7bd86eeeb7216d44f32c190c5a604 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/147804 Tested-by: bsgcomp Reviewed-by: Georgios Pinitas --- .../kernels/assembly/NEGEMMInterleavedStrategies.h | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/core/NEON/kernels/assembly/NEGEMMInterleavedStrategies.h') 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 { - using strategy = arm_gemm::hgemm_24x8; + DEFINE_STRATEGY(hgemm_24x8) }; #endif /*__ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ #ifdef __aarch64__ template <> struct Kernel { - using strategy = arm_gemm::sgemm_12x8; + DEFINE_STRATEGY(sgemm_12x8) }; template <> struct Kernel { - using strategy = arm_gemm::gemm_s8_4x4; + DEFINE_STRATEGY(gemm_s8_4x4) }; template <> struct Kernel { - using strategy = arm_gemm::gemm_u8_4x4; + DEFINE_STRATEGY(gemm_u8_4x4) }; //Use different strategies for 8bit dot product: template <> struct Kernel { - using strategy = arm_gemm::gemm_s8_12x8; + DEFINE_STRATEGY_SUFFIX(gemm_s8_12x8, "_dot") }; template <> struct Kernel { - using strategy = arm_gemm::gemm_u8_12x8; + DEFINE_STRATEGY_SUFFIX(gemm_u8_12x8, "_dot") }; #else template <> struct Kernel { - 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__ */ -- cgit v1.2.1