diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-02-19 18:10:03 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-02-20 10:12:45 +0000 |
| commit | d57891a80b2a45dfeb41826f2753c5e32b6887c4 (patch) | |
| tree | d9fbbf8d8a3e1c62a93899a05788c35e06450715 /src/core/NEON/kernels/NEElementwiseOperationKernel.cpp | |
| parent | f85433be70e3d8d38025835e3f3fc450a54a2598 (diff) | |
| download | ComputeLibrary-d57891a80b2a45dfeb41826f2753c5e32b6887c4.tar.gz | |
COMPMID-2007: Compilation failures with ndk16b.
Resolves double brace initialization issues.
Change-Id: Ic9319d4abc1d6428cefabc18be1c176bea7607dc
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/729
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEElementwiseOperationKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEElementwiseOperationKernel.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp index 789ef5c2b0..aa458c2119 100644 --- a/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp +++ b/src/core/NEON/kernels/NEElementwiseOperationKernel.cpp @@ -79,10 +79,12 @@ void store_quantized(uint8_t *output_ptr, const float32x4x4_t &rf, const float32 { int32x4x4_t out = { - vcvtq_s32_f32(vmlaq_f32(offset, rf.val[0], invscale)), - vcvtq_s32_f32(vmlaq_f32(offset, rf.val[1], invscale)), - vcvtq_s32_f32(vmlaq_f32(offset, rf.val[2], invscale)), - vcvtq_s32_f32(vmlaq_f32(offset, rf.val[3], invscale)), + { + vcvtq_s32_f32(vmlaq_f32(offset, rf.val[0], invscale)), + vcvtq_s32_f32(vmlaq_f32(offset, rf.val[1], invscale)), + vcvtq_s32_f32(vmlaq_f32(offset, rf.val[2], invscale)), + vcvtq_s32_f32(vmlaq_f32(offset, rf.val[3], invscale)), + } }; store_quantized(output_ptr, out); } @@ -185,10 +187,12 @@ inline float32x4x4_t elementwise_arithm_op(const float32x4x4_t &a, const float32 { float32x4x4_t out = { - elementwise_arithm_op<op>(a.val[0], b.val[0]), - elementwise_arithm_op<op>(a.val[1], b.val[1]), - elementwise_arithm_op<op>(a.val[2], b.val[2]), - elementwise_arithm_op<op>(a.val[3], b.val[3]), + { + elementwise_arithm_op<op>(a.val[0], b.val[0]), + elementwise_arithm_op<op>(a.val[1], b.val[1]), + elementwise_arithm_op<op>(a.val[2], b.val[2]), + elementwise_arithm_op<op>(a.val[3], b.val[3]), + } }; return out; } @@ -275,10 +279,12 @@ inline uint32x4x4_t elementwise_comp_op(const float32x4x4_t &a, const float32x4x { uint32x4x4_t out = { - elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[0], b.val[0]), - elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[1], b.val[1]), - elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[2], b.val[2]), - elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[3], b.val[3]) + { + elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[0], b.val[0]), + elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[1], b.val[1]), + elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[2], b.val[2]), + elementwise_comp_op<op, float32x4_t, uint32x4_t>(a.val[3], b.val[3]) + } }; return out; } |