From 90313eb8f72cf9ba17cbf7b84382a609e927a1fe Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Wed, 16 Jan 2019 15:40:25 +0000 Subject: COMPMID-1687: Optimize CLGEMMMatrixMultiplyKernel Change-Id: I040478ff7aa04f0523ed6e302129b829442cb194 Reviewed-on: https://review.mlplatform.org/534 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou --- .../runtime/CL/ICLGEMMReshapedConfiguration.h | 48 +++++++++++++++++++ arm_compute/runtime/CL/functions/CLGEMM.h | 2 +- .../CL/gemm_reshaped/CLGEMMReshapedConfiguration.h | 56 ++++++++++++++++++++++ .../CLGEMMReshapedConfigurationBifrost.h | 46 ++++++++++++++++++ 4 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h create mode 100644 arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfiguration.h create mode 100644 arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.h (limited to 'arm_compute/runtime/CL') diff --git a/arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h b/arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h new file mode 100644 index 0000000000..500d9cd492 --- /dev/null +++ b/arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_ICLGEMMRESHAPEDCONFIGURATION_H__ +#define __ARM_COMPUTE_ICLGEMMRESHAPEDCONFIGURATION_H__ + +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +/** Basic interface for the GEMM selection */ +class ICLGEMMReshapedConfiguration +{ +public: + /** Virtual destructor */ + virtual ~ICLGEMMReshapedConfiguration() = default; + /** Given M, N, K and B, this method returns the @ref GEMMLHSMatrixInfo and @ref GEMMRHSMatrixInfo to be used with @ref CLGEMMMatrixMultiplyReshapedKernel + * + * @param[in] m Number of rows LHS matrix + * @param[in] n Number of columns RHS matrix + * @param[in] k Number of columns LHS matrix or number of rows RHS matrix + * @param[in] b Batch size + * @param[in] data_type Data type + */ + virtual std::pair configure(unsigned int m, unsigned int n, unsigned int k, unsigned int b, DataType data_type) = 0; +}; +} // namespace arm_compute +#endif /*__ARM_COMPUTE_ICLGEMMRESHAPEDCONFIGURATION_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLGEMM.h b/arm_compute/runtime/CL/functions/CLGEMM.h index 624df33ef6..3ec07cf5f9 100644 --- a/arm_compute/runtime/CL/functions/CLGEMM.h +++ b/arm_compute/runtime/CL/functions/CLGEMM.h @@ -115,7 +115,7 @@ private: bool _run_addition; bool _reshape_b_only_on_first_run; bool _is_prepared; - bool _is_G76_path; + bool _is_new_gemm_reshaped; // Removed when COMPMID-1892 is completed }; } // namespace arm_compute diff --git a/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfiguration.h b/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfiguration.h new file mode 100644 index 0000000000..3458911a97 --- /dev/null +++ b/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfiguration.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATION_H__ +#define __ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATION_H__ + +#include "arm_compute/runtime/CL/CLScheduler.h" +#include "arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h" +#include "arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.h" + +#include + +namespace arm_compute +{ +namespace cl_gemm +{ +/** Tuner factory class */ +class CLGEMMReshapedConfigurationFactory final +{ +public: + static std::unique_ptr create() + { + GPUTarget arch = get_arch_from_target(CLScheduler::get().target()); + + switch(arch) + { + case GPUTarget::BIFROST: + return support::cpp14::make_unique(); + default: + return nullptr; + } + } +}; +} // namespace tuners +} // namespace arm_compute +#endif /*__ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATION_H__ */ diff --git a/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.h b/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.h new file mode 100644 index 0000000000..b452c53c39 --- /dev/null +++ b/arm_compute/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATIONBIFROST_H__ +#define __ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATIONBIFROST_H__ + +#include "arm_compute/runtime/CL/ICLGEMMReshapedConfiguration.h" + +namespace arm_compute +{ +namespace cl_gemm +{ +/** Bifrost based OpenCL GEMM reshaped configuration */ +class CLGEMMReshapedConfigurationBifrost final : public ICLGEMMReshapedConfiguration +{ +public: + // Inherited overridden method + std::pair configure(unsigned int m, unsigned int n, unsigned int k, unsigned int b, DataType data_type) override; + +private: + std::pair configure_G7x_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G76_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b); +}; +} // namespace cl_gemm +} // namespace arm_compute +#endif /*__ARM_COMPUTE_CLGEMMRESHAPEDCONFIGURATIONBIFROST_H__ */ -- cgit v1.2.1