diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2020-11-23 16:10:27 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-11-23 18:17:36 +0000 |
commit | 8919a1a849e425aefcd09c5db5f6f9f2e403d4e9 (patch) | |
tree | efba31c6a28143db7724dac008e19b1636bd7b16 /src/runtime | |
parent | 5fa963fbbc00c716e120287051747b144e2d784c (diff) | |
download | ComputeLibrary-8919a1a849e425aefcd09c5db5f6f9f2e403d4e9.tar.gz |
COMPMID-4018: Fix heuristic fallback for CLGEMMReshapedRHSOnly for
Mali-G52
- Missing fallback in case of export to cl_image
Change-Id: I5bb3013fd1350628f16e4709c4bb31999fece22d
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4531
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime')
-rw-r--r-- | src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp | 125 |
1 files changed, 59 insertions, 66 deletions
diff --git a/src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp b/src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp index 46d07fffba..0bda38e5e9 100644 --- a/src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp +++ b/src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp @@ -445,8 +445,6 @@ CLGEMMKernelType CLGEMMKernelSelectionBifrost::g76_f16(unsigned int m, unsigned CLGEMMKernelType CLGEMMKernelSelectionBifrost::g52_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant) { - ARM_COMPUTE_UNUSED(b); - if (!is_rhs_constant) { return CLGEMMKernelType::NATIVE_V1; @@ -457,26 +455,25 @@ CLGEMMKernelType CLGEMMKernelSelectionBifrost::g52_f16(unsigned int m, unsigned return CLGEMMKernelType::RESHAPED_ONLY_RHS; } - const float r_mn = static_cast<float>(m) / static_cast<float>(n); - const float r_mk = static_cast<float>(m) / static_cast<float>(k); - const float r_nk = static_cast<float>(n) / static_cast<float>(k); - const float r_mnk = static_cast<float>(m) / (static_cast<float>(n) * static_cast<float>(k)); - - if(r_mn <= 22.9200f) + if(n <= 127.0000f) { - if(r_mk <= 0.0157f) + if(n <= 63.5000f) { return CLGEMMKernelType::RESHAPED_ONLY_RHS; } else { - if(r_mnk <= 7809.3750f) + if(m <= 3616.0000f) { - if(r_mnk <= 101.7937f) + if(b <= 18.5000f) { - if(r_mn <= 0.4594f) + if(m <= 2970.5000f) { - if(r_mk <= 0.0557f) + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + if(k <= 104.0000f) { return CLGEMMKernelType::RESHAPED_ONLY_RHS; } @@ -485,80 +482,76 @@ CLGEMMKernelType CLGEMMKernelSelectionBifrost::g52_f16(unsigned int m, unsigned return CLGEMMKernelType::RESHAPED; } } - else - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } } else { - if(r_nk <= 0.4396f) + return CLGEMMKernelType::RESHAPED; + } + } + else + { + return CLGEMMKernelType::RESHAPED; + } + } + } + else + { + if(m <= 12.5000f) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + if(k <= 104.0000f) + { + if(b <= 18.5000f) + { + if(m <= 490.0000f) { - if(r_mn <= 1.5182f) + if(n <= 272.0000f) { - if(r_mnk <= 1709.9167f) - { - return CLGEMMKernelType::RESHAPED; - } - else - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } + return CLGEMMKernelType::RESHAPED_ONLY_RHS; } else { - if(r_mnk <= 1330.6000f) - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } - else - { - return CLGEMMKernelType::RESHAPED; - } + return CLGEMMKernelType::RESHAPED; } } else { - if(r_mn <= 2.5896f) + return CLGEMMKernelType::RESHAPED; + } + } + else + { + return CLGEMMKernelType::RESHAPED; + } + } + else + { + if(m <= 226.0000f) + { + if(n <= 140.0000f) + { + if(m <= 179.5000f) { return CLGEMMKernelType::RESHAPED; } else { - if(r_mnk <= 326.6667f) - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } - else - { - return CLGEMMKernelType::RESHAPED; - } + return CLGEMMKernelType::RESHAPED_ONLY_RHS; } } + else + { + return CLGEMMKernelType::RESHAPED; + } + } + else + { + return CLGEMMKernelType::RESHAPED; } } - else - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } - } - } - else - { - if(r_mn <= 86.7578f) - { - if(r_mnk <= 11231.6406f) - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; - } - else - { - return CLGEMMKernelType::RESHAPED; - } - } - else - { - return CLGEMMKernelType::RESHAPED_ONLY_RHS; } } } |