From 12f2b8c316155660f1e612fe7e8fab7861decc03 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Thu, 13 Feb 2020 12:27:37 +0000 Subject: COMPMID-3202: Add support for Valhall architecture in GEMM Change-Id: I2cd0b5ee0ae2e3c65a04c7be70478b0452e55132 Signed-off-by: Gian Marco Iodice Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2730 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- .../gemm/native/CLGEMMNativeKernelConfiguration.h | 24 ++++++--- .../CLGEMMNativeKernelConfigurationBifrost.h | 6 +-- .../CLGEMMNativeKernelConfigurationValhall.h | 61 ++++++++++++++++++++++ .../reshaped/CLGEMMReshapedKernelConfiguration.h | 24 ++++++--- .../CLGEMMReshapedKernelConfigurationBifrost.h | 6 +-- .../CLGEMMReshapedKernelConfigurationValhall.h | 61 ++++++++++++++++++++++ .../CLGEMMReshapedOnlyRHSKernelConfiguration.h | 24 ++++++--- ...GEMMReshapedOnlyRHSKernelConfigurationBifrost.h | 6 +-- ...GEMMReshapedOnlyRHSKernelConfigurationValhall.h | 61 ++++++++++++++++++++++ 9 files changed, 243 insertions(+), 30 deletions(-) create mode 100644 arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h create mode 100644 arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h create mode 100644 arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h (limited to 'arm_compute/core/CL/gemm') diff --git a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h index 834afa37ce..fced41b261 100644 --- a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h +++ b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,6 +26,7 @@ #include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" #include "arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.h" +#include "arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h" #include @@ -37,17 +38,26 @@ namespace cl_gemm class CLGEMMNativeKernelConfigurationFactory final { public: - /** Static method to construct CLGEMMNative kernel object accordingly with the GPU architecture + /** Static method to construct CLGEMMNative kernel object accordingly with the GPU target * - * @param[in] arch GPU target + * @param[in] gpu GPU target * * @return CLGEMMNative kernel configuration class */ - static std::unique_ptr create(GPUTarget arch) + static std::unique_ptr create(GPUTarget gpu) { - // Note: At the moment we only support Bifrost architecture. However, we should have a dedicated path for each GPU architecture - // using get_arch_from_target(arch) - return support::cpp14::make_unique(arch); + switch(get_arch_from_target(gpu)) + { + case GPUTarget::MIDGARD: + case GPUTarget::BIFROST: + return support::cpp14::make_unique(gpu); + break; + case GPUTarget::VALHALL: + return support::cpp14::make_unique(gpu); + break; + default: + ARM_COMPUTE_ERROR("Not supported GPU target"); + } } }; } // namespace cl_gemm diff --git a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.h b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.h index 6df4aaf4d3..29b8e08a80 100644 --- a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.h +++ b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationBifrost.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,9 +36,9 @@ class CLGEMMNativeKernelConfigurationBifrost final : public ICLGEMMKernelConfigu public: /** Constructor * - * @param[in] arch GPU target + * @param[in] gpu GPU target */ - CLGEMMNativeKernelConfigurationBifrost(GPUTarget arch); + CLGEMMNativeKernelConfigurationBifrost(GPUTarget gpu); /** Prevent instances of this class from being copied (As this class contains pointers) */ CLGEMMNativeKernelConfigurationBifrost(const CLGEMMNativeKernelConfigurationBifrost &) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ diff --git a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h new file mode 100644 index 0000000000..f6a61a24b8 --- /dev/null +++ b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2020 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_CLGEMMNATIVEKERNELCONFIGURATIONVALHALL_H +#define ARM_COMPUTE_CLGEMMNATIVEKERNELCONFIGURATIONVALHALL_H + +#include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" + +namespace arm_compute +{ +namespace cl_gemm +{ +/** Valhall based OpenCL GEMMNative configuration */ +class CLGEMMNativeKernelConfigurationValhall final : public ICLGEMMKernelConfiguration +{ +public: + /** Constructor + * + * @param[in] gpu GPU target + */ + CLGEMMNativeKernelConfigurationValhall(GPUTarget gpu); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMNativeKernelConfigurationValhall(const CLGEMMNativeKernelConfigurationValhall &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMNativeKernelConfigurationValhall &operator=(const CLGEMMNativeKernelConfigurationValhall &) = delete; + /** Default Move Constructor. */ + CLGEMMNativeKernelConfigurationValhall(CLGEMMNativeKernelConfigurationValhall &&) = default; + /** Default move assignment operator */ + CLGEMMNativeKernelConfigurationValhall &operator=(CLGEMMNativeKernelConfigurationValhall &&) = default; + + // 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_G77_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_u8(unsigned int m, unsigned int n, unsigned int k, unsigned int b); +}; +} // namespace cl_gemm +} // namespace arm_compute +#endif /*ARM_COMPUTE_CLGEMMNATIVEKERNELCONFIGURATIONVALHALL_H */ diff --git a/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h index 42a4ac1275..e960d64964 100644 --- a/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h +++ b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,6 +26,7 @@ #include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" #include "arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h" +#include "arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h" #include @@ -37,17 +38,26 @@ namespace cl_gemm class CLGEMMReshapedKernelConfigurationFactory final { public: - /** Static method to call the CLGEMMReshaped kernel configuration class accordingly with the GPU architecture + /** Static method to call the CLGEMMReshaped kernel configuration class accordingly with the GPU target * - * @param[in] arch GPU target + * @param[in] gpu GPU target * * @return CLGEMMReshaped kernel configuration class */ - static std::unique_ptr create(GPUTarget arch) + static std::unique_ptr create(GPUTarget gpu) { - // Note: At the moment we only support Bifrost architecture. However, we should have a dedicated path for each GPU architecture - // using get_arch_from_target(arch) - return support::cpp14::make_unique(arch); + switch(get_arch_from_target(gpu)) + { + case GPUTarget::MIDGARD: + case GPUTarget::BIFROST: + return support::cpp14::make_unique(gpu); + break; + case GPUTarget::VALHALL: + return support::cpp14::make_unique(gpu); + break; + default: + ARM_COMPUTE_ERROR("Not supported GPU target"); + } } }; } // namespace cl_gemm diff --git a/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h index 8ce70d90ae..c6ece758b9 100644 --- a/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h +++ b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,9 +36,9 @@ class CLGEMMReshapedKernelConfigurationBifrost final : public ICLGEMMKernelConfi public: /** Constructor * - * @param[in] arch GPU target + * @param[in] gpu GPU target */ - CLGEMMReshapedKernelConfigurationBifrost(GPUTarget arch); + CLGEMMReshapedKernelConfigurationBifrost(GPUTarget gpu); /** Prevent instances of this class from being copied (As this class contains pointers) */ CLGEMMReshapedKernelConfigurationBifrost(const CLGEMMReshapedKernelConfigurationBifrost &) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ diff --git a/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h new file mode 100644 index 0000000000..0dd2a2c38f --- /dev/null +++ b/arm_compute/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2020 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_CLGEMMRESHAPEDKERNELCONFIGURATIONVALHALL_H +#define ARM_COMPUTE_CLGEMMRESHAPEDKERNELCONFIGURATIONVALHALL_H + +#include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" + +namespace arm_compute +{ +namespace cl_gemm +{ +/** Valhall based OpenCL GEMMReshaped configuration */ +class CLGEMMReshapedKernelConfigurationValhall final : public ICLGEMMKernelConfiguration +{ +public: + /** Constructor + * + * @param[in] gpu GPU target + */ + CLGEMMReshapedKernelConfigurationValhall(GPUTarget gpu); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMReshapedKernelConfigurationValhall(const CLGEMMReshapedKernelConfigurationValhall &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMReshapedKernelConfigurationValhall &operator=(const CLGEMMReshapedKernelConfigurationValhall &) = delete; + /** Default Move Constructor. */ + CLGEMMReshapedKernelConfigurationValhall(CLGEMMReshapedKernelConfigurationValhall &&) = default; + /** Default move assignment operator */ + CLGEMMReshapedKernelConfigurationValhall &operator=(CLGEMMReshapedKernelConfigurationValhall &&) = default; + + // 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_G77_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_u8(unsigned int m, unsigned int n, unsigned int k, unsigned int b); +}; +} // namespace cl_gemm +} // namespace arm_compute +#endif /*ARM_COMPUTE_CLGEMMRESHAPEDKERNELCONFIGURATIONVALHALL_H */ diff --git a/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h index bb1d11ccf6..683e39f3c1 100644 --- a/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h +++ b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,6 +26,7 @@ #include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" #include "arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h" +#include "arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h" #include @@ -37,17 +38,26 @@ namespace cl_gemm class CLGEMMReshapedOnlyRHSKernelConfigurationFactory final { public: - /** Static method to call the CLGEMMReshapedOnlyRHS kernel configuration class accordingly with the GPU architecture + /** Static method to call the CLGEMMReshapedOnlyRHS kernel configuration class accordingly with the GPU target * - * @param[in] arch GPU target + * @param[in] gpu GPU target * * @return CLGEMMReshapedOnlyRHS kernel configuration class */ - static std::unique_ptr create(GPUTarget arch) + static std::unique_ptr create(GPUTarget gpu) { - // Note: At the moment we only support Bifrost architecture. However, we should have a dedicated path for each GPU architecture - // using get_arch_from_target(arch) - return support::cpp14::make_unique(arch); + switch(get_arch_from_target(gpu)) + { + case GPUTarget::MIDGARD: + case GPUTarget::BIFROST: + return support::cpp14::make_unique(gpu); + break; + case GPUTarget::VALHALL: + return support::cpp14::make_unique(gpu); + break; + default: + ARM_COMPUTE_ERROR("Not supported GPU target"); + } } }; } // namespace cl_gemm diff --git a/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h index e13e2eb03d..ff351b6a06 100644 --- a/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h +++ b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,9 +36,9 @@ class CLGEMMReshapedOnlyRHSKernelConfigurationBifrost final : public ICLGEMMKern public: /** Constructor * - * @param[in] arch GPU target + * @param[in] gpu GPU target */ - CLGEMMReshapedOnlyRHSKernelConfigurationBifrost(GPUTarget arch); + CLGEMMReshapedOnlyRHSKernelConfigurationBifrost(GPUTarget gpu); /** Prevent instances of this class from being copied (As this class contains pointers) */ CLGEMMReshapedOnlyRHSKernelConfigurationBifrost(const CLGEMMReshapedOnlyRHSKernelConfigurationBifrost &) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ diff --git a/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h new file mode 100644 index 0000000000..7541802776 --- /dev/null +++ b/arm_compute/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2020 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_CLGEMMRESHAPEDONLYRHSKERNELCONFIGURATIONVALHALL_H +#define ARM_COMPUTE_CLGEMMRESHAPEDONLYRHSKERNELCONFIGURATIONVALHALL_H + +#include "arm_compute/core/CL/ICLGEMMKernelConfiguration.h" + +namespace arm_compute +{ +namespace cl_gemm +{ +/** Valhall based OpenCL GEMMReshapedOnlyRHS configuration */ +class CLGEMMReshapedOnlyRHSKernelConfigurationValhall final : public ICLGEMMKernelConfiguration +{ +public: + /** Constructor + * + * @param[in] gpu GPU target + */ + CLGEMMReshapedOnlyRHSKernelConfigurationValhall(GPUTarget gpu); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMReshapedOnlyRHSKernelConfigurationValhall(const CLGEMMReshapedOnlyRHSKernelConfigurationValhall &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLGEMMReshapedOnlyRHSKernelConfigurationValhall &operator=(const CLGEMMReshapedOnlyRHSKernelConfigurationValhall &) = delete; + /** Default Move Constructor. */ + CLGEMMReshapedOnlyRHSKernelConfigurationValhall(CLGEMMReshapedOnlyRHSKernelConfigurationValhall &&) = default; + /** Default move assignment operator */ + CLGEMMReshapedOnlyRHSKernelConfigurationValhall &operator=(CLGEMMReshapedOnlyRHSKernelConfigurationValhall &&) = default; + + // 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_G77_f32(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_f16(unsigned int m, unsigned int n, unsigned int k, unsigned int b); + std::pair configure_G77_u8(unsigned int m, unsigned int n, unsigned int k, unsigned int b); +}; +} // namespace cl_gemm +} // namespace arm_compute +#endif /*ARM_COMPUTE_CLGEMMRESHAPEDONLYRHSKERNELCONFIGURATIONVALHALL_H */ -- cgit v1.2.1