From 3c73e587d118b8cca2de1e5436273e8b039195f7 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 28 Jul 2017 01:21:28 -0700 Subject: [PATCH] Revert "quantize ssse3: declare all variables" This reverts commit 03f5e300d69d368290305e19cc66bac8b0ea1ff8. This causes test failures under OSX: SSSE3/VP9QuantizeTest.EOBCheck/0 SSSE3/VP9QuantizeTest.OperationCheck/0 Change-Id: I122732717ead1f7af5b04c529a6948e382e5e59b --- test/vp9_quantize_test.cc | 2 +- vpx_dsp/x86/quantize_ssse3_x86_64.asm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index e2c549b44..cffcda2ff 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -381,7 +381,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, VP9QuantizeTest, // TODO(johannkoenig): SSSE3 optimizations do not yet pass these tests. #if HAVE_SSSE3 && ARCH_X86_64 -INSTANTIATE_TEST_CASE_P(SSSE3, VP9QuantizeTest, +INSTANTIATE_TEST_CASE_P(DISABLED_SSSE3, VP9QuantizeTest, ::testing::Values(make_tuple(&vpx_quantize_b_ssse3, &vpx_quantize_b_c, VPX_BITS_8))); diff --git a/vpx_dsp/x86/quantize_ssse3_x86_64.asm b/vpx_dsp/x86/quantize_ssse3_x86_64.asm index d0e1beb14..ec2cafb94 100644 --- a/vpx_dsp/x86/quantize_ssse3_x86_64.asm +++ b/vpx_dsp/x86/quantize_ssse3_x86_64.asm @@ -15,6 +15,7 @@ pw_1: times 8 dw 1 SECTION .text +; TODO(yunqingwang)fix quantize_b code for skip=1 case. %macro QUANTIZE_FN 2 cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \ shift, qcoeff, dqcoeff, dequant, \ @@ -303,9 +304,6 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \ ; skip-block, i.e. just write all zeroes .blank: -DEFINE_ARGS coeff, ncoeff, skip, zbin, round, quant, shift, \ - qcoeff, dqcoeff, dequant, eob, scan, iscan - mov r0, dqcoeffmp movifnidn ncoeffq, ncoeffmp mov r2, qcoeffmp -- 2.40.0