aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichalis Spyrou <michalis.spyrou@arm.com>2020-01-13 14:07:48 +0000
committerMichalis Spyrou <michalis.spyrou@arm.com>2020-01-13 15:19:33 +0000
commit6f314db14f0fd242d53f3a9f780158169259b31b (patch)
treefb3d2ce04dd3187718ba2d45a7c6b575b6172bd9
parent7f15251e2fd6c729a1d8f4f524a4bb902c30cdad (diff)
downloadComputeLibrary-6f314db14f0fd242d53f3a9f780158169259b31b.tar.gz
COMPMID-2819: Fix nightly build failure in bare metal
Change int to int32_t in order to fix bare metal failures on armv7a. Change-Id: I35960a8d6521eed7bb498bb3a7c5c266a1958d8a Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com> Reviewed-on: https://review.mlplatform.org/c/2576 Tested-by: Arm Jenkins <bsgcomp@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
-rw-r--r--arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h b/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h
index 788bb649b0..f1cbf2af63 100644
--- a/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h
+++ b/arm_compute/core/NEON/kernels/detail/NEDirectConvolutionDetail.h
@@ -306,10 +306,10 @@ inline float32x4x2_t convolve_3x3(const float *in_top, const float *in_mid, cons
template < typename T, REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) >
inline int32x4_t single_convolve_3x3_dilation(const T *in_top, const T *in_mid, const T *in_low,
const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2,
- size_t dilation_x, int input_offset)
+ size_t dilation_x, int32_t input_offset)
{
using VectorType = typename std::conditional<std::is_same<T, uint8_t>::value, uint8x8x3_t, int8x8x3_t>::type;
- using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t<int, wrapper::traits::BitWidth::W128>;
+ using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t<int32_t, wrapper::traits::BitWidth::W128>;
const int32x4_t v_input_offset = wrapper::vdup_n(input_offset, OutputTagType{});
@@ -432,11 +432,11 @@ inline int32x4x2_t convolve_3x3_dilation(const T *in_top, const T *in_mid, const
template < typename T, REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) >
int32x4x2_t convolve_3x3(const T *in_top, const T *in_mid, const T *in_low,
const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2,
- unsigned int stridex, int input_offset)
+ unsigned int stridex, int32_t input_offset)
{
ARM_COMPUTE_ERROR_ON(stridex > 3);
using VectorType = typename std::conditional<std::is_same<T, uint8_t>::value, uint8x8x2_t, int8x8x2_t>::type;
- using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t<int, wrapper::traits::BitWidth::W128>;
+ using OutputTagType = typename wrapper::traits::neon_bitvector_tag_t<int32_t, wrapper::traits::BitWidth::W128>;
const int32x4_t v_input_offset = wrapper::vdup_n(input_offset, OutputTagType{});
@@ -490,8 +490,8 @@ int32x4x2_t convolve_3x3(const T *in_top, const T *in_mid, const T *in_low,
int32x4x2_t out
{
{
- wrapper::vdup_n(0, OutputTagType{}),
- wrapper::vdup_n(0, OutputTagType{}),
+ wrapper::vdup_n(static_cast<int32_t>(0), OutputTagType{}),
+ wrapper::vdup_n(static_cast<int32_t>(0), OutputTagType{}),
}
};