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>

3 files changed, 36 insertions, 94 deletions

diff --git a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeBifrost.cpp b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeBifrost.cpp
index b769802663..52023dd835 100644
--- a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeBifrost.cpp
+++ b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeBifrost.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Arm Limited.
+ * Copyright (c) 2019-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,7 +28,6 @@
 #include "arm_compute/core/GPUTarget.h"
 #include "src/core/CL/gemm/CLGEMMHelpers.h"
 
-#include <map>
 #include <utility>
 
 namespace arm_compute
@@ -45,66 +44,35 @@ std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeBifrost
     using ConfigurationFunctionExecutorPtr = std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> (CLGEMMDefaultConfigNativeBifrost::*)(unsigned int m, unsigned int n, unsigned int k,
                                              unsigned int b);
 
-    // Configurations for Mali-G71
-    static std::map<DataType, ConfigurationFunctionExecutorPtr> gemm_configs_G71 =
-    {
-        { DataType::F32, &CLGEMMDefaultConfigNativeBifrost::configure_G71_f32 },
-        { DataType::QASYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_G71_u8 },
-        { DataType::QSYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_G71_u8 },
-        { DataType::QASYMM8_SIGNED, &CLGEMMDefaultConfigNativeBifrost::configure_G71_u8 },
-        { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultConfigNativeBifrost::configure_G71_u8 }
-    };
+    CLGEMMConfigArray<ConfigurationFunctionExecutorPtr> configs_G71(&CLGEMMDefaultConfigNativeBifrost::configure_G71_f32,
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_G71_f32, // We use the F32 heuristic
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_G71_u8);
 
-    // Configurations for Mali-G76
-    static std::map<DataType, ConfigurationFunctionExecutorPtr> gemm_configs_G76 =
-    {
-        { DataType::F32, &CLGEMMDefaultConfigNativeBifrost::configure_G76_f32 },
-        { DataType::QASYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_G76_u8 },
-        { DataType::QSYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_G76_u8 },
-        { DataType::QASYMM8_SIGNED, &CLGEMMDefaultConfigNativeBifrost::configure_G76_u8 },
-        { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultConfigNativeBifrost::configure_G76_u8 }
-    };
+    CLGEMMConfigArray<ConfigurationFunctionExecutorPtr> configs_G76(&CLGEMMDefaultConfigNativeBifrost::configure_G76_f32,
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_G76_f32, // We use the F32 heuristic
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_G76_u8);
 
-    // Default configurations
-    static std::map<DataType, ConfigurationFunctionExecutorPtr> gemm_configs_default =
-    {
-        { DataType::F32, &CLGEMMDefaultConfigNativeBifrost::configure_default_f32 },
-        { DataType::QASYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_default_u8 },
-        { DataType::QSYMM8, &CLGEMMDefaultConfigNativeBifrost::configure_default_u8 },
-        { DataType::QASYMM8_SIGNED, &CLGEMMDefaultConfigNativeBifrost::configure_default_u8 },
-        { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultConfigNativeBifrost::configure_default_u8 }
-    };
+    CLGEMMConfigArray<ConfigurationFunctionExecutorPtr> configs_G7x(&CLGEMMDefaultConfigNativeBifrost::configure_default_f32,
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_default_f32, // We use the F32 heuristic
+                                                                    &CLGEMMDefaultConfigNativeBifrost::configure_default_u8);
+
+    ConfigurationFunctionExecutorPtr func = nullptr;
 
     switch(_target)
     {
-        case GPUTarget::G71:
-            if(gemm_configs_G71.find(data_type) != gemm_configs_G71.end())
-            {
-                return (this->*gemm_configs_G71[data_type])(m, n, k, b);
-            }
-            else
-            {
-                ARM_COMPUTE_ERROR("Not supported data type");
-            }
         case GPUTarget::G76:
-            if(gemm_configs_G76.find(data_type) != gemm_configs_G76.end())
-            {
-                return (this->*gemm_configs_G76[data_type])(m, n, k, b);
-            }
-            else
-            {
-                ARM_COMPUTE_ERROR("Not supported data type");
-            }
+            func = configs_G76.get_function(data_type);
+            break;
+        case GPUTarget::G71:
+            func = configs_G71.get_function(data_type);
+            break;
         default:
-            if(gemm_configs_default.find(data_type) != gemm_configs_default.end())
-            {
-                return (this->*gemm_configs_default[data_type])(m, n, k, b);
-            }
-            else
-            {
-                ARM_COMPUTE_ERROR("Not supported data type");
-            }
+            func = configs_G7x.get_function(data_type);
+            break;
     }
+
+    ARM_COMPUTE_ERROR_ON_MSG(func == nullptr, "Data type not support for GEMM");
+    return (this->*func)(m, n, k, b);
 }
 
 std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeBifrost::configure_G71_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b)
