Rename the files and classes required by the OpenCL GEMM heuristic
All existing kernel type selection heuristics
CLGEMMKernelSelection<Architecture> are renamed to
CLGEMMDefaultType<Architecture>
All existing kernel configuration heuristics
CLGEMM<KernelType>KernelConfiguration<Architecture> are renamed to
CLGEMMDefaultConfig<KernelType><Architecture>
This refactoring is required to make room for tuner-based heuristics
Resolves COMPMID-3842
Change-Id: I2c9f1029ad67f1e2808c79871698fc4486d45306
Signed-off-by: SiCong Li <sicong.li@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4639
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
diff --git a/Android.bp b/Android.bp
index bf68dd4..8c29386 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,13 +71,13 @@
"src/core/CL/ICLTensor.cpp",
"src/core/CL/OpenCL.cpp",
"src/core/CL/gemm/CLGEMMHelpers.cpp",
- "src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.cpp",
- "src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationMidgard.cpp",
- "src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.cpp",
- "src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.cpp",
- "src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.cpp",
- "src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp",
- "src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.cpp",
+ "src/core/CL/gemm/native/CLGEMMDefaultConfigNativeBifrost.cpp",
+ "src/core/CL/gemm/native/CLGEMMDefaultConfigNativeMidgard.cpp",
+ "src/core/CL/gemm/native/CLGEMMDefaultConfigNativeValhall.cpp",
+ "src/core/CL/gemm/reshaped/CLGEMMDefaultConfigReshapedBifrost.cpp",
+ "src/core/CL/gemm/reshaped/CLGEMMDefaultConfigReshapedValhall.cpp",
+ "src/core/CL/gemm/reshaped_only_rhs/CLGEMMDefaultConfigReshapedRHSOnlyBifrost.cpp",
+ "src/core/CL/gemm/reshaped_only_rhs/CLGEMMDefaultConfigReshapedRHSOnlyValhall.cpp",
"src/core/CL/kernels/CLAbsoluteDifferenceKernel.cpp",
"src/core/CL/kernels/CLAccumulateKernel.cpp",
"src/core/CL/kernels/CLActivationLayerKernel.cpp",
@@ -584,9 +584,9 @@
"src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
"src/runtime/CL/functions/CLWinogradInputTransform.cpp",
"src/runtime/CL/functions/CLYOLOLayer.cpp",
- "src/runtime/CL/gemm/CLGEMMKernelSelectionBifrost.cpp",
- "src/runtime/CL/gemm/CLGEMMKernelSelectionMidgard.cpp",
- "src/runtime/CL/gemm/CLGEMMKernelSelectionValhall.cpp",
+ "src/runtime/CL/gemm/CLGEMMDefaultTypeBifrost.cpp",
+ "src/runtime/CL/gemm/CLGEMMDefaultTypeMidgard.cpp",
+ "src/runtime/CL/gemm/CLGEMMDefaultTypeValhall.cpp",
"src/runtime/CL/tuners/BifrostTuner.cpp",
"src/runtime/CL/tuners/CLLWSList.cpp",
"src/runtime/CL/tuners/MidgardTuner.cpp",