diff options
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp b/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp index d74f335e38..d5a9e585b5 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp @@ -28,7 +28,6 @@ #include "gemm_implementation.hpp" #include "gemm_interleaved.hpp" #include "gemm_hybrid.hpp" -#include "gemm_native.hpp" #include "kernels/a64_gemm_u16_12x8.hpp" #include "kernels/a64_gemm_u8_12x8.hpp" @@ -40,7 +39,6 @@ #include "kernels/sve_hybrid_u8u32_dot_4VLx4.hpp" #include "kernels/sve_interleaved_u8u32_dot_3VLx8.hpp" #include "kernels/sve_interleaved_u8u32_mmla_3VLx8.hpp" -#include "kernels/sve_native_u8u32_dot_4VLx4.hpp" #include "kernels/sve_smallK_hybrid_u8u32_dot_1VLx8.hpp" namespace arm_gemm { @@ -59,25 +57,18 @@ static const GemmImplementation<uint8_t, uint32_t> gemm_u8_methods[] = { { GemmMethod::GEMM_HYBRID, "smallK_hybrid_u8u32_dot_1VLx8", - [](const GemmArgs &args) { return args._Ksize<=64 && !args._trA && args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._Ksize<=64; }, nullptr, [](const GemmArgs &args) { return new GemmHybrid<smallK_hybrid_u8u32_dot_1VLx8, uint8_t, uint32_t>(args); } }, { GemmMethod::GEMM_HYBRID, "hybrid_u8u32_dot_4VLx4", - [](const GemmArgs &args) { return args._Ksize>=16 && !args._trA && args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._Ksize>=16; }, [](const GemmArgs &args) { return ((args._Ksize <= 128) && (args._Nsize <= 128)) || ((args._nmulti > 1) && ((args._Msize / args._maxthreads) < 8)); }, [](const GemmArgs &args) { return new GemmHybrid<hybrid_u8u32_dot_4VLx4, uint8_t, uint32_t>(args); } }, { - GemmMethod::GEMM_NATIVE, - "native_u8u32_dot_4VLx4", - [](const GemmArgs &args) { return (args._Ksize>=16 && !args._trA && !args._trB); }, - [](const GemmArgs &args) { return ((args._Ksize <= 128) && (args._Nsize <= 128)); }, - [](const GemmArgs &args) { return new GemmNative<native_u8u32_dot_4VLx4, uint8_t, uint32_t>(args); } -}, -{ GemmMethod::GEMM_INTERLEAVED, "interleaved_u8u32_dot_3VLx8", [](const GemmArgs &args) { return (args._Ksize>4); }, @@ -97,21 +88,21 @@ static const GemmImplementation<uint8_t, uint32_t> gemm_u8_methods[] = { { GemmMethod::GEMM_HYBRID, "smallK_hybrid_u8u32_dot_4x8", - [](const GemmArgs &args) { return args._ci->has_dotprod() && (args._Nsize % 4 == 0) && (args._Ksize<=32) && !args._trA && args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._ci->has_dotprod() && (args._Nsize % 4 == 0) && (args._Ksize<=32); }, nullptr, [](const GemmArgs &args) { return new GemmHybrid<smallK_hybrid_u8u32_dot_4x8, uint8_t, uint32_t>(args); } }, { GemmMethod::GEMM_HYBRID, "smallK_hybrid_u8u32_dot_4x6", - [](const GemmArgs &args) { return args._ci->has_dotprod() && (args._Nsize % 4 == 0) && (args._Ksize>32) && (args._Ksize<=64) && !args._trA && args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._ci->has_dotprod() && (args._Nsize % 4 == 0) && (args._Ksize>32) && (args._Ksize<=64); }, nullptr, [](const GemmArgs &args) { return new GemmHybrid<smallK_hybrid_u8u32_dot_4x6, uint8_t, uint32_t>(args); } }, { GemmMethod::GEMM_HYBRID, "hybrid_u8u32_dot_16x4", - [](const GemmArgs &args) { return args._ci->has_dotprod() && args._Ksize>=16 && !args._trA && !args._trB && args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._ci->has_dotprod() && args._Ksize>=16; }, [](const GemmArgs &args) { return args._Nsize<=256 && args._Ksize>128; }, [](const GemmArgs &args) { return new GemmHybrid<hybrid_u8u32_dot_16x4, uint8_t, uint32_t>(args); } }, |