From fd3658b0e4b52b5045b4881900292258ed106f39 Mon Sep 17 00:00:00 2001 From: James Zern Date: Sat, 2 May 2015 13:24:16 -0700 Subject: replace DECLARE_ALIGNED_ARRAY w/DECLARE_ALIGNED this macro was used inconsistently and only differs in behavior from DECLARE_ALIGNED when an alignment attribute is unavailable. this macro is used with calls to assembly, while generic c-code doesn't rely on it, so in a c-only build without an alignment attribute the code will function as expected. Change-Id: Ie9d06d4028c0de17c63b3a27e6c1b0491cc4ea79 --- test/vp9_quantize_test.cc | 96 +++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'test/vp9_quantize_test.cc') diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index 862edbe80..2d910466d 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -80,18 +80,18 @@ class VP9Quantize32Test : public ::testing::TestWithParam { TEST_P(VP9QuantizeTest, OperationCheck) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, coeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, int16_t, zbin_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, round_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_shift_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, qcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, dqcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_qcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_dqcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, int16_t, dequant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, uint16_t, eob_ptr, 1); - DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_eob_ptr, 1); + DECLARE_ALIGNED(16, tran_low_t, coeff_ptr[256]); + DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); + DECLARE_ALIGNED(16, int16_t, round_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); + DECLARE_ALIGNED(16, tran_low_t, qcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, dqcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, ref_qcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, ref_dqcoeff_ptr[256]); + DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]); + DECLARE_ALIGNED(16, uint16_t, eob_ptr[1]); + DECLARE_ALIGNED(16, uint16_t, ref_eob_ptr[1]); int err_count_total = 0; int first_failure = -1; for (int i = 0; i < number_of_iterations; ++i) { @@ -139,18 +139,18 @@ TEST_P(VP9QuantizeTest, OperationCheck) { TEST_P(VP9Quantize32Test, OperationCheck) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, coeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, int16_t, zbin_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, round_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_shift_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, qcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, dqcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_qcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_dqcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, int16_t, dequant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, uint16_t, eob_ptr, 1); - DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_eob_ptr, 1); + DECLARE_ALIGNED(16, tran_low_t, coeff_ptr[1024]); + DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); + DECLARE_ALIGNED(16, int16_t, round_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); + DECLARE_ALIGNED(16, tran_low_t, qcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, dqcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, ref_qcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, ref_dqcoeff_ptr[1024]); + DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]); + DECLARE_ALIGNED(16, uint16_t, eob_ptr[1]); + DECLARE_ALIGNED(16, uint16_t, ref_eob_ptr[1]); int err_count_total = 0; int first_failure = -1; for (int i = 0; i < number_of_iterations; ++i) { @@ -198,18 +198,18 @@ TEST_P(VP9Quantize32Test, OperationCheck) { TEST_P(VP9QuantizeTest, EOBCheck) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, coeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, int16_t, zbin_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, round_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_shift_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, qcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, dqcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_qcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_dqcoeff_ptr, 256); - DECLARE_ALIGNED_ARRAY(16, int16_t, dequant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, uint16_t, eob_ptr, 1); - DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_eob_ptr, 1); + DECLARE_ALIGNED(16, tran_low_t, coeff_ptr[256]); + DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); + DECLARE_ALIGNED(16, int16_t, round_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); + DECLARE_ALIGNED(16, tran_low_t, qcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, dqcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, ref_qcoeff_ptr[256]); + DECLARE_ALIGNED(16, tran_low_t, ref_dqcoeff_ptr[256]); + DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]); + DECLARE_ALIGNED(16, uint16_t, eob_ptr[1]); + DECLARE_ALIGNED(16, uint16_t, ref_eob_ptr[1]); int err_count_total = 0; int first_failure = -1; for (int i = 0; i < number_of_iterations; ++i) { @@ -262,18 +262,18 @@ TEST_P(VP9QuantizeTest, EOBCheck) { TEST_P(VP9Quantize32Test, EOBCheck) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, coeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, int16_t, zbin_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, round_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, int16_t, quant_shift_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, qcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, dqcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_qcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, tran_low_t, ref_dqcoeff_ptr, 1024); - DECLARE_ALIGNED_ARRAY(16, int16_t, dequant_ptr, 2); - DECLARE_ALIGNED_ARRAY(16, uint16_t, eob_ptr, 1); - DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_eob_ptr, 1); + DECLARE_ALIGNED(16, tran_low_t, coeff_ptr[1024]); + DECLARE_ALIGNED(16, int16_t, zbin_ptr[2]); + DECLARE_ALIGNED(16, int16_t, round_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_ptr[2]); + DECLARE_ALIGNED(16, int16_t, quant_shift_ptr[2]); + DECLARE_ALIGNED(16, tran_low_t, qcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, dqcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, ref_qcoeff_ptr[1024]); + DECLARE_ALIGNED(16, tran_low_t, ref_dqcoeff_ptr[1024]); + DECLARE_ALIGNED(16, int16_t, dequant_ptr[2]); + DECLARE_ALIGNED(16, uint16_t, eob_ptr[1]); + DECLARE_ALIGNED(16, uint16_t, ref_eob_ptr[1]); int err_count_total = 0; int first_failure = -1; for (int i = 0; i < number_of_iterations; ++i) { -- cgit v1.2.3