From 8918b23073851417e8be6e5e53c6380dbdedf201 Mon Sep 17 00:00:00 2001 From: Gunes Bayir Date: Fri, 17 Mar 2023 13:52:21 +0000 Subject: Implement OpenCL MatMul for Lhs T Rhs T/NT FP32/16 - Implement opencl kernel for LHS transposed and RHS non-transposed - Implement opencl kernel for LHS transposed and RHS transposed - Add validation tests Resolves: COMPMID-5953, COMPMID-5955 Change-Id: I55589acbffe86c44e29807574975978a1ec09bad Signed-off-by: Gunes Bayir Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9345 Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins --- tests/datasets/BatchMatMulDataset.h | 110 ------------------------------- tests/datasets/LargeBatchMatMulDataset.h | 60 ----------------- tests/datasets/LargeMatMulDataset.h | 60 +++++++++++++++++ tests/datasets/MatMulDataset.h | 110 +++++++++++++++++++++++++++++++ tests/datasets/SmallBatchMatMulDataset.h | 52 --------------- tests/datasets/SmallMatMulDataset.h | 63 ++++++++++++++++++ 6 files changed, 233 insertions(+), 222 deletions(-) delete mode 100644 tests/datasets/BatchMatMulDataset.h delete mode 100644 tests/datasets/LargeBatchMatMulDataset.h create mode 100644 tests/datasets/LargeMatMulDataset.h create mode 100644 tests/datasets/MatMulDataset.h delete mode 100644 tests/datasets/SmallBatchMatMulDataset.h create mode 100644 tests/datasets/SmallMatMulDataset.h (limited to 'tests/datasets') diff --git a/tests/datasets/BatchMatMulDataset.h b/tests/datasets/BatchMatMulDataset.h deleted file mode 100644 index dad7cc0af4..0000000000 --- a/tests/datasets/BatchMatMulDataset.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2023 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 TESTS_DATASETS_BATCHMATMULDATASET -#define TESTS_DATASETS_BATCHMATMULDATASET - -#include "arm_compute/core/TensorShape.h" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -namespace test -{ -namespace datasets -{ -class BatchMatMulDataset -{ -public: - using type = std::tuple; - - struct iterator - { - iterator(std::vector::const_iterator a_it, - std::vector::const_iterator b_it, - std::vector::const_iterator dst_it) - : _a_it{ std::move(a_it) }, - _b_it{ std::move(b_it) }, - _dst_it{ std::move(dst_it) } - { - } - - std::string description() const - { - std::stringstream description; - description << "A=" << *_a_it << ":"; - description << "B=" << *_b_it << ":"; - description << "Out=" << *_dst_it << ":"; - return description.str(); - } - - BatchMatMulDataset::type operator*() const - { - return std::make_tuple(*_a_it, *_b_it, *_dst_it); - } - - iterator &operator++() - { - ++_a_it; - ++_b_it; - ++_dst_it; - - return *this; - } - - private: - std::vector::const_iterator _a_it; - std::vector::const_iterator _b_it; - std::vector::const_iterator _dst_it; - }; - - iterator begin() const - { - return iterator(_a_shapes.begin(), _b_shapes.begin(), _dst_shapes.begin()); - } - - int size() const - { - return std::min(_a_shapes.size(), std::min(_b_shapes.size(), _dst_shapes.size())); - } - - void add_config(TensorShape a, TensorShape b, TensorShape dst) - { - _a_shapes.emplace_back(std::move(a)); - _b_shapes.emplace_back(std::move(b)); - _dst_shapes.emplace_back(std::move(dst)); - } - -protected: - BatchMatMulDataset() = default; - BatchMatMulDataset(BatchMatMulDataset &&) = default; - -private: - std::vector _a_shapes{}; - std::vector _b_shapes{}; - std::vector _dst_shapes{}; -}; -} // namespace datasets -} // namespace test -} // namespace arm_compute -#endif /* TESTS_DATASETS_BATCHMATMULDATASET */ diff --git a/tests/datasets/LargeBatchMatMulDataset.h b/tests/datasets/LargeBatchMatMulDataset.h deleted file mode 100644 index 0d8ff913cf..0000000000 --- a/tests/datasets/LargeBatchMatMulDataset.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2023 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 ACL_TESTS_DATASETS_LARGEBATCHMATMULDATASET -#define ACL_TESTS_DATASETS_LARGEBATCHMATMULDATASET - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "tests/datasets/BatchMatMulDataset.h" - -namespace arm_compute -{ -namespace test -{ -namespace datasets -{ -class LargeBatchMatMulDataset final : public BatchMatMulDataset -{ -public: - LargeBatchMatMulDataset() - { - add_config(TensorShape(21U, 13U, 3U, 2U), TensorShape(33U, 21U, 3U, 2U), TensorShape(33U, 13U, 3U, 2U)); - add_config(TensorShape(38U, 12U, 1U, 5U), TensorShape(21U, 38U, 1U, 5U), TensorShape(21U, 12U, 1U, 5U)); - add_config(TensorShape(45U, 38U, 3U, 2U), TensorShape(21U, 45U, 3U, 2U), TensorShape(21U, 38U, 3U, 2U)); - } -}; - -class HighDimensionalBatchMatMulDataset final : public BatchMatMulDataset -{ -public: - HighDimensionalBatchMatMulDataset() - { - add_config(TensorShape(5U, 5U, 2U, 2U, 2U, 2U), TensorShape(5U, 5U, 2U, 2U, 2U, 2U), TensorShape(5U, 5U, 2U, 2U, 2U, 2U)); // 6D tensor - } -}; - -} // namespace datasets -} // namespace test -} // namespace arm_compute -#endif /* ACL_TESTS_DATASETS_LARGEBATCHMATMULDATASET */ diff --git a/tests/datasets/LargeMatMulDataset.h b/tests/datasets/LargeMatMulDataset.h new file mode 100644 index 0000000000..cbc97d5e4a --- /dev/null +++ b/tests/datasets/LargeMatMulDataset.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023 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 ACL_TESTS_DATASETS_LARGEMATMULDATASET +#define ACL_TESTS_DATASETS_LARGEMATMULDATASET + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/datasets/MatMulDataset.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class LargeMatMulDataset final : public MatMulDataset +{ +public: + LargeMatMulDataset() + { + add_config(TensorShape(21U, 13U, 3U, 2U), TensorShape(33U, 21U, 3U, 2U), TensorShape(33U, 13U, 3U, 2U)); + add_config(TensorShape(38U, 12U, 1U, 5U), TensorShape(21U, 38U, 1U, 5U), TensorShape(21U, 12U, 1U, 5U)); + add_config(TensorShape(45U, 38U, 3U, 2U), TensorShape(21U, 45U, 3U, 2U), TensorShape(21U, 38U, 3U, 2U)); + } +}; + +class HighDimensionalMatMulDataset final : public MatMulDataset +{ +public: + HighDimensionalMatMulDataset() + { + add_config(TensorShape(5U, 5U, 2U, 2U, 2U, 2U), TensorShape(5U, 5U, 2U, 2U, 2U, 2U), TensorShape(5U, 5U, 2U, 2U, 2U, 2U)); // 6D tensor + } +}; + +} // namespace datasets +} // namespace test +} // namespace arm_compute +#endif /* ACL_TESTS_DATASETS_LARGEMATMULDATASET */ diff --git a/tests/datasets/MatMulDataset.h b/tests/datasets/MatMulDataset.h new file mode 100644 index 0000000000..9c1c5fb05d --- /dev/null +++ b/tests/datasets/MatMulDataset.h @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2023 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 ACL_TESTS_DATASETS_MATMULDATASET +#define ACL_TESTS_DATASETS_MATMULDATASET + +#include "arm_compute/core/TensorShape.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class MatMulDataset +{ +public: + using type = std::tuple; + + struct iterator + { + iterator(std::vector::const_iterator a_it, + std::vector::const_iterator b_it, + std::vector::const_iterator dst_it) + : _a_it{ std::move(a_it) }, + _b_it{ std::move(b_it) }, + _dst_it{ std::move(dst_it) } + { + } + + std::string description() const + { + std::stringstream description; + description << "A=" << *_a_it << ":"; + description << "B=" << *_b_it << ":"; + description << "Out=" << *_dst_it << ":"; + return description.str(); + } + + MatMulDataset::type operator*() const + { + return std::make_tuple(*_a_it, *_b_it, *_dst_it); + } + + iterator &operator++() + { + ++_a_it; + ++_b_it; + ++_dst_it; + + return *this; + } + + private: + std::vector::const_iterator _a_it; + std::vector::const_iterator _b_it; + std::vector::const_iterator _dst_it; + }; + + iterator begin() const + { + return iterator(_a_shapes.begin(), _b_shapes.begin(), _dst_shapes.begin()); + } + + int size() const + { + return std::min(_a_shapes.size(), std::min(_b_shapes.size(), _dst_shapes.size())); + } + + void add_config(TensorShape a, TensorShape b, TensorShape dst) + { + _a_shapes.emplace_back(std::move(a)); + _b_shapes.emplace_back(std::move(b)); + _dst_shapes.emplace_back(std::move(dst)); + } + +protected: + MatMulDataset() = default; + MatMulDataset(MatMulDataset &&) = default; + +private: + std::vector _a_shapes{}; + std::vector _b_shapes{}; + std::vector _dst_shapes{}; +}; +} // namespace datasets +} // namespace test +} // namespace arm_compute +#endif /* ACL_TESTS_DATASETS_MATMULDATASET */ diff --git a/tests/datasets/SmallBatchMatMulDataset.h b/tests/datasets/SmallBatchMatMulDataset.h deleted file mode 100644 index cfe76bea6d..0000000000 --- a/tests/datasets/SmallBatchMatMulDataset.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2023 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 ACL_TESTS_DATASETS_SMALLBATCHMATMULDATASET -#define ACL_TESTS_DATASETS_SMALLBATCHMATMULDATASET - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "tests/datasets/BatchMatMulDataset.h" - -namespace arm_compute -{ -namespace test -{ -namespace datasets -{ -class SmallBatchMatMulDataset final : public BatchMatMulDataset -{ -public: - SmallBatchMatMulDataset() - { - add_config(TensorShape(3U, 4U, 2U, 2U), TensorShape(2U, 3U, 2U, 2U), TensorShape(2U, 4U, 2U, 2U)); - add_config(TensorShape(9U, 6U), TensorShape(5U, 9U), TensorShape(5U, 6U)); - add_config(TensorShape(31U, 1U), TensorShape(23U, 31U), TensorShape(23U, 1U)); - add_config(TensorShape(8U, 4U, 2U), TensorShape(16U, 8U, 2U), TensorShape(16U, 4U, 2U)); - add_config(TensorShape(32U, 2U), TensorShape(17U, 32U), TensorShape(17U, 2U)); - } -}; -} // namespace datasets -} // namespace test -} // namespace arm_compute -#endif /* ACL_TESTS_DATASETS_SMALLBATCHMATMULDATASET */ diff --git a/tests/datasets/SmallMatMulDataset.h b/tests/datasets/SmallMatMulDataset.h new file mode 100644 index 0000000000..ae92b9abf5 --- /dev/null +++ b/tests/datasets/SmallMatMulDataset.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2023 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 ACL_TESTS_DATASETS_SMALLMATMULDATASET +#define ACL_TESTS_DATASETS_SMALLMATMULDATASET + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/datasets/MatMulDataset.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class SmallMatMulDataset final : public MatMulDataset +{ +public: + SmallMatMulDataset() + { + add_config(TensorShape(3U, 4U, 2U, 2U), TensorShape(2U, 3U, 2U, 2U), TensorShape(2U, 4U, 2U, 2U)); + add_config(TensorShape(9U, 6U), TensorShape(5U, 9U), TensorShape(5U, 6U)); + add_config(TensorShape(31U, 1U), TensorShape(23U, 31U), TensorShape(23U, 1U)); + add_config(TensorShape(8U, 4U, 2U), TensorShape(16U, 8U, 2U), TensorShape(16U, 4U, 2U)); + add_config(TensorShape(32U, 2U), TensorShape(17U, 32U), TensorShape(17U, 2U)); + } +}; + +class TinyMatMulDataset final : public MatMulDataset +{ +public: + TinyMatMulDataset() + { + add_config(TensorShape(1U), TensorShape(1U), TensorShape(1U)); + add_config(TensorShape(2U, 2U), TensorShape(2U, 2U), TensorShape(2U, 2U)); + } +}; + +} // namespace datasets +} // namespace test +} // namespace arm_compute +#endif /* ACL_TESTS_DATASETS_SMALLMATMULDATASET */ -- cgit v1.2.1