dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Remove an unnecessary transposition in TTransform."

Browse Source
This commit is contained in:
Vincent Rabaud 2016-02-18 08:15:10 +00:00 committed by Gerrit Code Review
commit 8aa352b256
4 changed files with 39 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsp/dsp.h
View File

@ -151,6 +151,8 @@ typedef int (*VP8Metric)(const uint8_t* pix, const uint8_t* ref);
extern VP8Metric VP8SSE16x16, VP8SSE16x8, VP8SSE8x8, VP8SSE4x4; extern VP8Metric VP8SSE16x16, VP8SSE16x8, VP8SSE8x8, VP8SSE4x4;
typedef int (*VP8WMetric)(const uint8_t* pix, const uint8_t* ref, typedef int (*VP8WMetric)(const uint8_t* pix, const uint8_t* ref,
const uint16_t* const weights); const uint16_t* const weights);
// The weights for VP8TDisto4x4 and VP8TDisto16x16 contain a row-major
// 4 by 4 symmetric matrix.
extern VP8WMetric VP8TDisto4x4, VP8TDisto16x16; extern VP8WMetric VP8TDisto4x4, VP8TDisto16x16;
typedef void (*VP8BlockCopy)(const uint8_t* src, uint8_t* dst); typedef void (*VP8BlockCopy)(const uint8_t* src, uint8_t* dst);

1
src/dsp/enc.c
View File

