From 0db9031c79b7309c659385207af8937a09e4e916 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 23 Oct 2014 16:04:13 +0200 Subject: [PATCH] dsp/dec_{neon,sse2}: VE4: normalize variable names use '0' rather than '_' when dealing with variables that result from a shift Change-Id: I29280c0dead645ce39dc4bb42c3e19929b302fd4 --- src/dsp/dec_neon.c | 10 +++++----- src/dsp/dec_sse2.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/dsp/dec_neon.c b/src/dsp/dec_neon.c index 94b76853..2916170f 100644 --- a/src/dsp/dec_neon.c +++ b/src/dsp/dec_neon.c @@ -1317,11 +1317,11 @@ static void VE4(uint8_t* dst) { // vertical const uint64x1_t A0 = vreinterpret_u64_u8(vld1_u8(dst - BPS - 1)); // top row const uint64x1_t A1 = vshr_n_u64(A0, 8); const uint64x1_t A2 = vshr_n_u64(A0, 16); - const uint8x8_t ABCDEFG = vreinterpret_u8_u64(A0); - const uint8x8_t BCDEFG_ = vreinterpret_u8_u64(A1); - const uint8x8_t CDEFG__ = vreinterpret_u8_u64(A2); - const uint8x8_t b = vhadd_u8(ABCDEFG, CDEFG__); - const uint8x8_t avg = vrhadd_u8(b, BCDEFG_); + const uint8x8_t ABCDEFGH = vreinterpret_u8_u64(A0); + const uint8x8_t BCDEFGH0 = vreinterpret_u8_u64(A1); + const uint8x8_t CDEFGH00 = vreinterpret_u8_u64(A2); + const uint8x8_t b = vhadd_u8(ABCDEFGH, CDEFGH00); + const uint8x8_t avg = vrhadd_u8(b, BCDEFGH0); int i; for (i = 0; i < 4; ++i) { vst1_lane_u32((uint32_t*)(dst + i * BPS), vreinterpret_u32_u8(avg), 0); diff --git a/src/dsp/dec_sse2.c b/src/dsp/dec_sse2.c index b19ae790..0de3e3bd 100644 --- a/src/dsp/dec_sse2.c +++ b/src/dsp/dec_sse2.c @@ -963,13 +963,13 @@ static void HFilter8i(uint8_t* u, uint8_t* v, int stride, static void VE4(uint8_t* dst) { // vertical const __m128i one = _mm_set1_epi8(1); - const __m128i ABCDEFG = _mm_loadl_epi64((__m128i*)(dst - BPS - 1)); - const __m128i BCDEFG_ = _mm_srli_si128(ABCDEFG, 1); - const __m128i CDEFG__ = _mm_srli_si128(ABCDEFG, 2); - const __m128i a = _mm_avg_epu8(ABCDEFG, CDEFG__); - const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFG, CDEFG__), one); + const __m128i ABCDEFGH = _mm_loadl_epi64((__m128i*)(dst - BPS - 1)); + const __m128i BCDEFGH0 = _mm_srli_si128(ABCDEFGH, 1); + const __m128i CDEFGH00 = _mm_srli_si128(ABCDEFGH, 2); + const __m128i a = _mm_avg_epu8(ABCDEFGH, CDEFGH00); + const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFGH, CDEFGH00), one); const __m128i b = _mm_subs_epu8(a, lsb); - const __m128i avg = _mm_avg_epu8(b, BCDEFG_); + const __m128i avg = _mm_avg_epu8(b, BCDEFGH0); const uint32_t vals = _mm_cvtsi128_si32(avg); int i; for (i = 0; i < 4; ++i) {