generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes I62c2e313,Ibd7a0337,I94e1d886

Browse Source 
* changes:
  quantize test: test sse2 and avx optimizations
  quantize test: extend arrays
  quantize test: restrict and correct input
This commit is contained in:
Johann Koenig 2017-07-18 20:42:39 +00:00 committed by Gerrit Code Review
commit 56d3f1573a
1 changed files with 122 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
test/vp9_quantize_test.cc
View File

@ -30,7 +30,6 @@ using libvpx_test::ACMRandom;
using libvpx_test::Buffer; using libvpx_test::Buffer;
namespace { namespace {
#if CONFIG_VP9_HIGHBITDEPTH
const int number_of_iterations = 100; const int number_of_iterations = 100;
typedef void (*QuantizeFunc)(const tran_low_t *coeff, intptr_t count, typedef void (*QuantizeFunc)(const tran_low_t *coeff, intptr_t count,
@ -85,20 +84,19 @@ TEST_P(VP9QuantizeTest, OperationCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
Buffer<tran_low_t> coeff = Buffer<tran_low_t>(16, 16, 0, 16); Buffer<tran_low_t> coeff = Buffer<tran_low_t>(16, 16, 0, 16);
ASSERT_TRUE(coeff.Init()); ASSERT_TRUE(coeff.Init());
DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); DECLARE_ALIGNED(16, int16_t, zbin_ptr[8]);
DECLARE_ALIGNED(16, int16_t, round_ptr[2]); DECLARE_ALIGNED(16, int16_t, round_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[8]);
// These will need to be aligned to 32 when avx code is tested. DECLARE_ALIGNED(16, int16_t, dequant_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(16, 16, 0, 16); Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(16, 16, 0, 32);
ASSERT_TRUE(qcoeff.Init()); ASSERT_TRUE(qcoeff.Init());
Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(16, 16, 0, 16); Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(16, 16, 0, 32);
ASSERT_TRUE(dqcoeff.Init()); ASSERT_TRUE(dqcoeff.Init());
Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(16, 16, 0); Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(16, 16, 0);
ASSERT_TRUE(ref_qcoeff.Init()); ASSERT_TRUE(ref_qcoeff.Init());
Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(16, 16, 0); Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(16, 16, 0);
ASSERT_TRUE(ref_dqcoeff.Init()); ASSERT_TRUE(ref_dqcoeff.Init());
DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]);
uint16_t eob, ref_eob; uint16_t eob, ref_eob;
for (int i = 0; i < number_of_iterations; ++i) { for (int i = 0; i < number_of_iterations; ++i) {
@ -111,12 +109,28 @@ TEST_P(VP9QuantizeTest, OperationCheck) {
ref_eob = eob; ref_eob = eob;
coeff.Set(&rnd, 0, max_value_); coeff.Set(&rnd, 0, max_value_);
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
zbin_ptr[j] = rnd.RandRange(max_value_); // Values determined by deconstructing vp9_init_quantizer().
round_ptr[j] = rnd.Rand16(); // zbin may be up to 1143 for 8 and 10 bit Y values, or 1200 for 12 bit Y
quant_ptr[j] = rnd.Rand16(); // values or U/V values of any bit depth. This is because y_delta is not
quant_shift_ptr[j] = rnd.Rand16(); // factored into the vp9_ac_quant() call.
dequant_ptr[j] = rnd.Rand16(); zbin_ptr[j] = rnd.RandRange(1200);
// round may be up to 685 for Y values or 914 for U/V.
round_ptr[j] = rnd.RandRange(914);
// quant ranges from 1 to -32703
quant_ptr[j] = rnd.RandRange(32704) - 32703;
// quant_shift goes up to 1 << 16.
quant_shift_ptr[j] = rnd.RandRange(16384);
// dequant maxes out at 1828 for all cases.
dequant_ptr[j] = rnd.RandRange(1828);
} }
for (int j = 2; j < 8; j++) {
zbin_ptr[j] = zbin_ptr[1];
round_ptr[j] = round_ptr[1];
quant_ptr[j] = quant_ptr[1];
quant_shift_ptr[j] = quant_shift_ptr[1];
dequant_ptr[j] = dequant_ptr[1];
}
ref_quantize_op_( ref_quantize_op_(
coeff.TopLeftPixel(), count, skip_block, zbin_ptr, round_ptr, quant_ptr, coeff.TopLeftPixel(), count, skip_block, zbin_ptr, round_ptr, quant_ptr,
quant_shift_ptr, ref_qcoeff.TopLeftPixel(), ref_dqcoeff.TopLeftPixel(), quant_shift_ptr, ref_qcoeff.TopLeftPixel(), ref_dqcoeff.TopLeftPixel(),
@ -144,19 +158,19 @@ TEST_P(VP9Quantize32Test, OperationCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
Buffer<tran_low_t> coeff = Buffer<tran_low_t>(32, 32, 0, 16); Buffer<tran_low_t> coeff = Buffer<tran_low_t>(32, 32, 0, 16);
ASSERT_TRUE(coeff.Init()); ASSERT_TRUE(coeff.Init());
DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); DECLARE_ALIGNED(16, int16_t, zbin_ptr[8]);
DECLARE_ALIGNED(16, int16_t, round_ptr[2]); DECLARE_ALIGNED(16, int16_t, round_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(32, 32, 0, 16); DECLARE_ALIGNED(16, int16_t, dequant_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(32, 32, 0, 32);
ASSERT_TRUE(qcoeff.Init()); ASSERT_TRUE(qcoeff.Init());
Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(32, 32, 0, 16); Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(32, 32, 0, 32);
ASSERT_TRUE(dqcoeff.Init()); ASSERT_TRUE(dqcoeff.Init());
Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(32, 32, 0); Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(32, 32, 0);
ASSERT_TRUE(ref_qcoeff.Init()); ASSERT_TRUE(ref_qcoeff.Init());
Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(32, 32, 0); Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(32, 32, 0);
ASSERT_TRUE(ref_dqcoeff.Init()); ASSERT_TRUE(ref_dqcoeff.Init());
DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]);
uint16_t eob, ref_eob; uint16_t eob, ref_eob;
for (int i = 0; i < number_of_iterations; ++i) { for (int i = 0; i < number_of_iterations; ++i) {
@ -169,12 +183,20 @@ TEST_P(VP9Quantize32Test, OperationCheck) {
ref_eob = eob; ref_eob = eob;
coeff.Set(&rnd, 0, max_value_); coeff.Set(&rnd, 0, max_value_);
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
zbin_ptr[j] = rnd.RandRange(max_value_); zbin_ptr[j] = rnd.RandRange(1200);
round_ptr[j] = rnd.Rand16(); round_ptr[j] = rnd.RandRange(914);
quant_ptr[j] = rnd.Rand16(); quant_ptr[j] = rnd.RandRange(32704) - 32703;
quant_shift_ptr[j] = rnd.Rand16(); quant_shift_ptr[j] = rnd.RandRange(16384);
dequant_ptr[j] = rnd.Rand16(); dequant_ptr[j] = rnd.RandRange(1828);
} }
for (int j = 2; j < 8; j++) {
zbin_ptr[j] = zbin_ptr[1];
round_ptr[j] = round_ptr[1];
quant_ptr[j] = quant_ptr[1];
quant_shift_ptr[j] = quant_shift_ptr[1];
dequant_ptr[j] = dequant_ptr[1];
}
ref_quantize_op_( ref_quantize_op_(
coeff.TopLeftPixel(), count, skip_block, zbin_ptr, round_ptr, quant_ptr, coeff.TopLeftPixel(), count, skip_block, zbin_ptr, round_ptr, quant_ptr,
quant_shift_ptr, ref_qcoeff.TopLeftPixel(), ref_dqcoeff.TopLeftPixel(), quant_shift_ptr, ref_qcoeff.TopLeftPixel(), ref_dqcoeff.TopLeftPixel(),
@ -202,19 +224,19 @@ TEST_P(VP9QuantizeTest, EOBCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
Buffer<tran_low_t> coeff = Buffer<tran_low_t>(16, 16, 0, 16); Buffer<tran_low_t> coeff = Buffer<tran_low_t>(16, 16, 0, 16);
ASSERT_TRUE(coeff.Init()); ASSERT_TRUE(coeff.Init());
DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); DECLARE_ALIGNED(16, int16_t, zbin_ptr[8]);
DECLARE_ALIGNED(16, int16_t, round_ptr[2]); DECLARE_ALIGNED(16, int16_t, round_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(16, 16, 0, 16); DECLARE_ALIGNED(16, int16_t, dequant_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(16, 16, 0, 32);
ASSERT_TRUE(qcoeff.Init()); ASSERT_TRUE(qcoeff.Init());
Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(16, 16, 0, 16); Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(16, 16, 0, 32);
ASSERT_TRUE(dqcoeff.Init()); ASSERT_TRUE(dqcoeff.Init());
Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(16, 16, 0); Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(16, 16, 0);
ASSERT_TRUE(ref_qcoeff.Init()); ASSERT_TRUE(ref_qcoeff.Init());
Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(16, 16, 0); Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(16, 16, 0);
ASSERT_TRUE(ref_dqcoeff.Init()); ASSERT_TRUE(ref_dqcoeff.Init());
DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]);
uint16_t eob, ref_eob; uint16_t eob, ref_eob;
for (int i = 0; i < number_of_iterations; ++i) { for (int i = 0; i < number_of_iterations; ++i) {
@ -230,11 +252,18 @@ TEST_P(VP9QuantizeTest, EOBCheck) {
coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_);
coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_);
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
zbin_ptr[j] = rnd.RandRange(max_value_); zbin_ptr[j] = rnd.RandRange(1200);
round_ptr[j] = rnd.Rand16(); round_ptr[j] = rnd.RandRange(914);
quant_ptr[j] = rnd.Rand16(); quant_ptr[j] = rnd.RandRange(32704) - 32703;
quant_shift_ptr[j] = rnd.Rand16(); quant_shift_ptr[j] = rnd.RandRange(16384);
dequant_ptr[j] = rnd.Rand16(); dequant_ptr[j] = rnd.RandRange(1828);
}
for (int j = 2; j < 8; j++) {
zbin_ptr[j] = zbin_ptr[1];
round_ptr[j] = round_ptr[1];
quant_ptr[j] = quant_ptr[1];
quant_shift_ptr[j] = quant_shift_ptr[1];
dequant_ptr[j] = dequant_ptr[1];
} }
ref_quantize_op_( ref_quantize_op_(
@ -264,19 +293,19 @@ TEST_P(VP9Quantize32Test, EOBCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
Buffer<tran_low_t> coeff = Buffer<tran_low_t>(32, 32, 0, 16); Buffer<tran_low_t> coeff = Buffer<tran_low_t>(32, 32, 0, 16);
ASSERT_TRUE(coeff.Init()); ASSERT_TRUE(coeff.Init());
DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); DECLARE_ALIGNED(16, int16_t, zbin_ptr[8]);
DECLARE_ALIGNED(16, int16_t, round_ptr[2]); DECLARE_ALIGNED(16, int16_t, round_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_ptr[8]);
DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(32, 32, 0, 16); DECLARE_ALIGNED(16, int16_t, dequant_ptr[8]);
Buffer<tran_low_t> qcoeff = Buffer<tran_low_t>(32, 32, 0, 32);
ASSERT_TRUE(qcoeff.Init()); ASSERT_TRUE(qcoeff.Init());
Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(32, 32, 0, 16); Buffer<tran_low_t> dqcoeff = Buffer<tran_low_t>(32, 32, 0, 32);
ASSERT_TRUE(dqcoeff.Init()); ASSERT_TRUE(dqcoeff.Init());
Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(32, 32, 0); Buffer<tran_low_t> ref_qcoeff = Buffer<tran_low_t>(32, 32, 0);
ASSERT_TRUE(ref_qcoeff.Init()); ASSERT_TRUE(ref_qcoeff.Init());
Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(32, 32, 0); Buffer<tran_low_t> ref_dqcoeff = Buffer<tran_low_t>(32, 32, 0);
ASSERT_TRUE(ref_dqcoeff.Init()); ASSERT_TRUE(ref_dqcoeff.Init());
DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]);
uint16_t eob, ref_eob; uint16_t eob, ref_eob;
for (int i = 0; i < number_of_iterations; ++i) { for (int i = 0; i < number_of_iterations; ++i) {
@ -292,11 +321,18 @@ TEST_P(VP9Quantize32Test, EOBCheck) {
coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_);
coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_); coeff.TopLeftPixel()[rnd(count)] = rnd.RandRange(max_value_);
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
zbin_ptr[j] = rnd.RandRange(max_value_); zbin_ptr[j] = rnd.RandRange(1200);
round_ptr[j] = rnd.Rand16(); round_ptr[j] = rnd.RandRange(914);
quant_ptr[j] = rnd.Rand16(); quant_ptr[j] = rnd.RandRange(32704) - 32703;
quant_shift_ptr[j] = rnd.Rand16(); quant_shift_ptr[j] = rnd.RandRange(16384);
dequant_ptr[j] = rnd.Rand16(); dequant_ptr[j] = rnd.RandRange(1828);
}
for (int j = 2; j < 8; j++) {
zbin_ptr[j] = zbin_ptr[1];
round_ptr[j] = round_ptr[1];
quant_ptr[j] = quant_ptr[1];
quant_shift_ptr[j] = quant_shift_ptr[1];
dequant_ptr[j] = dequant_ptr[1];
} }
ref_quantize_op_( ref_quantize_op_(
@ -324,9 +360,12 @@ TEST_P(VP9Quantize32Test, EOBCheck) {
using std::tr1::make_tuple; using std::tr1::make_tuple;
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
SSE2, VP9QuantizeTest, SSE2, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_highbd_quantize_b_sse2, ::testing::Values(make_tuple(&vpx_quantize_b_sse2, &vpx_highbd_quantize_b_c,
VPX_BITS_8),
make_tuple(&vpx_highbd_quantize_b_sse2,
&vpx_highbd_quantize_b_c, VPX_BITS_8), &vpx_highbd_quantize_b_c, VPX_BITS_8),
make_tuple(&vpx_highbd_quantize_b_sse2, make_tuple(&vpx_highbd_quantize_b_sse2,
&vpx_highbd_quantize_b_c, VPX_BITS_10), &vpx_highbd_quantize_b_c, VPX_BITS_10),
@ -340,6 +379,37 @@ INSTANTIATE_TEST_CASE_P(
&vpx_highbd_quantize_b_32x32_c, VPX_BITS_10), &vpx_highbd_quantize_b_32x32_c, VPX_BITS_10),
make_tuple(&vpx_highbd_quantize_b_32x32_sse2, make_tuple(&vpx_highbd_quantize_b_32x32_sse2,
&vpx_highbd_quantize_b_32x32_c, VPX_BITS_12))); &vpx_highbd_quantize_b_32x32_c, VPX_BITS_12)));
#endif // HAVE_SSE2 #else
INSTANTIATE_TEST_CASE_P(SSE2, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_sse2,
&vpx_quantize_b_c,
VPX_BITS_8)));
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSE2
// TODO(johannkoenig): SSSE3 optimizations do not yet pass these tests.
#if HAVE_SSSE3 && ARCH_X86_64
INSTANTIATE_TEST_CASE_P(DISABLED_SSSE3, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_ssse3,
&vpx_quantize_b_c,
VPX_BITS_8)));
INSTANTIATE_TEST_CASE_P(
DISABLED_SSSE3, VP9Quantize32Test,
::testing::Values(make_tuple(&vpx_quantize_b_32x32_ssse3,
&vpx_quantize_b_32x32_c, VPX_BITS_8)));
#endif // HAVE_SSSE3 && ARCH_X86_64
// TODO(johannkoenig): AVX optimizations do not yet pass the 32x32 test.
#if HAVE_AVX && ARCH_X86_64
INSTANTIATE_TEST_CASE_P(AVX, VP9QuantizeTest,
::testing::Values(make_tuple(&vpx_quantize_b_avx,
&vpx_quantize_b_c,
VPX_BITS_8)));
INSTANTIATE_TEST_CASE_P(DISABLED_AVX, VP9Quantize32Test,
::testing::Values(make_tuple(&vpx_quantize_b_32x32_avx,
&vpx_quantize_b_32x32_c,
VPX_BITS_8)));
#endif // HAVE_AVX && ARCH_X86_64
} // namespace } // namespace