From 1395b56a1d4fcf7fe09e1611637d1519436c9671 Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Fri, 19 Jun 2015 08:59:42 -0700 Subject: [PATCH] Add assembly tests for int projections. BUG=https://code.google.com/p/webm/issues/detail?id=1022 Change-Id: I5ae4acac39fd75c56d3feff0716cb52133de3b22 --- test/vp9_avg_test.cc | 115 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/test/vp9_avg_test.cc b/test/vp9_avg_test.cc index 252ed4efa..56b5250db 100644 --- a/test/vp9_avg_test.cc +++ b/test/vp9_avg_test.cc @@ -121,6 +121,79 @@ class AverageTest } }; +typedef void (*IntProRowFunc)(int16_t hbuf[16], uint8_t const *ref, + const int ref_stride, const int height); + +typedef std::tr1::tuple IntProRowParam; + +class IntProRowTest + : public AverageTestBase, + public ::testing::WithParamInterface { + public: + IntProRowTest() + : AverageTestBase(16, GET_PARAM(0)), + hbuf_asm_(NULL), + hbuf_c_(NULL) { + asm_func_ = GET_PARAM(1); + c_func_ = GET_PARAM(2); + } + + protected: + virtual void SetUp() { + hbuf_asm_ = reinterpret_cast( + vpx_memalign(kDataAlignment, sizeof(*hbuf_asm_) * 16)); + hbuf_c_ = reinterpret_cast( + vpx_memalign(kDataAlignment, sizeof(*hbuf_c_) * 16)); + } + + virtual void TearDown() { + vpx_free(hbuf_c_); + hbuf_c_ = NULL; + vpx_free(hbuf_asm_); + hbuf_asm_ = NULL; + } + + void RunComparison() { + ASM_REGISTER_STATE_CHECK(c_func_(hbuf_c_, source_data_, 0, height_)); + ASM_REGISTER_STATE_CHECK(asm_func_(hbuf_asm_, source_data_, 0, height_)); + EXPECT_EQ(0, memcmp(hbuf_c_, hbuf_asm_, sizeof(*hbuf_c_) * 16)) + << "Output mismatch"; + } + + private: + IntProRowFunc asm_func_; + IntProRowFunc c_func_; + int16_t *hbuf_asm_; + int16_t *hbuf_c_; +}; + +typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width); + +typedef std::tr1::tuple IntProColParam; + +class IntProColTest + : public AverageTestBase, + public ::testing::WithParamInterface { + public: + IntProColTest() : AverageTestBase(GET_PARAM(0), 1), sum_asm_(0), sum_c_(0) { + asm_func_ = GET_PARAM(1); + c_func_ = GET_PARAM(2); + } + + protected: + void RunComparison() { + ASM_REGISTER_STATE_CHECK(sum_c_ = c_func_(source_data_, width_)); + ASM_REGISTER_STATE_CHECK(sum_asm_ = asm_func_(source_data_, width_)); + EXPECT_EQ(sum_c_, sum_asm_) << "Output mismatch"; + } + + private: + IntProColFunc asm_func_; + IntProColFunc c_func_; + int16_t sum_asm_; + int16_t sum_c_; +}; + uint8_t* AverageTestBase::source_data_ = NULL; @@ -143,6 +216,36 @@ TEST_P(AverageTest, Random) { } } +TEST_P(IntProRowTest, MinValue) { + FillConstant(0); + RunComparison(); +} + +TEST_P(IntProRowTest, MaxValue) { + FillConstant(255); + RunComparison(); +} + +TEST_P(IntProRowTest, Random) { + FillRandom(); + RunComparison(); +} + +TEST_P(IntProColTest, MinValue) { + FillConstant(0); + RunComparison(); +} + +TEST_P(IntProColTest, MaxValue) { + FillConstant(255); + RunComparison(); +} + +TEST_P(IntProColTest, Random) { + FillRandom(); + RunComparison(); +} + using std::tr1::make_tuple; INSTANTIATE_TEST_CASE_P( @@ -151,7 +254,6 @@ INSTANTIATE_TEST_CASE_P( make_tuple(16, 16, 1, 8, &vp9_avg_8x8_c), make_tuple(16, 16, 1, 4, &vp9_avg_4x4_c))); - #if HAVE_SSE2 INSTANTIATE_TEST_CASE_P( SSE2, AverageTest, @@ -163,6 +265,17 @@ INSTANTIATE_TEST_CASE_P( make_tuple(16, 16, 5, 4, &vp9_avg_4x4_sse2), make_tuple(32, 32, 15, 4, &vp9_avg_4x4_sse2))); +INSTANTIATE_TEST_CASE_P( + SSE2, IntProRowTest, ::testing::Values( + make_tuple(16, &vp9_int_pro_row_sse2, &vp9_int_pro_row_c), + make_tuple(32, &vp9_int_pro_row_sse2, &vp9_int_pro_row_c), + make_tuple(64, &vp9_int_pro_row_sse2, &vp9_int_pro_row_c))); + +INSTANTIATE_TEST_CASE_P( + SSE2, IntProColTest, ::testing::Values( + make_tuple(16, &vp9_int_pro_col_sse2, &vp9_int_pro_col_c), + make_tuple(32, &vp9_int_pro_col_sse2, &vp9_int_pro_col_c), + make_tuple(64, &vp9_int_pro_col_sse2, &vp9_int_pro_col_c))); #endif #if HAVE_NEON -- 2.40.0