aom: Fix asserts in SVE convolution functions (d50d0)

From d50d0f8ad81f853d06cd9182f904cbcdc03a646f Mon Sep 17 00:00:00 2001
From: Salome Thirot <[EMAIL REDACTED]>
Date: Fri, 19 Apr 2024 16:35:25 +0100
Subject: [PATCH] Fix asserts in SVE convolution functions

These asserts break when libaom is built in debug mode, fix them.

Change-Id: I57276cebbdb0062159d94e67dc2ca145a89925ba
(cherry picked from commit d6d79d5bcd77156a21b3c0593eefd8fb5dcb3a56)
---
 aom_dsp/arm/highbd_convolve8_sve.c    | 2 +-
 av1/common/arm/highbd_convolve_sve2.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aom_dsp/arm/highbd_convolve8_sve.c b/aom_dsp/arm/highbd_convolve8_sve.c
index 46131b973..f74d759aa 100644
--- a/aom_dsp/arm/highbd_convolve8_sve.c
+++ b/aom_dsp/arm/highbd_convolve8_sve.c
@@ -294,7 +294,7 @@ void aom_highbd_convolve8_vert_sve(const uint8_t *src8, ptrdiff_t src_stride,
                                    const int16_t *filter_y, int y_step_q4,
                                    int width, int height, int bd) {
   assert(y_step_q4 == 16);
-  assert(w >= 4 && h >= 4);
+  assert(width >= 4 && height >= 4);
   (void)filter_x;
   (void)y_step_q4;
   (void)x_step_q4;
diff --git a/av1/common/arm/highbd_convolve_sve2.c b/av1/common/arm/highbd_convolve_sve2.c
index 1cb1086b5..26f049e75 100644
--- a/av1/common/arm/highbd_convolve_sve2.c
+++ b/av1/common/arm/highbd_convolve_sve2.c
@@ -644,7 +644,7 @@ void highbd_convolve_y_sr_8tap_sve2(const uint16_t *src, ptrdiff_t src_stride,
                                     uint16_t *dst, ptrdiff_t dst_stride,
                                     int width, int height,
                                     const int16_t *filter_y, int bd) {
-  assert(w >= 4 && h >= 4);
+  assert(width >= 4 && height >= 4);
 
   const int16x8_t y_filter = vld1q_s16(filter_y);
 
@@ -813,7 +813,7 @@ void highbd_convolve_y_sr_4tap_sve2(const uint16_t *src, ptrdiff_t src_stride,
                                     uint16_t *dst, ptrdiff_t dst_stride,
                                     int width, int height,
                                     const int16_t *filter_y, int bd) {
-  assert(w >= 4 && h >= 4);
+  assert(width >= 4 && height >= 4);
 
   const int16x8_t y_filter =
       vcombine_s16(vld1_s16(filter_y + 2), vdup_n_s16(0));
@@ -1430,7 +1430,7 @@ void highbd_convolve_2d_sr_vert_8tap_sve2(const uint16_t *src,
                                           int height, const int16_t *filter_y,
                                           ConvolveParams *conv_params, int bd,
                                           const int y_offset) {
-  assert(w >= 4 && h >= 4);
+  assert(width >= 4 && height >= 4);
   const int64x2_t offset = vdupq_n_s64(y_offset);
   const int32x4_t shift = vdupq_n_s32(-conv_params->round_1);
   const int16x8_t y_filter = vld1q_s16(filter_y);
@@ -1620,7 +1620,7 @@ void highbd_convolve_2d_sr_vert_4tap_sve2(const uint16_t *src,
                                           int height, const int16_t *filter_y,
                                           ConvolveParams *conv_params, int bd,
                                           const int y_offset) {
-  assert(w >= 4 && h >= 4);
+  assert(width >= 4 && height >= 4);
   const int64x2_t offset = vdupq_n_s64(y_offset);
   const int32x4_t shift = vdupq_n_s32(-conv_params->round_1);