From 58be514e2afc6ea8c12b0a2b7eeed0f38fe013aa Mon Sep 17 00:00:00 2001 From: siivonek Date: Thu, 2 Apr 2020 13:50:08 +0200 Subject: [PATCH] Fix pipeline error. --- src/strategies/avx2/avx2_common_functions.h | 2 +- src/strategies/avx2/sao-avx2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/strategies/avx2/avx2_common_functions.h b/src/strategies/avx2/avx2_common_functions.h index 64f850a8..3492abf1 100644 --- a/src/strategies/avx2/avx2_common_functions.h +++ b/src/strategies/avx2/avx2_common_functions.h @@ -123,7 +123,7 @@ static INLINE void get_first_last_nz_int16(__m256i ints, int32_t *first, int32_t *last = (31 - (int32_t)_lzcnt_u32(nonzero_bytes)) >> 1; } -static int32_t FIX_W32 hsum_8x32b(const __m256i v) +int32_t FIX_W32 kvz_hsum_8x32b(const __m256i v) { __m256i sum1 = v; __m256i sum2 = _mm256_permute4x64_epi64(sum1, _MM_SHUFFLE(1, 0, 3, 2)); diff --git a/src/strategies/avx2/sao-avx2.c b/src/strategies/avx2/sao-avx2.c index e42f911a..5dc1a4da 100644 --- a/src/strategies/avx2/sao-avx2.c +++ b/src/strategies/avx2/sao-avx2.c @@ -369,7 +369,7 @@ static int32_t sao_edge_ddistortion_avx2(const kvz_pixel *orig_data, sum = _mm256_add_epi32(sum, curr); } } - return hsum_8x32b(sum); + return kvz_hsum_8x32b(sum); } static void FIX_W32 calc_edge_dir_one_ymm(const __m256i a, @@ -484,7 +484,7 @@ static void calc_sao_edge_dir_avx2(const kvz_pixel *orig_data, } } for (uint32_t i = 0; i < 5; i++) { - int32_t sum = hsum_8x32b(diff_accum[i]); + int32_t sum = kvz_hsum_8x32b(diff_accum[i]); diff_sum[i] += sum; } } @@ -877,7 +877,7 @@ static int32_t sao_band_ddistortion_avx2(const encoder_state_t *state, sum = _mm256_add_epi32 (sum, curr_sum); } } - return hsum_8x32b(sum); + return kvz_hsum_8x32b(sum); use_generic: return sao_band_ddistortion_generic(state, orig_data, rec_data, block_width,