diff --git a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeMidgard.cpp b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeMidgard.cpp
index 18a899047a..cf9bb1828f 100644
--- a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeMidgard.cpp
+++ b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeMidgard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Arm Limited.
+ * Copyright (c) 2020-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,7 +28,6 @@
 #include "arm_compute/core/GPUTarget.h"
 #include "src/core/CL/gemm/CLGEMMHelpers.h"
 
-#include <map>
 #include <utility>
 
 namespace arm_compute
@@ -45,20 +44,13 @@ std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeMidgard
     using ConfigurationFunctionExecutorPtr = std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> (CLGEMMDefaultConfigNativeMidgard::*)(unsigned int m, unsigned int n, unsigned int k,
                                              unsigned int b);
 
-    // Configurations for Midgard architectures
-    static std::map<DataType, ConfigurationFunctionExecutorPtr> default_configs =
-    {
-        { DataType::QASYMM8, &CLGEMMDefaultConfigNativeMidgard::default_q8 },
-        { DataType::QASYMM8_SIGNED, &CLGEMMDefaultConfigNativeMidgard::default_q8 },
-        { DataType::QSYMM8, &CLGEMMDefaultConfigNativeMidgard::default_q8 },
-        { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultConfigNativeMidgard::default_q8 }
-    };
+    CLGEMMConfigArray<ConfigurationFunctionExecutorPtr> configs_default(nullptr,
+                                                                        nullptr,
+                                                                        &CLGEMMDefaultConfigNativeMidgard::default_q8);
 
-    if(default_configs.find(data_type) != default_configs.end())
-    {
-        return (this->*default_configs[data_type])(m, n, k, b);
-    }
-    ARM_COMPUTE_ERROR("Not supported data type");
+    auto func = configs_default.get_function(data_type);
+    ARM_COMPUTE_ERROR_ON_MSG(func == nullptr, "Data type not support for GEMM");
+    return (this->*func)(m, n, k, b);
 }
 
 std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeMidgard::default_q8(unsigned int m, unsigned int n, unsigned int k, unsigned int b)
diff --git a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeValhall.cpp b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeValhall.cpp
index ab5aa11bf8..3b55be747f 100644
--- a/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeValhall.cpp
+++ b/src/core/CL/gemm/native/CLGEMMDefaultConfigNativeValhall.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Arm Limited.
+ * Copyright (c) 2020-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,7 +28,6 @@
 #include "arm_compute/core/GPUTarget.h"
 #include "src/core/CL/gemm/CLGEMMHelpers.h"
 
-#include <map>
 #include <utility>
 
 namespace arm_compute
@@ -45,30 +44,13 @@ std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeValhall
     using ConfigurationFunctionExecutorPtr = std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> (CLGEMMDefaultConfigNativeValhall::*)(unsigned int m, unsigned int n, unsigned int k,
                                              unsigned int b);
 
-    // Configurations for Mali-G77
-    static std::map<DataType, ConfigurationFunctionExecutorPtr> gemm_configs_G77 =
-    {
-        { DataType::F32, &CLGEMMDefaultConfigNativeValhall::configure_G77_f32 },
-        { DataType::F16, &CLGEMMDefaultConfigNativeValhall::configure_G77_f16 },
-        { DataType::QASYMM8, &CLGEMMDefaultConfigNativeValhall::configure_G77_u8 },
-        { DataType::QSYMM8, &CLGEMMDefaultConfigNativeValhall::configure_G77_u8 },
-        { DataType::QASYMM8_SIGNED, &CLGEMMDefaultConfigNativeValhall::configure_G77_u8 },
-        { DataType::QSYMM8_PER_CHANNEL, &CLGEMMDefaultConfigNativeValhall::configure_G77_u8 }
-    };
+    CLGEMMConfigArray<ConfigurationFunctionExecutorPtr> configs_default(&CLGEMMDefaultConfigNativeValhall::configure_G77_f32,
+                                                                        &CLGEMMDefaultConfigNativeValhall::configure_G77_f16,
+                                                                        &CLGEMMDefaultConfigNativeValhall::configure_G77_u8);
 
-    switch(_target)
-    {
-        case GPUTarget::G77:
-        default:
-            if(gemm_configs_G77.find(data_type) != gemm_configs_G77.end())
-            {
-                return (this->*gemm_configs_G77[data_type])(m, n, k, b);
-            }
-            else
-            {
-                ARM_COMPUTE_ERROR("Not supported data type");
-            }
-    }
+    auto func = configs_default.get_function(data_type);
+    ARM_COMPUTE_ERROR_ON_MSG(func == nullptr, "Data type not support for GEMM");
+    return (this->*func)(m, n, k, b);
 }
 
 std::pair<GEMMLHSMatrixInfo, GEMMRHSMatrixInfo> CLGEMMDefaultConfigNativeValhall::configure_G77_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b)