From 573c7bbb15c8f205e93397105e66fbc5102882e4 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 17 Nov 2020 18:46:40 +0000 Subject: Update tuning numbers for A55 for both fp16 and fp32 Resolves: COMPMID-3974 Signed-off-by: Georgios Pinitas Change-Id: I6d5189e44ebeda1575a80dd14ec3a09c75f68e03 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4521 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins (cherry picked from commit 40943df83026b66356f24e30f31f78c8b9e59c92) Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4169 Tested-by: Michele Di Giorgio --- src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp | 14 +++++++------- src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_8x24.hpp | 12 ++++++++++++ .../kernels/arm_gemm/kernels/a64_hybrid_fp16_mla_6x32.hpp | 11 +++++++++++ .../kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_6x16.hpp | 4 ++-- src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12.hpp | 4 ++-- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp b/src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp index de2e4f2c2b..75524fff97 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_fp16.cpp @@ -62,7 +62,7 @@ static const GemmImplementation<__fp16, __fp16> gemm_fp16_methods[] = { #endif #if defined(__aarch64__) && (defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) || defined(FP16_KERNELS)) -{ +GemmImplementation<__fp16, __fp16>::with_estimate( GemmMethod::GEMM_HYBRID, "a64_hybrid_fp16_mla_6x32", #ifndef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -70,10 +70,10 @@ static const GemmImplementation<__fp16, __fp16> gemm_fp16_methods[] = { #else nullptr, #endif - [](const GemmArgs &args) { return ((args._Ksize <= 256) && (args._Nsize <= 256)) || ((args._nmulti > 1) && ((args._Msize / args._maxthreads) < 8)); }, + [](const GemmArgs &args) { return GemmHybridIndirect::estimate_cycles(args, cls_a64_hybrid_fp16_mla_6x32::get_performance_parameters(args._ci)); }, [](const GemmArgs &args) { return new GemmHybridIndirect(args); } -}, -{ +), +GemmImplementation<__fp16, __fp16>::with_estimate( GemmMethod::GEMM_INTERLEAVED, "a64_hgemm_8x24", #ifndef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -81,16 +81,16 @@ static const GemmImplementation<__fp16, __fp16> gemm_fp16_methods[] = { #else nullptr, #endif - nullptr, + [](const GemmArgs &args) { return GemmInterleaved::estimate_cycles(args, cls_a64_hgemm_8x24::get_performance_parameters(args._ci)); }, [](const GemmArgs &args) { return new GemmInterleaved(args); } -}, +), #endif // aarch64 && FP16 #ifdef __aarch64__ { GemmMethod::GEMM_INTERLEAVED, "a64_sgemm_8x12", nullptr, - nullptr, + [](const GemmArgs &args) { return !args._ci->has_fp16(); }, [](const GemmArgs &args) { return new GemmInterleaved(args); } }, #elif defined(__arm__) diff --git a/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_8x24.hpp b/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_8x24.hpp index 73fb5b7122..24e258e4b8 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_8x24.hpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/a64_hgemm_8x24.hpp @@ -25,6 +25,7 @@ #if defined(__aarch64__) && (defined(FP16_KERNELS) || defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC)) +#include "../performance_parameters.hpp" #include "../std_transforms_fixed.hpp" namespace arm_gemm { @@ -61,6 +62,17 @@ public: // Use the standard fixed size transforms. StdTransformsFixed transforms = {}; + static PerformanceParameters get_performance_parameters(const CPUInfo *ci) + { + switch (ci->get_cpu_model()) { + case CPUModel::A55r1: + return { 7.16, 1.14, 0.67 }; + + default: + return { 12.67, 3.98, 1.16 }; + } + } + // Default to the generic kernel kern_type kernel = a64_hgemm_asimd_8x24; diff --git a/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp16_mla_6x32.hpp b/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp16_mla_6x32.hpp index 46de98504e..876b63c811 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp16_mla_6x32.hpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp16_mla_6x32.hpp @@ -71,6 +71,17 @@ public: StdTransformsFixed transforms = {}; + static PerformanceParameters get_performance_parameters(const CPUInfo *ci) + { + switch (ci->get_cpu_model()) { + case CPUModel::A55r1: + return { 5.22 }; + + default: + return { 14.53 }; + } + } + // Default to the generic kernel kern_type kernel=a64_hybrid_fp16_mla_6x32; diff --git a/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_6x16.hpp b/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_6x16.hpp index e0c61e4113..37d0b8f62d 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_6x16.hpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_fp32_mla_6x16.hpp @@ -73,7 +73,7 @@ public: static PerformanceParameters get_performance_parameters(const CPUInfo *ci) { switch (ci->get_cpu_model()) { case CPUModel::A55r1: - return { 2.00 }; + return { 2.287 }; case CPUModel::A53: return { 1.43 }; @@ -82,7 +82,7 @@ public: return { 2.56 }; default: - return { 6.26 }; + return { 6.667 }; } } diff --git a/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12.hpp b/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12.hpp index d77e1b0ac2..a3daf079d9 100644 --- a/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12.hpp +++ b/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12.hpp @@ -70,7 +70,7 @@ public: static PerformanceParameters get_performance_parameters(const CPUInfo *ci) { switch (ci->get_cpu_model()) { case CPUModel::A55r1: - return { 3.724, 1.416, 1.113 }; + return { 3.954, 1.252, 1.141 }; case CPUModel::A53: return { 2.777, 0.987, 0.898 }; @@ -79,7 +79,7 @@ public: return { 2.885, 1.429, 1.163 }; default: - return { 6.949, 4.149, 2.826 }; + return { 7.2307, 3.876, 2.932 }; } } -- cgit v1.2.1