Use _c functions as reference in av1_convolve_test This fix was suggested by Jonathan Wright <jonathan.wright@arm.com>. Change-Id: I95066f576e18671d3b78addfd3b1af9684a52545 (cherry picked from commit edef9787435a596272a6b2cd9883560f6d9275cf)
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc index e2ef5d1..12edfac 100644 --- a/test/av1_convolve_test.cc +++ b/test/av1_convolve_test.cc
@@ -468,9 +468,9 @@ get_conv_params_no_round(0, 0, nullptr, 0, 0, bit_depth); const uint16_t *input = FirstRandomInput16(GetParam()); DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); - av1_highbd_convolve_x_sr(input, width, reference, kOutputStride, width, - height, filter_params_x, sub_x, &conv_params1, - bit_depth); + av1_highbd_convolve_x_sr_c(input, width, reference, kOutputStride, width, + height, filter_params_x, sub_x, &conv_params1, + bit_depth); ConvolveParams conv_params2 = get_conv_params_no_round(0, 0, nullptr, 0, 0, bit_depth); @@ -677,8 +677,8 @@ av1_get_interp_filter_params_with_block_size(filter, height); const uint16_t *input = FirstRandomInput16(GetParam()); DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); - av1_highbd_convolve_y_sr(input, width, reference, kOutputStride, width, - height, filter_params_y, sub_y, bit_depth); + av1_highbd_convolve_y_sr_c(input, width, reference, kOutputStride, width, + height, filter_params_y, sub_y, bit_depth); DECLARE_ALIGNED(32, uint16_t, test[MAX_SB_SQUARE]); GetParam().TestFunction()(input, width, test, kOutputStride, width, height, filter_params_y, sub_y, bit_depth); @@ -751,7 +751,7 @@ const int height = GetParam().Block().Height(); const uint8_t *input = FirstRandomInput8(GetParam()); DECLARE_ALIGNED(32, uint8_t, reference[MAX_SB_SQUARE]); - aom_convolve_copy(input, width, reference, kOutputStride, width, height); + aom_convolve_copy_c(input, width, reference, kOutputStride, width, height); DECLARE_ALIGNED(32, uint8_t, test[MAX_SB_SQUARE]); GetParam().TestFunction()(input, width, test, kOutputStride, width, height); AssertOutputBufferEq(reference, test, width, height); @@ -797,8 +797,8 @@ const int height = block.Height(); const uint16_t *input = FirstRandomInput16(GetParam()); DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); - aom_highbd_convolve_copy(input, width, reference, kOutputStride, width, - height); + aom_highbd_convolve_copy_c(input, width, reference, kOutputStride, width, + height); DECLARE_ALIGNED(32, uint16_t, test[MAX_SB_SQUARE]); GetParam().TestFunction()(input, width, test, kOutputStride, width, height); AssertOutputBufferEq(reference, test, width, height); @@ -1005,9 +1005,9 @@ DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); ConvolveParams conv_params1 = get_conv_params_no_round(0, 0, nullptr, 0, 0, bit_depth); - av1_highbd_convolve_2d_sr(input, width, reference, kOutputStride, width, - height, filter_params_x, filter_params_y, sub_x, - sub_y, &conv_params1, bit_depth); + av1_highbd_convolve_2d_sr_c(input, width, reference, kOutputStride, width, + height, filter_params_x, filter_params_y, sub_x, + sub_y, &conv_params1, bit_depth); DECLARE_ALIGNED(32, uint16_t, test[MAX_SB_SQUARE]); ConvolveParams conv_params2 = get_conv_params_no_round(0, 0, nullptr, 0, 0, bit_depth); @@ -1224,7 +1224,7 @@ } virtual convolve_x_func ReferenceFunc() const { - return av1_dist_wtd_convolve_x; + return av1_dist_wtd_convolve_x_c; } private: @@ -1314,7 +1314,7 @@ } virtual highbd_convolve_x_func ReferenceFunc() const { - return av1_highbd_dist_wtd_convolve_x; + return av1_highbd_dist_wtd_convolve_x_c; } private: @@ -1393,7 +1393,7 @@ } convolve_x_func ReferenceFunc() const override { - return av1_dist_wtd_convolve_y; + return av1_dist_wtd_convolve_y_c; } }; @@ -1425,7 +1425,7 @@ // Again, the X and Y convolve functions have the same type signature and logic. class AV1ConvolveYHighbdCompoundTest : public AV1ConvolveXHighbdCompoundTest { highbd_convolve_x_func ReferenceFunc() const override { - return av1_highbd_dist_wtd_convolve_y; + return av1_highbd_dist_wtd_convolve_y_c; } const InterpFilterParams *FilterParams( InterpFilter f, const BlockSize &block) const override { @@ -1605,7 +1605,7 @@ const uint16_t *input2 = SecondRandomInput16(GetParam()); DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); DECLARE_ALIGNED(32, CONV_BUF_TYPE, reference_conv_buf[MAX_SB_SQUARE]); - Convolve(av1_highbd_dist_wtd_convolve_2d_copy, input1, input2, reference, + Convolve(av1_highbd_dist_wtd_convolve_2d_copy_c, input1, input2, reference, reference_conv_buf, compound); DECLARE_ALIGNED(32, uint16_t, test[MAX_SB_SQUARE]); @@ -1692,7 +1692,7 @@ const uint8_t *input2 = SecondRandomInput8(GetParam()); DECLARE_ALIGNED(32, uint8_t, reference[MAX_SB_SQUARE]); DECLARE_ALIGNED(32, CONV_BUF_TYPE, reference_conv_buf[MAX_SB_SQUARE]); - Convolve(av1_dist_wtd_convolve_2d, input1, input2, reference, + Convolve(av1_dist_wtd_convolve_2d_c, input1, input2, reference, reference_conv_buf, compound, h_f, v_f, sub_x, sub_y); DECLARE_ALIGNED(32, uint8_t, test[MAX_SB_SQUARE]); @@ -1790,7 +1790,7 @@ const uint16_t *input2 = SecondRandomInput16(GetParam()); DECLARE_ALIGNED(32, uint16_t, reference[MAX_SB_SQUARE]); DECLARE_ALIGNED(32, CONV_BUF_TYPE, reference_conv_buf[MAX_SB_SQUARE]); - Convolve(av1_highbd_dist_wtd_convolve_2d, input1, input2, reference, + Convolve(av1_highbd_dist_wtd_convolve_2d_c, input1, input2, reference, reference_conv_buf, compound, h_f, v_f, sub_x, sub_y); DECLARE_ALIGNED(32, uint16_t, test[MAX_SB_SQUARE]);