From 240b79de1c211ebb8d439b4a1c8c79777aa36f13 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 24 Sep 2019 15:50:34 +0100 Subject: COMPMID-2692 Use existing command line infrastructure for CLGEMMReshapedOnlyRHS * Refactor to use existing command line infrastructure. * Fix: Remove errorneous initialisation code for dst matrix. * Fix: Correctly set bias tensor to be a vector. Change-Id: I787bfa08392df806aba3b0be09bab015f16010f7 Signed-off-by: SiCong Li Reviewed-on: https://review.mlplatform.org/c/1985 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice Reviewed-by: Georgios Pinitas --- examples/gemm_tuner/CommonGemmExampleOptions.h | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 examples/gemm_tuner/CommonGemmExampleOptions.h (limited to 'examples/gemm_tuner/CommonGemmExampleOptions.h') diff --git a/examples/gemm_tuner/CommonGemmExampleOptions.h b/examples/gemm_tuner/CommonGemmExampleOptions.h new file mode 100644 index 0000000000..5f079abfc1 --- /dev/null +++ b/examples/gemm_tuner/CommonGemmExampleOptions.h @@ -0,0 +1,93 @@ +/* + * 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_EXAMPLES_GEMM_TUNER_COMMON_GEMM_EXAMPLE_OPTIONS +#define ARM_COMPUTE_EXAMPLES_GEMM_TUNER_COMMON_GEMM_EXAMPLE_OPTIONS + +#include "utils/command_line/CommandLineOptions.h" +#include "utils/command_line/CommandLineParser.h" + +namespace gemm_tuner +{ +/** Structure holding all the common gemm example parameters */ +struct CommonGemmExampleParams +{ + size_t M{ 100 }; /**< Number of lhs matrix rows */ + size_t N{ 100 }; /**< Number of rhs matrix columns */ + size_t K{ 50 }; /**< Number of lhs matrix columns/rhs matrix rows */ + size_t B{ 1 }; /**< Batch size */ +}; + +/** Formatted output of the CommonGemmExampleParams type + * + * @param[out] os Output stream. + * @param[in] common_params Common parameters to output + * + * @return Modified output stream. + */ +::std::ostream &operator<<(::std::ostream &os, const CommonGemmExampleParams &common_params); + +/** Common command line options used to configure the gemm examples + * + * The options in this object get populated when "parse()" is called on the parser used to construct it. + * The expected workflow is: + * + * CommandLineParser parser; + * CommonOptions options( parser ); + * parser.parse(argc, argv); + */ +class CommonGemmExampleOptions +{ +public: + /** Constructor + * + * @param[in,out] parser A parser on which "parse()" hasn't been called yet. + */ + CommonGemmExampleOptions(arm_compute::utils::CommandLineParser &parser); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CommonGemmExampleOptions(const CommonGemmExampleOptions &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CommonGemmExampleOptions &operator=(const CommonGemmExampleOptions &) = delete; + /** Allow instances of this class to be moved */ + CommonGemmExampleOptions(CommonGemmExampleOptions &&) = default; + /** Allow instances of this class to be moved */ + CommonGemmExampleOptions &operator=(CommonGemmExampleOptions &&) = default; + /** Default destructor */ + ~CommonGemmExampleOptions() = default; + + arm_compute::utils::ToggleOption *help; /**< Show help option */ + arm_compute::utils::SimpleOption *M; /**< Number of lhs matrix rows option */ + arm_compute::utils::SimpleOption *N; /**< Number of rhs matrix columns option */ + arm_compute::utils::SimpleOption *K; /**< Number of lhs matrix columns/rhs matrix rows option */ + arm_compute::utils::SimpleOption *B; /**< Batch size option */ +}; + +/** Consumes the common gemm example options and creates a structure containing all information + * + * @param[in] options Options to consume + * + * @return Structure containing the common gemm example parameters + */ +CommonGemmExampleParams consume_common_gemm_example_parameters(const CommonGemmExampleOptions &options); +} // namespace gemm_tuner +#endif /* ARM_COMPUTE_EXAMPLES_GEMM_TUNER_COMMON_GEMM_EXAMPLE_OPTIONS */ -- cgit v1.2.1