From 303f0dbebf631b3db00d9d64e71018abbbe9d4fe Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 19 Nov 2018 11:56:51 +0000 Subject: COMPMID-1718: Extend DepthConvert to support Cast Change-Id: I6ee2c0b670727fc808fa636c53ddfaec3a0036c9 --- arm_compute/core/utils/misc/Requires.h | 51 +++++++ arm_compute/core/utils/misc/Rounding.h | 205 +++++++++++++++++++++++++++ arm_compute/core/utils/misc/SaturateCast.h | 218 +++++++++++++++++++++++++++++ arm_compute/core/utils/misc/Traits.h | 47 +++++++ arm_compute/core/utils/misc/Utility.h | 16 --- 5 files changed, 521 insertions(+), 16 deletions(-) create mode 100644 arm_compute/core/utils/misc/Requires.h create mode 100644 arm_compute/core/utils/misc/Rounding.h create mode 100644 arm_compute/core/utils/misc/SaturateCast.h create mode 100644 arm_compute/core/utils/misc/Traits.h (limited to 'arm_compute/core/utils') diff --git a/arm_compute/core/utils/misc/Requires.h b/arm_compute/core/utils/misc/Requires.h new file mode 100644 index 0000000000..2852300bb1 --- /dev/null +++ b/arm_compute/core/utils/misc/Requires.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018 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_UTILS_REQUIRES_H__ +#define __ARM_COMPUTE_UTILS_REQUIRES_H__ + +namespace arm_compute +{ +namespace utils +{ +namespace requires +{ +// *INDENT-OFF* +// clang-format off +namespace detail +{ +enum class enabler +{ +}; +} // namespace arm_compute + +/** Requirements as template */ +#define REQUIRES_T(...) template ::type = 0> +/** Requirements as template argument */ +#define REQUIRES_TA(...) typename = typename std::enable_if<(__VA_ARGS__), arm_compute::utils::requires::detail::enabler>::type +// clang-format on +// *INDENT-ON* +} // namespace requires +} // namespace utils +} // namespace arm_compute +#endif /*__ARM_COMPUTE_UTILS_REQUIRES_H__ */ diff --git a/arm_compute/core/utils/misc/Rounding.h b/arm_compute/core/utils/misc/Rounding.h new file mode 100644 index 0000000000..3f86cc8db3 --- /dev/null +++ b/arm_compute/core/utils/misc/Rounding.h @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2018 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_UTILS_ROUNDING_H__ +#define __ARM_COMPUTE_UTILS_ROUNDING_H__ + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/utils/misc/Requires.h" +#include "arm_compute/core/utils/misc/Traits.h" +#include "support/ToolchainSupport.h" + +#include + +namespace arm_compute +{ +namespace utils +{ +namespace rounding +{ +/** Rounding mode */ +enum class RoundingMode +{ + TO_ZERO, /**< Round towards zero */ + AWAY_FROM_ZERO, /**< Round away from zero */ + HALF_TO_ZERO, /**< Round half towards from zero */ + HALF_AWAY_FROM_ZERO, /**< Round half away from zero */ + HALF_UP, /**< Round half towards positive infinity */ + HALF_DOWN, /**< Round half towards negative infinity */ + HALF_EVEN /**< Round half towards nearest even */ +}; + +/** Round floating-point value with round to zero + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_to_zero(T value) +{ + T res = std::floor(std::fabs(value)); + return (value < 0.f) ? -res : res; +} + +/** Round floating-point value with round away from zero + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_away_from_zero(T value) +{ + T res = std::ceil(std::fabs(value)); + return (value < 0.f) ? -res : res; +} + +/** Round floating-point value with half value rounding towards zero. + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_half_to_zero(T value) +{ + T res = T(std::ceil(std::fabs(value) - 0.5f)); + return (value < 0.f) ? -res : res; +} + +/** Round floating-point value with half value rounding away from zero. + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_half_away_from_zero(T value) +{ + T res = T(std::floor(std::fabs(value) + 0.5f)); + return (value < 0.f) ? -res : res; +} + +/** Round floating-point value with half value rounding to positive infinity. + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_half_up(T value) +{ + return std::floor(value + 0.5f); +} + +/** Round floating-point value with half value rounding to negative infinity. + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_half_down(T value) +{ + return std::ceil(value - 0.5f); +} + +/** Round floating-point value with half value rounding to nearest even. + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * @param[in] epsilon precision. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round_half_even(T value, T epsilon = std::numeric_limits::epsilon()) +{ + T positive_value = std::abs(value); + T ipart = 0; + std::modf(positive_value, &ipart); + // If 'value' is exactly halfway between two integers + if(std::abs(positive_value - (ipart + 0.5f)) < epsilon) + { + // If 'ipart' is even then return 'ipart' + if(std::fmod(ipart, 2.f) < epsilon) + { + return support::cpp11::copysign(ipart, value); + } + // Else return the nearest even integer + return support::cpp11::copysign(std::ceil(ipart + 0.5f), value); + } + // Otherwise use the usual round to closest + return support::cpp11::copysign(support::cpp11::round(positive_value), value); +} + +/** Round floating-point value given a rounding mode + * + * @tparam T Parameter type. Should be of floating point type. + * + * @param[in] value floating-point value to be rounded. + * @param[in] rounding_mode Rounding mode to use. + * + * @return Floating-point value of rounded @p value. + */ +template ::value)> +inline T round(T value, RoundingMode rounding_mode) +{ + switch(rounding_mode) + { + case RoundingMode::TO_ZERO: + return round_to_zero(value); + case RoundingMode::AWAY_FROM_ZERO: + return round_away_from_zero(value); + case RoundingMode::HALF_TO_ZERO: + return round_half_to_zero(value); + case RoundingMode::HALF_AWAY_FROM_ZERO: + return round_half_away_from_zero(value); + case RoundingMode::HALF_UP: + return round_half_up(value); + case RoundingMode::HALF_DOWN: + return round_half_down(value); + case RoundingMode::HALF_EVEN: + return round_half_even(value); + default: + ARM_COMPUTE_ERROR("Unsupported rounding mode!"); + } +} +} // namespace rounding +} // namespace utils +} // namespace arm_compute +#endif /*__ARM_COMPUTE_UTILS_ROUNDING_H__ */ diff --git a/arm_compute/core/utils/misc/SaturateCast.h b/arm_compute/core/utils/misc/SaturateCast.h new file mode 100644 index 0000000000..b9e4787d9a --- /dev/null +++ b/arm_compute/core/utils/misc/SaturateCast.h @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2018 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_UTILS_CAST_SATURATE_CAST_H__ +#define __ARM_COMPUTE_UTILS_CAST_SATURATE_CAST_H__ + +#include "arm_compute/core/utils/misc/Rounding.h" +#include "arm_compute/core/utils/misc/Traits.h" +#include "arm_compute/core/utils/misc/Utility.h" + +namespace arm_compute +{ +namespace utils +{ +namespace cast +{ +// *INDENT-OFF* +// clang-format off +// same type +template::value, int >::type = 0 > +T saturate_cast(U v) +{ + return v; +} + +// signed -> signed widening/same_width +template::value && + std::is_integral::value && + std::is_signed() && + std::is_signed() && + !std::is_same::value && + sizeof(T) >= sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(v); +} +// signed -> signed narrowing +template::value && + std::is_integral::value && + std::is_signed() && + std::is_signed() && + !std::is_same::value && + sizeof(T) < sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(utility::clamp(v, std::numeric_limits::lowest(), std::numeric_limits::max())); +} + +// unsigned -> signed widening +template::value && + std::is_integral::value && + std::is_unsigned() && + std::is_signed() && + !std::is_same::value && + (sizeof(T) > sizeof(U)), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(v); +} +// unsigned -> signed narrowing +template::value && + std::is_integral::value && + std::is_unsigned() && + std::is_signed() && + !std::is_same::value && + sizeof(T) < sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(std::min(v, std::numeric_limits::max())); +} +// unsigned -> signed same_width +template::value && + std::is_integral::value && + std::is_unsigned() && + std::is_signed() && + !std::is_same::value && + sizeof(T) == sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(std::min(v, std::numeric_limits::max())); +} + +// signed -> unsigned widening/same width +template::value && + std::is_integral::value && + std::is_signed() && + std::is_unsigned() && + !std::is_same::value && + sizeof(T) >= sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(std::max(0, v)); +} + +// signed -> unsigned narrowing +template::value && + std::is_integral::value && + std::is_signed() && + std::is_unsigned() && + !std::is_same::value && + sizeof(T) < sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(utility::clamp(v, 0, std::numeric_limits::max())); +} + +// unsigned -> unsigned widening/same width +template::value && + std::is_integral::value && + std::is_unsigned() && + std::is_unsigned() && + !std::is_same::value && + sizeof(T) >= sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(v); +} + +// unsigned -> unsigned narrowing +template::value && + std::is_integral::value && + std::is_unsigned() && + std::is_unsigned() && + !std::is_same::value && + sizeof(T) < sizeof(U), + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(utility::clamp(v, std::numeric_limits::lowest(), std::numeric_limits::max())); +} + +// float -> int +template::value && + traits::is_floating_point::value, + int >::type = 0 > +inline T saturate_cast(U v) +{ + int32_t vi = utils::rounding::round_half_away_from_zero(v); + return saturate_cast(vi); +} + +// int -> float +template::value && + std::is_integral::value, + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(v); +} + +// float -> float +template::value && + traits::is_floating_point::value, + int >::type = 0 > +inline T saturate_cast(U v) +{ + return static_cast(v); +} +// clang-format on +// *INDENT-ON* +} // namespace cast +} // namespace utils +} // namespace arm_compute +#endif /* __ARM_COMPUTE_UTILS_CAST_SATURATE_CAST_H__ */ diff --git a/arm_compute/core/utils/misc/Traits.h b/arm_compute/core/utils/misc/Traits.h new file mode 100644 index 0000000000..9d86dd1b3c --- /dev/null +++ b/arm_compute/core/utils/misc/Traits.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018 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_UTILS_TRAITS_TRAITS_H__ +#define __ARM_COMPUTE_UTILS_TRAITS_TRAITS_H__ + +#include + +namespace arm_compute +{ +namespace utils +{ +namespace traits +{ +template +struct is_floating_point : public std::is_floating_point +{ +}; + +template <> +struct is_floating_point : public std::true_type +{ +}; +} // namespace traits +} // namespace utils +} // namespace arm_compute +#endif /* __ARM_COMPUTE_UTILS_TRAITS_TRAITS_H__ */ diff --git a/arm_compute/core/utils/misc/Utility.h b/arm_compute/core/utils/misc/Utility.h index 0a9f180b4c..37c8b66e06 100644 --- a/arm_compute/core/utils/misc/Utility.h +++ b/arm_compute/core/utils/misc/Utility.h @@ -128,22 +128,6 @@ inline auto foldl(F &&func, T &&initial, U &&value, Us &&... values) -> decltype return foldl(std::forward(func), func(std::forward(initial), std::forward(value)), std::forward(values)...); } -/** Type cast with saturation. - * - * @param[in] val Value of type U to cast. - * - * @return Original value clamped to numeric limits of T and converted to type T. - * - * @warning Numeric limits of T must be representable without loss in type U. - */ -template -T saturate_cast(U val) -{ - const auto low = static_cast(std::numeric_limits::lowest()); - const auto high = static_cast(std::numeric_limits::max()); - return static_cast(clamp(val, low, high)); -} - /** Perform an index sort of a given vector. * * @param[in] v Vector to sort -- cgit v1.2.1