diff options
| author | Johann Koenig <johannkoenig@google.com> | 2022-03-29 03:18:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-29 03:18:02 +0000 |
| commit | 64f58f5e0a5bfd4f38f99f964ed628734a02ab5a (patch) | |
| tree | bcc71982c62e311a598eca100850bd6fdf2e4bc0 /vpx_dsp/x86 | |
| parent | 9c424b7556ee44df2335332e079c59f0a8d3559b (diff) | |
| parent | d60b671a73a4c8ebc2324ccb248a713652d6506b (diff) | |
| download | libvpx-64f58f5e0a5bfd4f38f99f964ed628734a02ab5a.tar libvpx-64f58f5e0a5bfd4f38f99f964ed628734a02ab5a.tar.gz libvpx-64f58f5e0a5bfd4f38f99f964ed628734a02ab5a.tar.bz2 libvpx-64f58f5e0a5bfd4f38f99f964ed628734a02ab5a.zip | |
Merge "gcc 11 warning: mismatched bound" into main
Diffstat (limited to 'vpx_dsp/x86')
| -rw-r--r-- | vpx_dsp/x86/sad4d_avx2.c | 13 | ||||
| -rw-r--r-- | vpx_dsp/x86/sad4d_avx512.c | 6 |
2 files changed, 9 insertions, 10 deletions
diff --git a/vpx_dsp/x86/sad4d_avx2.c b/vpx_dsp/x86/sad4d_avx2.c index 9dd066691..5f1f757e2 100644 --- a/vpx_dsp/x86/sad4d_avx2.c +++ b/vpx_dsp/x86/sad4d_avx2.c @@ -11,8 +11,7 @@ #include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" -static INLINE void calc_final_4(const __m256i *const sums /*[4]*/, - uint32_t *sad_array) { +static INLINE void calc_final_4(const __m256i sums[4], uint32_t sad_array[4]) { const __m256i t0 = _mm256_hadd_epi32(sums[0], sums[1]); const __m256i t1 = _mm256_hadd_epi32(sums[2], sums[3]); const __m256i t2 = _mm256_hadd_epi32(t0, t1); @@ -22,8 +21,8 @@ static INLINE void calc_final_4(const __m256i *const sums /*[4]*/, } void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, - const uint8_t *const ref_array[/*4*/], int ref_stride, - uint32_t *sad_array /*[4]*/) { + const uint8_t *const ref_array[4], int ref_stride, + uint32_t sad_array[4]) { int i; const uint8_t *refs[4]; __m256i sums[4]; @@ -71,7 +70,7 @@ void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, void vpx_sad32x32x8_avx2(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, - uint32_t *sad_array) { + uint32_t sad_array[8]) { int i; __m256i sums[8]; @@ -127,8 +126,8 @@ void vpx_sad32x32x8_avx2(const uint8_t *src_ptr, int src_stride, } void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, - const uint8_t *const ref_array[/*4*/], int ref_stride, - uint32_t *sad_array /*[4]*/) { + const uint8_t *const ref_array[4], int ref_stride, + uint32_t sad_array[4]) { __m256i sums[4]; int i; const uint8_t *refs[4]; diff --git a/vpx_dsp/x86/sad4d_avx512.c b/vpx_dsp/x86/sad4d_avx512.c index 2fa910871..cfd23fedd 100644 --- a/vpx_dsp/x86/sad4d_avx512.c +++ b/vpx_dsp/x86/sad4d_avx512.c @@ -12,8 +12,8 @@ #include "vpx/vpx_integer.h" void vpx_sad64x64x4d_avx512(const uint8_t *src_ptr, int src_stride, - const uint8_t *const ref_array[/*4*/], - int ref_stride, uint32_t *res /*[4]*/) { + const uint8_t *const ref_array[4], int ref_stride, + uint32_t sad_array[4]) { __m512i src_reg, ref0_reg, ref1_reg, ref2_reg, ref3_reg; __m512i sum_ref0, sum_ref1, sum_ref2, sum_ref3; __m512i sum_mlow, sum_mhigh; @@ -78,6 +78,6 @@ void vpx_sad64x64x4d_avx512(const uint8_t *src_ptr, int src_stride, sum128 = _mm_add_epi32(_mm256_castsi256_si128(sum256), _mm256_extractf128_si256(sum256, 1)); - _mm_storeu_si128((__m128i *)(res), sum128); + _mm_storeu_si128((__m128i *)(sad_array), sum128); } } |