Commit bda536a4 authored by Ola Hugosson's avatar Ola Hugosson Committed by Ola Hugosson
Browse files

Disable wide filter unit tests in deblock_13tap mode

The 13-tap versions of the wide filters are not ported to SIMD yet
Also add #if to hide a few unused static functions

Change-Id: I1accb2ebf3774a64529d08d667cbebd608d37d39
parent 566155fe
......@@ -115,6 +115,7 @@ static INLINE int8_t flat_mask3(uint8_t thresh, uint8_t p5, uint8_t p4,
}
#endif
#if !PARALLEL_DEBLOCKING_13_TAP
static INLINE int8_t flat_mask5(uint8_t thresh, uint8_t p4, uint8_t p3,
uint8_t p2, uint8_t p1, uint8_t p0, uint8_t q0,
uint8_t q1, uint8_t q2, uint8_t q3,
......@@ -124,6 +125,7 @@ static INLINE int8_t flat_mask5(uint8_t thresh, uint8_t p4, uint8_t p3,
mask |= (abs(q4 - q0) > thresh) * -1;
return ~mask;
}
#endif
// is there high edge variance internal edge: 11111111 yes, 00000000 no
static INLINE int8_t hev_mask(uint8_t thresh, uint8_t p1, uint8_t p0,
......@@ -490,6 +492,7 @@ static INLINE void filter10(int8_t mask, uint8_t thresh, int8_t flat,
}
#endif
#if !PARALLEL_DEBLOCKING_13_TAP
static INLINE void filter16(int8_t mask, uint8_t thresh, int8_t flat,
int8_t flat2, uint8_t *op7, uint8_t *op6,
uint8_t *op5, uint8_t *op4, uint8_t *op3,
......@@ -543,6 +546,7 @@ static INLINE void filter16(int8_t mask, uint8_t thresh, int8_t flat,
filter8(mask, thresh, flat, op3, op2, op1, op0, oq0, oq1, oq2, oq3);
}
}
#endif
static void mb_lpf_horizontal_edge_w(uint8_t *s, int p, const uint8_t *blimit,
const uint8_t *limit,
......@@ -737,6 +741,7 @@ static INLINE int8_t highbd_flat_mask4(uint8_t thresh, uint16_t p3, uint16_t p2,
return ~mask;
}
#if !PARALLEL_DEBLOCKING_13_TAP
static INLINE int8_t highbd_flat_mask5(uint8_t thresh, uint16_t p4, uint16_t p3,
uint16_t p2, uint16_t p1, uint16_t p0,
uint16_t q0, uint16_t q1, uint16_t q2,
......@@ -747,6 +752,7 @@ static INLINE int8_t highbd_flat_mask5(uint8_t thresh, uint16_t p4, uint16_t p3,
mask |= (abs(q4 - q0) > thresh16) * -1;
return ~mask;
}
#endif
// Is there high edge variance internal edge:
// 11111111_11111111 yes, 00000000_00000000 no ?
......@@ -1096,6 +1102,7 @@ static INLINE void highbd_filter14(int8_t mask, uint8_t thresh, int8_t flat,
}
#endif
#if !PARALLEL_DEBLOCKING_13_TAP
static INLINE void highbd_filter16(int8_t mask, uint8_t thresh, int8_t flat,
int8_t flat2, uint16_t *op7, uint16_t *op6,
uint16_t *op5, uint16_t *op4, uint16_t *op3,
......@@ -1161,6 +1168,7 @@ static INLINE void highbd_filter16(int8_t mask, uint8_t thresh, int8_t flat,
bd);
}
}
#endif
static void highbd_mb_lpf_horizontal_edge_w(uint16_t *s, int p,
const uint8_t *blimit,
......
......@@ -508,35 +508,55 @@ const loop8_param_t kHbdLoop8Test6[] = {
make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 8),
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
8),
#if !CONFIG_DEBLOCK_13TAP
// Despite the name the following funcition is doing 15-tap filtering
// which is changed to 13-tap and not yet implemented in SIMD
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
&aom_highbd_lpf_horizontal_edge_8_c, 8),
#endif
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
&aom_highbd_lpf_horizontal_edge_16_c, 8),
#endif
make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 8),
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
8),
#endif
make_tuple(&aom_highbd_lpf_horizontal_4_sse2, &aom_highbd_lpf_horizontal_4_c,
10),
make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 10),
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
10),
#if !CONFIG_DEBLOCK_13TAP
// Despite the name the following funcition is doing 15-tap filtering
// which is changed to 13-tap and not yet implemented in SIMD
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
&aom_highbd_lpf_horizontal_edge_8_c, 10),
#endif
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
&aom_highbd_lpf_horizontal_edge_16_c, 10),
#endif
make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 10),
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
10),
#endif
make_tuple(&aom_highbd_lpf_horizontal_4_sse2, &aom_highbd_lpf_horizontal_4_c,
12),
make_tuple(&aom_highbd_lpf_vertical_4_sse2, &aom_highbd_lpf_vertical_4_c, 12),
make_tuple(&aom_highbd_lpf_horizontal_8_sse2, &aom_highbd_lpf_horizontal_8_c,
12),
#if !CONFIG_DEBLOCK_13TAP
// Despite the name the following funcition is doing 15-tap filtering
// which is changed to 13-tap and not yet implemented in SIMD
make_tuple(&aom_highbd_lpf_horizontal_edge_8_sse2,
&aom_highbd_lpf_horizontal_edge_8_c, 12),
#endif
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_highbd_lpf_horizontal_edge_16_sse2,
&aom_highbd_lpf_horizontal_edge_16_c, 12),
make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 12),
make_tuple(&aom_highbd_lpf_vertical_16_sse2, &aom_highbd_lpf_vertical_16_c,
12),
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
......@@ -544,7 +564,9 @@ const loop8_param_t kHbdLoop8Test6[] = {
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_vertical_16_dual_c, 10),
make_tuple(&aom_highbd_lpf_vertical_16_dual_sse2,
&aom_highbd_lpf_vertical_16_dual_c, 12)
&aom_highbd_lpf_vertical_16_dual_c, 12),
#endif
make_tuple(&aom_highbd_lpf_vertical_8_sse2, &aom_highbd_lpf_vertical_8_c, 12)
};
INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test6Param,
......@@ -553,12 +575,20 @@ INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test6Param,
const loop8_param_t kLoop8Test6[] = {
make_tuple(&aom_lpf_horizontal_4_sse2, &aom_lpf_horizontal_4_c, 8),
make_tuple(&aom_lpf_horizontal_8_sse2, &aom_lpf_horizontal_8_c, 8),
#if !CONFIG_DEBLOCK_13TAP
// Despite the name the following funcition is doing 15-tap filtering
// which is changed to 13-tap and not yet implemented in SIMD
make_tuple(&aom_lpf_horizontal_edge_8_sse2, &aom_lpf_horizontal_edge_8_c, 8),
#endif
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_sse2, &aom_lpf_horizontal_edge_16_c,
8),
#endif
make_tuple(&aom_lpf_vertical_4_sse2, &aom_lpf_vertical_4_c, 8),
make_tuple(&aom_lpf_vertical_8_sse2, &aom_lpf_vertical_8_c, 8),
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_vertical_16_sse2, &aom_lpf_vertical_16_c, 8),
#endif
#if !CONFIG_PARALLEL_DEBLOCKING
make_tuple(&aom_lpf_vertical_16_dual_sse2, &aom_lpf_vertical_16_dual_c, 8)
#endif
......@@ -572,6 +602,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, Loop8Test6Param,
#if HAVE_AVX2
#if CONFIG_HIGHBITDEPTH
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
const loop8_param_t kHbdLoop8Test6Avx2[] = {
make_tuple(&aom_highbd_lpf_horizontal_edge_16_avx2,
&aom_highbd_lpf_horizontal_edge_16_c, 8),
......@@ -592,14 +623,17 @@ INSTANTIATE_TEST_CASE_P(AVX2, Loop8Test6Param,
#endif
#endif
#endif
#if HAVE_AVX2 && (!CONFIG_HIGHBITDEPTH) && (!CONFIG_PARALLEL_DEBLOCKING)
INSTANTIATE_TEST_CASE_P(
AVX2, Loop8Test6Param,
::testing::Values(make_tuple(&aom_lpf_horizontal_edge_8_avx2,
&aom_lpf_horizontal_edge_8_c, 8),
make_tuple(&aom_lpf_horizontal_edge_16_avx2,
&aom_lpf_horizontal_edge_16_c, 8)));
INSTANTIATE_TEST_CASE_P(AVX2, Loop8Test6Param,
::testing::Values(
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_avx2,
&aom_lpf_horizontal_edge_16_c, 8),
#endif
make_tuple(&aom_lpf_horizontal_edge_8_avx2,
&aom_lpf_horizontal_edge_8_c, 8)));
#endif
#if HAVE_SSE2
......@@ -695,11 +729,13 @@ INSTANTIATE_TEST_CASE_P(
// currently built for MSVS with ARM and NEON.
make_tuple(&aom_lpf_horizontal_edge_8_neon,
&aom_lpf_horizontal_edge_8_c, 8),
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_neon,
&aom_lpf_horizontal_edge_16_c, 8),
make_tuple(&aom_lpf_vertical_16_neon, &aom_lpf_vertical_16_c, 8),
make_tuple(&aom_lpf_vertical_16_dual_neon, &aom_lpf_vertical_16_dual_c,
8),
#endif
#endif // HAVE_NEON_ASM
make_tuple(&aom_lpf_horizontal_8_neon, &aom_lpf_horizontal_8_c, 8),
make_tuple(&aom_lpf_vertical_8_neon, &aom_lpf_vertical_8_c, 8),
......@@ -729,10 +765,12 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&aom_lpf_horizontal_edge_8, &aom_lpf_horizontal_edge_8, 8),
make_tuple(&aom_lpf_horizontal_edge_16, &aom_lpf_horizontal_edge_16, 8),
make_tuple(&aom_lpf_vertical_4_dspr2, &aom_lpf_vertical_4_c, 8),
make_tuple(&aom_lpf_vertical_8_dspr2, &aom_lpf_vertical_8_c, 8),
#if CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_vertical_16_dspr2, &aom_lpf_vertical_16_c, 8),
make_tuple(&aom_lpf_vertical_16_dual_dspr2, &aom_lpf_vertical_16_dual_c,
8)));
8),
#endif
make_tuple(&aom_lpf_vertical_8_dspr2, &aom_lpf_vertical_8_c, 8)));
INSTANTIATE_TEST_CASE_P(
DSPR2, Loop8Test9Param,
......@@ -754,11 +792,13 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&aom_lpf_horizontal_8_msa, &aom_lpf_horizontal_8_c, 8),
make_tuple(&aom_lpf_horizontal_edge_8_msa, &aom_lpf_horizontal_edge_8_c,
8),
#if CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_msa,
&aom_lpf_horizontal_edge_16_c, 8),
make_tuple(&aom_lpf_vertical_16_msa, &aom_lpf_vertical_16_c, 8),
#endif
make_tuple(&aom_lpf_vertical_4_msa, &aom_lpf_vertical_4_c, 8),
make_tuple(&aom_lpf_vertical_8_msa, &aom_lpf_vertical_8_c, 8),
make_tuple(&aom_lpf_vertical_16_msa, &aom_lpf_vertical_16_c, 8)));
make_tuple(&aom_lpf_vertical_8_msa, &aom_lpf_vertical_8_c, 8)));
INSTANTIATE_TEST_CASE_P(
MSA, Loop8Test9Param,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment