summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-14 12:38:19 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-14 15:49:14 +0000
commite843e3bb00d26c841bd7132c00779c085368eab3 (patch)
tree7b8ecbcd66ff07bf8095d84f545e86445edf8588
parent7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (diff)
Fix compiling qfloat16_f16c.c with C89 compiler
Needed by gcc 4.8 Change-Id: I2daa5728761599255cf3912d37e7b9dd60ccb60c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/corelib/global/qfloat16_f16c.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/qfloat16_f16c.c b/src/corelib/global/qfloat16_f16c.c
index 31dff0b154..a7eadc71b7 100644
--- a/src/corelib/global/qfloat16_f16c.c
+++ b/src/corelib/global/qfloat16_f16c.c
@@ -57,6 +57,7 @@ QT_FUNCTION_TARGET(F16C)
void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW
{
qsizetype i = 0;
+ int epilog_i;
for (; i < len - 7; i += 8)
_mm_storeu_si128((__m128i *)(out + i), _mm256_cvtps_ph(_mm256_loadu_ps(in + i), 0));
if (i < len - 3) {
@@ -64,7 +65,7 @@ void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_N
i += 4;
}
// Inlining "qfloat16::qfloat16(float f)":
- SIMD_EPILOGUE(i, len, 3)
+ for (epilog_i = 0; i < len && epilog_i < 3; ++i, ++epilog_i)
out[i] = _mm_extract_epi16(_mm_cvtps_ph(_mm_set_ss(in[i]), 0), 0);
}
@@ -72,6 +73,7 @@ QT_FUNCTION_TARGET(F16C)
void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW
{
qsizetype i = 0;
+ int epilog_i;
for (; i < len - 7; i += 8)
_mm256_storeu_ps(out + i, _mm256_cvtph_ps(_mm_loadu_si128((const __m128i *)(in + i))));
if (i < len - 3) {
@@ -79,7 +81,7 @@ void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL
i += 4;
}
// Inlining "qfloat16::operator float()":
- SIMD_EPILOGUE(i, len, 3)
+ for (epilog_i = 0; i < len && epilog_i < 3; ++i, ++epilog_i)
out[i] = _mm_cvtss_f32(_mm_cvtph_ps(_mm_cvtsi32_si128(in[i])));
}