diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2021-04-12 17:34:33 +0100 |
---|---|---|
committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2021-04-16 11:49:52 +0000 |
commit | 379549191246f7742d8175edd88d8cff8de3feda (patch) | |
tree | f7fb4586307c56f4c13375ec02c03e73049aadbd /src/runtime/CL | |
parent | ebbb6f9e2735f903a4cb75c23ab7c80797079c25 (diff) | |
download | ComputeLibrary-379549191246f7742d8175edd88d8cff8de3feda.tar.gz |
Add GEMM heuristic for Mali-G78
- Replace std::map with a basic container with std::array
Change-Id: I76f53ca61676ca0e5136ce61a3f3adb10e22b4c3
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5441
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL')
-rw-r--r-- | src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp | 90 | ||||
-rw-r--r-- | src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.h | 4 |
2 files changed, 92 insertions, 2 deletions
diff --git a/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp b/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp index ad74368889..0f754276c7 100644 --- a/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp +++ b/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -68,10 +68,27 @@ CLGEMMKernelType CLGEMMDefaultTypeValhall::select_kernel(const CLGEMMKernelSelec { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultTypeValhall::default_q8 } }; + // Mali-G78 configurations + static std::map<DataType, FunctionExecutorPtr> gemm_g78_configs = + { + { DataType::F32, &CLGEMMDefaultTypeValhall::g78_f32 }, + { DataType::F16, &CLGEMMDefaultTypeValhall::g78_f16 }, + { DataType::QASYMM8, &CLGEMMDefaultTypeValhall::default_q8 }, + { DataType::QASYMM8_SIGNED, &CLGEMMDefaultTypeValhall::default_q8 }, + { DataType::QSYMM8, &CLGEMMDefaultTypeValhall::default_q8 }, + { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultTypeValhall::default_q8 } + }; + const DataType data_type = params.data_type; switch(_target) { + case GPUTarget::G78: + if(gemm_g78_configs.find(data_type) != gemm_g78_configs.end()) + { + return (this->*gemm_g78_configs[data_type])(params.m, params.n, params.k, params.b, params.is_rhs_constant); + } + ARM_COMPUTE_ERROR("Not supported data type"); case GPUTarget::G77: if(gemm_g77_configs.find(data_type) != gemm_g77_configs.end()) { @@ -218,5 +235,76 @@ CLGEMMKernelType CLGEMMDefaultTypeValhall::default_q8(unsigned int m, unsigned i return CLGEMMKernelType::NATIVE; } } + +CLGEMMKernelType CLGEMMDefaultTypeValhall::g78_f32(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; + } + + if(m == 1) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + + if(n <= 272.0000f) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + if(k <= 471.0000f) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + if(m <= 72.5000f) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + if(m <= 90.5000f) + { + return CLGEMMKernelType::RESHAPED; + } + else + { + if(k <= 2448.0000f) + { + if(n <= 756.0000f) + { + return CLGEMMKernelType::RESHAPED_ONLY_RHS; + } + else + { + return CLGEMMKernelType::RESHAPED; + } + } + else + { + return CLGEMMKernelType::RESHAPED; + } + } + } + } + } +} + +CLGEMMKernelType CLGEMMDefaultTypeValhall::g78_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant) +{ + ARM_COMPUTE_UNUSED(m, n, k, b); + + if(!is_rhs_constant) + { + return CLGEMMKernelType::NATIVE_V1; + } + + return CLGEMMKernelType::RESHAPED_ONLY_RHS; +} } // namespace cl_gemm } // namespace arm_compute diff --git a/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.h b/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.h index 2fae838cc3..c88fbcf557 100644 --- a/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.h +++ b/src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -48,6 +48,8 @@ private: CLGEMMKernelType default_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant); CLGEMMKernelType default_q8(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant); CLGEMMKernelType g77_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant); + CLGEMMKernelType g78_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant); + CLGEMMKernelType g78_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b, bool is_rhs_constant); }; } // namespace cl_gemm } // namespace arm_compute |