@ -559,6 +559,7 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
// Hadamard transform // Hadamard transform
// Returns the weighted sum of the absolute value of transformed coefficients. // Returns the weighted sum of the absolute value of transformed coefficients.
// w[] contains a row-major 4 by 4 symmetric matrix.
static int TTransform(const uint8_t* in, const uint16_t* w) { static int TTransform(const uint8_t* in, const uint16_t* w) {
int sum = 0; int sum = 0;
int tmp[16]; int tmp[16];

51
src/dsp/enc_sse2.c
View File

@ -1048,15 +1048,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
// reconstructed samples. // reconstructed samples.
// Hadamard transform // Hadamard transform
// Returns the difference between the weighted sum of the absolute value of // Returns the weighted sum of the absolute value of transformed coefficients.
// transformed coefficients. // w[] contains a row-major 4 by 4 symmetric matrix.
static int TTransform(const uint8_t* inA, const uint8_t* inB, static int TTransform(const uint8_t* inA, const uint8_t* inB,
const uint16_t* const w) { const uint16_t* const w) {
int32_t sum[4]; int32_t sum[4];
__m128i tmp_0, tmp_1, tmp_2, tmp_3; __m128i tmp_0, tmp_1, tmp_2, tmp_3;
const __m128i zero = _mm_setzero_si128(); const __m128i zero = _mm_setzero_si128();
// Load, combine and transpose inputs. // Load and combine inputs.
{ {
const __m128i inA_0 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 0]); const __m128i inA_0 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 0]);
const __m128i inA_1 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 1]); const __m128i inA_1 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 1]);
@ -1068,37 +1068,22 @@ static int TTransform(const uint8_t* inA, const uint8_t* inB,
const __m128i inB_3 = _mm_loadl_epi64((const __m128i*)&inB[BPS * 3]); const __m128i inB_3 = _mm_loadl_epi64((const __m128i*)&inB[BPS * 3]);
// Combine inA and inB (we'll do two transforms in parallel). // Combine inA and inB (we'll do two transforms in parallel).
const __m128i inAB_0 = _mm_unpacklo_epi8(inA_0, inB_0); const __m128i inAB_0 = _mm_unpacklo_epi32(inA_0, inB_0);
const __m128i inAB_1 = _mm_unpacklo_epi8(inA_1, inB_1); const __m128i inAB_1 = _mm_unpacklo_epi32(inA_1, inB_1);
const __m128i inAB_2 = _mm_unpacklo_epi8(inA_2, inB_2); const __m128i inAB_2 = _mm_unpacklo_epi32(inA_2, inB_2);
const __m128i inAB_3 = _mm_unpacklo_epi8(inA_3, inB_3); const __m128i inAB_3 = _mm_unpacklo_epi32(inA_3, inB_3);
// a00 b00 a01 b01 a02 b03 a03 b03 0 0 0 0 0 0 0 0 tmp_0 = _mm_unpacklo_epi8(inAB_0, zero);
// a10 b10 a11 b11 a12 b12 a13 b13 0 0 0 0 0 0 0 0 tmp_1 = _mm_unpacklo_epi8(inAB_1, zero);
// a20 b20 a21 b21 a22 b22 a23 b23 0 0 0 0 0 0 0 0 tmp_2 = _mm_unpacklo_epi8(inAB_2, zero);
// a30 b30 a31 b31 a32 b32 a33 b33 0 0 0 0 0 0 0 0 tmp_3 = _mm_unpacklo_epi8(inAB_3, zero);
// a00 a01 a02 a03 b00 b01 b02 b03
// Transpose the two 4x4, discarding the filling zeroes. // a10 a11 a12 a13 b10 b11 b12 b13
const __m128i transpose0_0 = _mm_unpacklo_epi8(inAB_0, inAB_2); // a20 a21 a22 a23 b20 b21 b22 b23
const __m128i transpose0_1 = _mm_unpacklo_epi8(inAB_1, inAB_3); // a30 a31 a32 a33 b30 b31 b32 b33
// a00 a20 b00 b20 a01 a21 b01 b21 a02 a22 b02 b22 a03 a23 b03 b23
// a10 a30 b10 b30 a11 a31 b11 b31 a12 a32 b12 b32 a13 a33 b13 b33
const __m128i transpose1_0 = _mm_unpacklo_epi8(transpose0_0, transpose0_1);
const __m128i transpose1_1 = _mm_unpackhi_epi8(transpose0_0, transpose0_1);
// a00 a10 a20 a30 b00 b10 b20 b30 a01 a11 a21 a31 b01 b11 b21 b31
// a02 a12 a22 a32 b02 b12 b22 b32 a03 a13 a23 a33 b03 b13 b23 b33
// Convert to 16b.
tmp_0 = _mm_unpacklo_epi8(transpose1_0, zero);
tmp_1 = _mm_unpackhi_epi8(transpose1_0, zero);
tmp_2 = _mm_unpacklo_epi8(transpose1_1, zero);
tmp_3 = _mm_unpackhi_epi8(transpose1_1, zero);
// a00 a10 a20 a30 b00 b10 b20 b30
// a01 a11 a21 a31 b01 b11 b21 b31
// a02 a12 a22 a32 b02 b12 b22 b32
// a03 a13 a23 a33 b03 b13 b23 b33
} }
// Horizontal pass and subsequent transpose. // Vertical pass first to avoid a transpose (vertical and horizontal passes
// are commutative because w/kWeightY is symmetric) and subsequent transpose.
{ {
// Calculate a and b (two 4x4 at once). // Calculate a and b (two 4x4 at once).
const __m128i a0 = _mm_add_epi16(tmp_0, tmp_2); const __m128i a0 = _mm_add_epi16(tmp_0, tmp_2);
@ -1118,7 +1103,7 @@ static int TTransform(const uint8_t* inA, const uint8_t* inB,
VP8Transpose_2_4x4_16b(&b0, &b1, &b2, &b3, &tmp_0, &tmp_1, &tmp_2, &tmp_3); VP8Transpose_2_4x4_16b(&b0, &b1, &b2, &b3, &tmp_0, &tmp_1, &tmp_2, &tmp_3);
} }
// Vertical pass and difference of weighted sums. // Horizontal pass and difference of weighted sums.
{ {
// Load all inputs. // Load all inputs.
const __m128i w_0 = _mm_loadu_si128((const __m128i*)&w[0]); const __m128i w_0 = _mm_loadu_si128((const __m128i*)&w[0]);

51
src/dsp/enc_sse41.c
View File

@ -68,13 +68,13 @@ static void CollectHistogram(const uint8_t* ref, const uint8_t* pred,
// reconstructed samples. // reconstructed samples.
// Hadamard transform // Hadamard transform
// Returns the difference between the weighted sum of the absolute value of // Returns the weighted sum of the absolute value of transformed coefficients.
// transformed coefficients. // w[] contains a row-major 4 by 4 symmetric matrix.
static int TTransform(const uint8_t* inA, const uint8_t* inB, static int TTransform(const uint8_t* inA, const uint8_t* inB,
const uint16_t* const w) { const uint16_t* const w) {
__m128i tmp_0, tmp_1, tmp_2, tmp_3; __m128i tmp_0, tmp_1, tmp_2, tmp_3;
// Load, combine and transpose inputs. // Load and combine inputs.
{ {
const __m128i inA_0 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 0]); const __m128i inA_0 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 0]);
const __m128i inA_1 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 1]); const __m128i inA_1 = _mm_loadl_epi64((const __m128i*)&inA[BPS * 1]);
@ -86,37 +86,22 @@ static int TTransform(const uint8_t* inA, const uint8_t* inB,
const __m128i inB_3 = _mm_loadl_epi64((const __m128i*)&inB[BPS * 3]); const __m128i inB_3 = _mm_loadl_epi64((const __m128i*)&inB[BPS * 3]);
// Combine inA and inB (we'll do two transforms in parallel). // Combine inA and inB (we'll do two transforms in parallel).
const __m128i inAB_0 = _mm_unpacklo_epi8(inA_0, inB_0); const __m128i inAB_0 = _mm_unpacklo_epi32(inA_0, inB_0);
const __m128i inAB_1 = _mm_unpacklo_epi8(inA_1, inB_1); const __m128i inAB_1 = _mm_unpacklo_epi32(inA_1, inB_1);
const __m128i inAB_2 = _mm_unpacklo_epi8(inA_2, inB_2); const __m128i inAB_2 = _mm_unpacklo_epi32(inA_2, inB_2);
const __m128i inAB_3 = _mm_unpacklo_epi8(inA_3, inB_3); const __m128i inAB_3 = _mm_unpacklo_epi32(inA_3, inB_3);
// a00 b00 a01 b01 a02 b03 a03 b03 0 0 0 0 0 0 0 0 tmp_0 = _mm_cvtepu8_epi16(inAB_0);
// a10 b10 a11 b11 a12 b12 a13 b13 0 0 0 0 0 0 0 0 tmp_1 = _mm_cvtepu8_epi16(inAB_1);
// a20 b20 a21 b21 a22 b22 a23 b23 0 0 0 0 0 0 0 0 tmp_2 = _mm_cvtepu8_epi16(inAB_2);
// a30 b30 a31 b31 a32 b32 a33 b33 0 0 0 0 0 0 0 0 tmp_3 = _mm_cvtepu8_epi16(inAB_3);
// a00 a01 a02 a03 b00 b01 b02 b03
// Transpose the two 4x4, discarding the filling zeroes. // a10 a11 a12 a13 b10 b11 b12 b13
const __m128i transpose0_0 = _mm_unpacklo_epi8(inAB_0, inAB_2); // a20 a21 a22 a23 b20 b21 b22 b23
const __m128i transpose0_1 = _mm_unpacklo_epi8(inAB_1, inAB_3); // a30 a31 a32 a33 b30 b31 b32 b33
// a00 a20 b00 b20 a01 a21 b01 b21 a02 a22 b02 b22 a03 a23 b03 b23
// a10 a30 b10 b30 a11 a31 b11 b31 a12 a32 b12 b32 a13 a33 b13 b33
const __m128i transpose1_0 = _mm_unpacklo_epi8(transpose0_0, transpose0_1);
const __m128i transpose1_1 = _mm_unpackhi_epi8(transpose0_0, transpose0_1);
// a00 a10 a20 a30 b00 b10 b20 b30 a01 a11 a21 a31 b01 b11 b21 b31
// a02 a12 a22 a32 b02 b12 b22 b32 a03 a13 a23 a33 b03 b13 b23 b33
// Convert to 16b.
tmp_0 = _mm_cvtepu8_epi16(transpose1_0);
tmp_1 = _mm_cvtepu8_epi16(_mm_srli_si128(transpose1_0, 8));
tmp_2 = _mm_cvtepu8_epi16(transpose1_1);
tmp_3 = _mm_cvtepu8_epi16(_mm_srli_si128(transpose1_1, 8));
// a00 a10 a20 a30 b00 b10 b20 b30
// a01 a11 a21 a31 b01 b11 b21 b31
// a02 a12 a22 a32 b02 b12 b22 b32
// a03 a13 a23 a33 b03 b13 b23 b33
} }
// Horizontal pass and subsequent transpose. // Vertical pass first to avoid a transpose (vertical and horizontal passes
// are commutative because w/kWeightY is symmetric) and subsequent transpose.
{ {
// Calculate a and b (two 4x4 at once). // Calculate a and b (two 4x4 at once).
const __m128i a0 = _mm_add_epi16(tmp_0, tmp_2); const __m128i a0 = _mm_add_epi16(tmp_0, tmp_2);
@ -136,7 +121,7 @@ static int TTransform(const uint8_t* inA, const uint8_t* inB,
VP8Transpose_2_4x4_16b(&b0, &b1, &b2, &b3, &tmp_0, &tmp_1, &tmp_2, &tmp_3); VP8Transpose_2_4x4_16b(&b0, &b1, &b2, &b3, &tmp_0, &tmp_1, &tmp_2, &tmp_3);
} }
// Vertical pass and difference of weighted sums. // Horizontal pass and difference of weighted sums.
{ {
// Load all inputs. // Load all inputs.
const __m128i w_0 = _mm_loadu_si128((const __m128i*)&w[0]); const __m128i w_0 = _mm_loadu_si128((const __m128i*)&w[0]);