diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-11-05 13:35:47 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-11-11 12:33:13 +0000 |
| commit | 77d42528b796f3b8f5033785d3bbb8d9cb3fc637 (patch) | |
| tree | 9e8055e63f8475c5dde7d03768307e3eb7580a8a /src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp | |
| parent | 9aaf09ec557dcce63cd1b5de173ce8947108327d (diff) | |
| download | ComputeLibrary-77d42528b796f3b8f5033785d3bbb8d9cb3fc637.tar.gz | |
COMPMID-2853: VGG16 regression for fp32
* Caps dynamic scheduling granule to a max number
Change-Id: I35a9239bc9984dbc1b416c40c4c1b4ac7f5808bd
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2223
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp index 43e531579a..88e060109a 100644 --- a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp +++ b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp @@ -201,6 +201,8 @@ private: IWeightsManager *_weights_manager{ nullptr }; /** Weights transform object */ FallbackTransform<TypeInput, TypeOutput> _weights_transform{}; + /** GEMM kernel description */ + arm_gemm::KernelDescription _kernel_info{}; }; template <typename TypeInput, typename TypeOutput, class OutputStage> @@ -208,12 +210,12 @@ void Fallback<TypeInput, TypeOutput, OutputStage>::configure(const ITensor *a, c arm_gemm::GemmArgs args, const GEMMInfo &gemm_info, MemoryGroup &memory_group, IWeightsManager *weights_manager, const OutputStage &os) { - arm_gemm::GemmConfig gemm_cfg; - const arm_gemm::KernelDescription gemm_kernel_info = arm_gemm::get_gemm_method<TypeInput, TypeOutput, OutputStage>(args, os); - _weights_manager = weights_manager; - if(gemm_kernel_info.method != arm_gemm::GemmMethod::GEMV_BATCHED) + arm_gemm::GemmConfig gemm_cfg; + _kernel_info = arm_gemm::get_gemm_method<TypeInput, TypeOutput, OutputStage>(args, os); + _weights_manager = weights_manager; + if(_kernel_info.method != arm_gemm::GemmMethod::GEMV_BATCHED) { - gemm_cfg.filter = gemm_kernel_info.name; + gemm_cfg.filter = _kernel_info.name; args._cfg = &gemm_cfg; } _gemm_kernel_asm = arm_gemm::gemm<TypeInput, TypeOutput, OutputStage>(args, os); @@ -387,7 +389,13 @@ void Fallback<TypeInput, TypeOutput, OutputStage>::run() bias, 0); // Schedule assembly kernel - NEScheduler::get().schedule(_optimised_kernel.get(), Window::DimX); + IScheduler::Hints scheduling_hint = IScheduler::Hints(Window::DimX); + if(_kernel_info.method == arm_gemm::GemmMethod::GEMM_INTERLEAVED) + { + constexpr int granule_threshold = 200; + scheduling_hint = IScheduler::Hints(Window::DimX, IScheduler::StrategyHint::DYNAMIC, granule_threshold); + } + NEScheduler::get().schedule(_optimised_kernel.get(), scheduling_hint); } template <typename TypeInput, typename TypeOutput> |