From 463f976813a99b1eda347c619c6b7baf098757b8 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Tue, 19 May 2020 14:12:27 +0100 Subject: COMPMID-3496: Fix for GEMM_INTERLEAVE_2D GEMM_INTERLEAVE_2D was wrongly selected by the heuristic also in case of maxthreads < 8 Change-Id: If531d44c6f00ae6f8e3a4bf22428829b252bc3d6 Signed-off-by: Gian Marco Iodice Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3225 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/core/NEON') diff --git a/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp b/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp index e3355ed2d5..8bef2b7bae 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_fp32.cpp @@ -149,25 +149,25 @@ static const GemmImplementation gemm_fp32_methods[] = //Pretranpose, 2D split { GemmMethod::GEMM_INTERLEAVED_2D, - "sgemm_12x8", - [](const GemmArgs &args) { return args._pretransposed_hint; }, + "sgemm_12x8_pretranspose_2d", [](const GemmArgs &args) { return args._pretransposed_hint; }, + [](const GemmArgs &args) { return args._maxthreads >= 8; }, [](const GemmArgs &args) { return new GemmInterleavedPretransposed2d(args); } }, //Tranpose, 2D split, no blockmanager { GemmMethod::GEMM_INTERLEAVED_2D, - "sgemm_12x8", - [](const GemmArgs &args) { return (!args._pretransposed_hint) && args._maxthreads >= 8; }, - [](const GemmArgs &args) { return (!args._pretransposed_hint) && args._maxthreads >= 8; }, + "sgemm_12x8_2d", + nullptr, + [](const GemmArgs &args) { return (!args._pretransposed_hint) && (args._maxthreads >= 8); }, [](const GemmArgs &args) { return new GemmInterleaved2d(args); } }, //Tranpose, 1D split, with blockmanager { GemmMethod::GEMM_INTERLEAVED, - "sgemm_12x8", - [](const GemmArgs &args) { return (!args._pretransposed_hint); }, - [](const GemmArgs &args) { return (!args._pretransposed_hint); }, + "sgemm_12x8_1d", + nullptr, + nullptr, [](const GemmArgs &args) { return new GemmInterleaved(args); } }, -- cgit v1.2.1