diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-10-14 19:03:09 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-10-23 12:08:12 +0000 |
commit | 48b3ef89de5f21a0169d8416e3d54081f82c7bf8 (patch) | |
tree | f857d733ccf446c704823dc7ac796a96eb55095e /src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp | |
parent | 1dce3101ef8d77c8cf0af7dfd4af6595a0136b91 (diff) | |
download | ComputeLibrary-48b3ef89de5f21a0169d8416e3d54081f82c7bf8.tar.gz |
COMPMID-2577: Fuse bias addition and activation in gemm assembly kernels
Change-Id: I7f52112d2d05b1ea3d3f3d4b19b8eafab05d6c44
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2141
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp')
-rw-r--r-- | src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp b/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp index 55d72f88cb..569d1f44ca 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_implementation.hpp @@ -34,13 +34,13 @@ namespace arm_gemm { */ template<typename Top, typename Tret, class OutputStage = Nothing> struct GemmImplementation { - const GemmMethod method; - const char * name; - std::function<bool(const GemmArgs<Tret> &, const OutputStage &)> is_supported; - std::function<bool(const GemmArgs<Tret> &, const OutputStage &)> is_recommended; - std::function<GemmCommon<Top, Tret> *(const GemmArgs<Tret> &, const OutputStage &)> instantiate; + const GemmMethod method; + const char * name; + std::function<bool(const GemmArgs &, const OutputStage &)> is_supported; + std::function<bool(const GemmArgs &, const OutputStage &)> is_recommended; + std::function<GemmCommon<Top, Tret> *(const GemmArgs &, const OutputStage &)> instantiate; - bool do_is_supported(const GemmArgs<Tret> &args, const OutputStage &os) const { + bool do_is_supported(const GemmArgs &args, const OutputStage &os) const { if (is_supported != nullptr) { return is_supported(args, os); } else { @@ -48,7 +48,7 @@ struct GemmImplementation { } } - bool do_is_recommended(const GemmArgs<Tret> &args, const OutputStage &os) const { + bool do_is_recommended(const GemmArgs &args, const OutputStage &os) const { if (is_recommended != nullptr) { return is_recommended(args, os); } else { @@ -56,7 +56,7 @@ struct GemmImplementation { } } - GemmCommon<Top, Tret> *do_instantiate(const GemmArgs<Tret> &args, const OutputStage &os) const { + GemmCommon<Top, Tret> *do_instantiate(const GemmArgs &args, const OutputStage &os) const { return instantiate(args, os); } }; @@ -66,13 +66,13 @@ struct GemmImplementation { * unnecessary second argument. */ template<typename Top, typename Tret> struct GemmImplementation<Top, Tret, Nothing> { - const GemmMethod method; - const char * name; - std::function<bool(const GemmArgs<Tret> &)> is_supported; - std::function<bool(const GemmArgs<Tret> &)> is_recommended; - std::function<GemmCommon<Top, Tret> *(const GemmArgs<Tret> &)> instantiate; + const GemmMethod method; + const char * name; + std::function<bool(const GemmArgs &)> is_supported; + std::function<bool(const GemmArgs &)> is_recommended; + std::function<GemmCommon<Top, Tret> *(const GemmArgs &)> instantiate; - bool do_is_supported(const GemmArgs<Tret> &args, const Nothing &) const { + bool do_is_supported(const GemmArgs &args, const Nothing &) const { if (is_supported != nullptr) { return is_supported(args); } else { @@ -80,7 +80,7 @@ struct GemmImplementation<Top, Tret, Nothing> { } } - bool do_is_recommended(const GemmArgs<Tret> &args, const Nothing &) const { + bool do_is_recommended(const GemmArgs &args, const Nothing &) const { if (is_recommended != nullptr) { return is_recommended(args); } else { @@ -88,7 +88,7 @@ struct GemmImplementation<Top, Tret, Nothing> { } } - GemmCommon<Top, Tret> *do_instantiate(const GemmArgs<Tret> &args, const Nothing &) const { + GemmCommon<Top, Tret> *do_instantiate(const GemmArgs &args, const Nothing &) const { return instantiate(args); } }; @@ -116,7 +116,7 @@ const GemmImplementation<Top, Tret, OutputStage> *gemm_implementation_list(); * reference. */ template<typename Top, typename Tret, class OutputStage> -bool find_implementation(const GemmArgs<Tret> &args, const OutputStage &os, const GemmImplementation<Top, Tret, OutputStage> * &impl) { +bool find_implementation(const GemmArgs &args, const OutputStage &os, const GemmImplementation<Top, Tret, OutputStage> * &impl) { auto gemms = gemm_implementation_list<Top, Tret, OutputStage>(); const GemmConfig *cfg = args._cfg; @@ -168,7 +168,7 @@ bool find_implementation(const GemmArgs<Tret> &args, const OutputStage &os, cons } template<typename Top, typename Tret, class OutputStage> -std::vector<KernelDescription> get_compatible_kernels(const GemmArgs<Tret> &args, const OutputStage &os) { +std::vector<KernelDescription> get_compatible_kernels(const GemmArgs &args, const OutputStage &os) { std::vector<KernelDescription> res; /* Find out what the default implementation in so we can set the flag accordingly later. */ @@ -190,7 +190,7 @@ std::vector<KernelDescription> get_compatible_kernels(const GemmArgs<Tret> &args } template<typename Top, typename Tret, class OutputStage> -UniqueGemmCommon<Top, Tret> gemm(const GemmArgs<Tret> &args, const OutputStage &os) { +UniqueGemmCommon<Top, Tret> gemm(const GemmArgs &args, const OutputStage &os) { const GemmImplementation<Top, Tret, OutputStage> *impl; if (find_implementation<Top, Tret, OutputStage>(args, os, impl)) { @@ -201,7 +201,7 @@ UniqueGemmCommon<Top, Tret> gemm(const GemmArgs<Tret> &args, const OutputStage & } template<typename Top, typename Tret, class OutputStage> -KernelDescription get_gemm_method(const GemmArgs<Tret> &args, const OutputStage &os) { +KernelDescription get_gemm_method(const GemmArgs &args, const OutputStage &os) { const GemmImplementation<Top, Tret, OutputStage> *impl; if (find_implementation<Top, Tret>(args, os, impl)) { |