From d58cec032556abb103cdf7564ab29762d5c4c051 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Tue, 18 Jul 2017 15:44:21 +0100 Subject: COMPMID-415: Cleanup accessors Change-Id: Id19c8c1ea76f6e6679a4ac770e804f8012a2b5a6 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80937 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- tests/NEON/Accessor.h | 120 +++++++++++++++++++++++++++++++++++++++++++ tests/NEON/Helper.h | 3 -- tests/NEON/LutAccessor.h | 86 +++++++++++++++++++++++++++++++ tests/NEON/NEAccessor.h | 124 --------------------------------------------- tests/NEON/NELutAccessor.h | 90 -------------------------------- 5 files changed, 206 insertions(+), 217 deletions(-) create mode 100644 tests/NEON/Accessor.h create mode 100644 tests/NEON/LutAccessor.h delete mode 100644 tests/NEON/NEAccessor.h delete mode 100644 tests/NEON/NELutAccessor.h (limited to 'tests/NEON') diff --git a/tests/NEON/Accessor.h b/tests/NEON/Accessor.h new file mode 100644 index 0000000000..5949b350a0 --- /dev/null +++ b/tests/NEON/Accessor.h @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2017 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_TEST_ACCESSOR_H__ +#define __ARM_COMPUTE_TEST_ACCESSOR_H__ + +#include "arm_compute/runtime/Tensor.h" +#include "tests/IAccessor.h" + +namespace arm_compute +{ +namespace test +{ +/** Accessor implementation for @ref Tensor objects. */ +class Accessor : public IAccessor +{ +public: + /** Create an accessor for the given @p tensor. + * + * @param[in, out] tensor To be accessed tensor. + */ + Accessor(Tensor &tensor); + + Accessor(const Accessor &) = delete; + Accessor &operator=(const Accessor &) = delete; + Accessor(Accessor &&) = default; + Accessor &operator=(Accessor &&) = default; + + TensorShape shape() const override; + size_t element_size() const override; + size_t size() const override; + Format format() const override; + DataType data_type() const override; + int num_channels() const override; + int num_elements() const override; + int fixed_point_position() const override; + const void *operator()(const Coordinates &coord) const override; + void *operator()(const Coordinates &coord) override; + +private: + Tensor &_tensor; +}; + +inline Accessor::Accessor(Tensor &tensor) + : _tensor{ tensor } +{ +} + +inline TensorShape Accessor::shape() const +{ + return _tensor.info()->tensor_shape(); +} + +inline size_t Accessor::element_size() const +{ + return _tensor.info()->element_size(); +} + +inline size_t Accessor::size() const +{ + return _tensor.info()->total_size(); +} + +inline Format Accessor::format() const +{ + return _tensor.info()->format(); +} + +inline DataType Accessor::data_type() const +{ + return _tensor.info()->data_type(); +} + +inline int Accessor::num_channels() const +{ + return _tensor.info()->num_channels(); +} + +inline int Accessor::num_elements() const +{ + return _tensor.info()->tensor_shape().total_size(); +} + +inline int Accessor::fixed_point_position() const +{ + return _tensor.info()->fixed_point_position(); +} + +inline const void *Accessor::operator()(const Coordinates &coord) const +{ + return _tensor.ptr_to_element(coord); +} + +inline void *Accessor::operator()(const Coordinates &coord) +{ + return _tensor.ptr_to_element(coord); +} +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_ACCESSOR_H__ */ diff --git a/tests/NEON/Helper.h b/tests/NEON/Helper.h index f9774c774c..5b0f750fca 100644 --- a/tests/NEON/Helper.h +++ b/tests/NEON/Helper.h @@ -33,8 +33,6 @@ namespace arm_compute { namespace test { -namespace neon -{ template Array create_array(const std::vector &v) { @@ -46,7 +44,6 @@ Array create_array(const std::vector &v) return array; } -} // namespace neon } // namespace test } // namespace arm_compute #endif /* __ARM_COMPUTE_TEST_NEON_HELPER_H__ */ diff --git a/tests/NEON/LutAccessor.h b/tests/NEON/LutAccessor.h new file mode 100644 index 0000000000..24ad63d84b --- /dev/null +++ b/tests/NEON/LutAccessor.h @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2017 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_TEST_NEON_LUTACCESSOR_H__ +#define __ARM_COMPUTE_TEST_NEON_LUTACCESSOR_H__ + +#include "ILutAccessor.h" + +#include "arm_compute/runtime/Lut.h" + +namespace arm_compute +{ +namespace test +{ +/** Accessor implementation for @ref Lut objects. */ +template +class LutAccessor : public ILutAccessor +{ +public: + /** Create an accessor for the given @p Lut. + */ + LutAccessor(Lut &lut) + : _lut{ lut } + { + } + + LutAccessor(const LutAccessor &) = delete; + LutAccessor &operator=(const LutAccessor &) = delete; + LutAccessor(LutAccessor &&) = default; + LutAccessor &operator=(LutAccessor &&) = default; + + int num_elements() const override + { + return _lut.num_elements(); + } + + const T &operator[](T input_value) const override + { + auto lut = reinterpret_cast(_lut.buffer()); + int32_t real_index = _lut.index_offset() + static_cast(input_value); + + if(0 <= real_index && real_index < num_elements()) + { + return lut[real_index]; + } + ARM_COMPUTE_ERROR("Error index not in range."); + } + + T &operator[](T input_value) override + { + auto lut = reinterpret_cast(_lut.buffer()); + int32_t real_index = _lut.index_offset() + static_cast(input_value); + + if(0 <= real_index && real_index < num_elements()) + { + return lut[real_index]; + } + ARM_COMPUTE_ERROR("Error index not in range."); + } + +private: + ILut &_lut; +}; +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_NEON_LUTACCESSOR_H__ */ diff --git a/tests/NEON/NEAccessor.h b/tests/NEON/NEAccessor.h deleted file mode 100644 index 9afc300d99..0000000000 --- a/tests/NEON/NEAccessor.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2017 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_TEST_NEON_NEACCESSOR_H__ -#define __ARM_COMPUTE_TEST_NEON_NEACCESSOR_H__ - -#include "IAccessor.h" - -#include "arm_compute/runtime/Tensor.h" - -namespace arm_compute -{ -namespace test -{ -namespace neon -{ -/** Accessor implementation for @ref Tensor objects. */ -class NEAccessor : public IAccessor -{ -public: - /** Create an accessor for the given @p tensor. - * - * @param[in, out] tensor To be accessed tensor. - */ - NEAccessor(Tensor &tensor); - - NEAccessor(const NEAccessor &) = delete; - NEAccessor &operator=(const NEAccessor &) = delete; - NEAccessor(NEAccessor &&) = default; - NEAccessor &operator=(NEAccessor &&) = default; - - TensorShape shape() const override; - size_t element_size() const override; - size_t size() const override; - Format format() const override; - DataType data_type() const override; - int num_channels() const override; - int num_elements() const override; - int fixed_point_position() const override; - const void *operator()(const Coordinates &coord) const override; - void *operator()(const Coordinates &coord) override; - -private: - Tensor &_tensor; -}; - -inline NEAccessor::NEAccessor(Tensor &tensor) - : _tensor{ tensor } -{ -} - -inline TensorShape NEAccessor::shape() const -{ - return _tensor.info()->tensor_shape(); -} - -inline size_t NEAccessor::element_size() const -{ - return _tensor.info()->element_size(); -} - -inline size_t NEAccessor::size() const -{ - return _tensor.info()->total_size(); -} - -inline Format NEAccessor::format() const -{ - return _tensor.info()->format(); -} - -inline DataType NEAccessor::data_type() const -{ - return _tensor.info()->data_type(); -} - -inline int NEAccessor::num_channels() const -{ - return _tensor.info()->num_channels(); -} - -inline int NEAccessor::num_elements() const -{ - return _tensor.info()->tensor_shape().total_size(); -} - -inline int NEAccessor::fixed_point_position() const -{ - return _tensor.info()->fixed_point_position(); -} - -inline const void *NEAccessor::operator()(const Coordinates &coord) const -{ - return _tensor.ptr_to_element(coord); -} - -inline void *NEAccessor::operator()(const Coordinates &coord) -{ - return _tensor.ptr_to_element(coord); -} -} // namespace neon -} // namespace test -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_NEON_NEACCESSOR_H__ */ diff --git a/tests/NEON/NELutAccessor.h b/tests/NEON/NELutAccessor.h deleted file mode 100644 index 2dadcf5996..0000000000 --- a/tests/NEON/NELutAccessor.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2017 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_TEST_NEON_NELUTACCESSOR_H__ -#define __ARM_COMPUTE_TEST_NEON_NELUTACCESSOR_H__ - -#include "ILutAccessor.h" - -#include "arm_compute/runtime/Lut.h" - -namespace arm_compute -{ -namespace test -{ -namespace neon -{ -/** Accessor implementation for @ref Lut objects. */ -template -class NELutAccessor : public ILutAccessor -{ -public: - /** Create an accessor for the given @p Lut. - */ - NELutAccessor(Lut &lut) - : _lut{ lut } - { - } - - NELutAccessor(const NELutAccessor &) = delete; - NELutAccessor &operator=(const NELutAccessor &) = delete; - NELutAccessor(NELutAccessor &&) = default; - NELutAccessor &operator=(NELutAccessor &&) = default; - - int num_elements() const override - { - return _lut.num_elements(); - } - - const T &operator[](T input_value) const override - { - auto lut = reinterpret_cast(_lut.buffer()); - int32_t real_index = _lut.index_offset() + static_cast(input_value); - - if(0 <= real_index && real_index < num_elements()) - { - return lut[real_index]; - } - ARM_COMPUTE_ERROR("Error index not in range."); - } - - T &operator[](T input_value) override - { - auto lut = reinterpret_cast(_lut.buffer()); - int32_t real_index = _lut.index_offset() + static_cast(input_value); - - if(0 <= real_index && real_index < num_elements()) - { - return lut[real_index]; - } - ARM_COMPUTE_ERROR("Error index not in range."); - } - -private: - ILut &_lut; -}; - -} // namespace neon -} // namespace test -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_NEON_NELUTACCESSOR_H__ */ -- cgit v1.2.1