Skip to content

Commit a09a647

Browse files
Ilya KurdyukovSkal
Ilya Kurdyukov
authored and
Skal
committed
SSE4.1 version of TransformColorInverse
Change-Id: I6ba5cb35917eef7a52152c4924eca205b4af7220
1 parent 401da22 commit a09a647

File tree

7 files changed

+80
-0
lines changed

7 files changed

+80
-0
lines changed

Diff for: Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ dsp_dec_srcs := \
7474
src/dsp/lossless_msa.c \
7575
src/dsp/lossless_neon.$(NEON) \
7676
src/dsp/lossless_sse2.c \
77+
src/dsp/lossless_sse41.c \
7778
src/dsp/rescaler.c \
7879
src/dsp/rescaler_mips32.c \
7980
src/dsp/rescaler_mips_dsp_r2.c \

Diff for: Makefile.vc

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ DSP_DEC_OBJS = \
215215
$(DIROBJ)\dsp\lossless_msa.obj \
216216
$(DIROBJ)\dsp\lossless_neon.obj \
217217
$(DIROBJ)\dsp\lossless_sse2.obj \
218+
$(DIROBJ)\dsp\lossless_sse41.obj \
218219
$(DIROBJ)\dsp\rescaler.obj \
219220
$(DIROBJ)\dsp\rescaler_mips32.obj \
220221
$(DIROBJ)\dsp\rescaler_mips_dsp_r2.obj \

Diff for: build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ model {
141141
include "lossless_msa.c"
142142
include "lossless_neon.$NEON"
143143
include "lossless_sse2.c"
144+
include "lossless_sse41.c"
144145
include "rescaler.c"
145146
include "rescaler_mips32.c"
146147
include "rescaler_mips_dsp_r2.c"

Diff for: makefile.unix

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ DSP_DEC_OBJS = \
166166
src/dsp/lossless_msa.o \
167167
src/dsp/lossless_neon.o \
168168
src/dsp/lossless_sse2.o \
169+
src/dsp/lossless_sse41.o \
169170
src/dsp/rescaler.o \
170171
src/dsp/rescaler_mips32.o \
171172
src/dsp/rescaler_mips_dsp_r2.o \

Diff for: src/dsp/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ ENC_SOURCES += ssim.c
4646
libwebpdspdecode_sse41_la_SOURCES =
4747
libwebpdspdecode_sse41_la_SOURCES += alpha_processing_sse41.c
4848
libwebpdspdecode_sse41_la_SOURCES += dec_sse41.c
49+
libwebpdspdecode_sse41_la_SOURCES += lossless_sse41.c
4950
libwebpdspdecode_sse41_la_SOURCES += upsampling_sse41.c
5051
libwebpdspdecode_sse41_la_SOURCES += yuv_sse41.c
5152
libwebpdspdecode_sse41_la_CPPFLAGS = $(libwebpdsp_la_CPPFLAGS)

Diff for: src/dsp/lossless.c

+6
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ VP8LMapARGBFunc VP8LMapColor32b;
575575
VP8LMapAlphaFunc VP8LMapColor8b;
576576

577577
extern void VP8LDspInitSSE2(void);
578+
extern void VP8LDspInitSSE41(void);
578579
extern void VP8LDspInitNEON(void);
579580
extern void VP8LDspInitMIPSdspR2(void);
580581
extern void VP8LDspInitMSA(void);
@@ -624,6 +625,11 @@ WEBP_DSP_INIT_FUNC(VP8LDspInit) {
624625
#if defined(WEBP_USE_SSE2)
625626
if (VP8GetCPUInfo(kSSE2)) {
626627
VP8LDspInitSSE2();
628+
#if defined(WEBP_USE_SSE41)
629+
if (VP8GetCPUInfo(kSSE4_1)) {
630+
VP8LDspInitSSE41();
631+
}
632+
#endif
627633
}
628634
#endif
629635
#if defined(WEBP_USE_MIPS_DSP_R2)

Diff for: src/dsp/lossless_sse41.c

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Copyright 2021 Google Inc. All Rights Reserved.
2+
//
3+
// Use of this source code is governed by a BSD-style license
4+
// that can be found in the COPYING file in the root of the source
5+
// tree. An additional intellectual property rights grant can be found
6+
// in the file PATENTS. All contributing project authors may
7+
// be found in the AUTHORS file in the root of the source tree.
8+
// -----------------------------------------------------------------------------
9+
//
10+
// SSE41 variant of methods for lossless decoder
11+
12+
#include "src/dsp/dsp.h"
13+
14+
#if defined(WEBP_USE_SSE41)
15+
16+
#include "src/dsp/common_sse41.h"
17+
#include "src/dsp/lossless.h"
18+
#include "src/dsp/lossless_common.h"
19+
#include <assert.h>
20+
#include <emmintrin.h>
21+
22+
//------------------------------------------------------------------------------
23+
// Color-space conversion functions
24+
25+
static void TransformColorInverse_SSE41(const VP8LMultipliers* const m,
26+
const uint32_t* const src,
27+
int num_pixels, uint32_t* dst) {
28+
#define CST(X) ((int32_t)((int8_t)m->X) << 3)
29+
const __m128i mults_rb = _mm_set1_epi32(CST(green_to_red_) << 16 |
30+
(CST(green_to_blue_) & 0xffff));
31+
const __m128i mults_b2 = _mm_set1_epi32(CST(red_to_blue_));
32+
#undef CST
33+
const __m128i mask_ag = _mm_set1_epi32(0xff00ff00);
34+
const __m128i perm1 = _mm_setr_epi8(-1, 1, -1, 1, -1, 5, -1, 5,
35+
-1, 9, -1, 9, -1, 13, -1, 13);
36+
const __m128i perm2 = _mm_setr_epi8(-1, 2, -1, -1, -1, 6, -1, -1,
37+
-1, 10, -1, -1, -1, 14, -1, -1);
38+
int i;
39+
for (i = 0; i + 4 <= num_pixels; i += 4) {
40+
const __m128i A = _mm_loadu_si128((const __m128i*)(src + i));
41+
const __m128i B = _mm_shuffle_epi8(A, perm1); // argb -> g0g0
42+
const __m128i C = _mm_mulhi_epi16(B, mults_rb);
43+
const __m128i D = _mm_add_epi8(A, C);
44+
const __m128i E = _mm_shuffle_epi8(D, perm2);
45+
const __m128i F = _mm_mulhi_epi16(E, mults_b2);
46+
const __m128i G = _mm_add_epi8(D, F);
47+
const __m128i out = _mm_blendv_epi8(G, A, mask_ag);
48+
_mm_storeu_si128((__m128i*)&dst[i], out);
49+
}
50+
// Fall-back to C-version for left-overs.
51+
if (i != num_pixels) {
52+
VP8LTransformColorInverse_C(m, src + i, num_pixels - i, dst + i);
53+
}
54+
}
55+
56+
//------------------------------------------------------------------------------
57+
// Entry point
58+
59+
extern void VP8LDspInitSSE41(void);
60+
61+
WEBP_TSAN_IGNORE_FUNCTION void VP8LDspInitSSE41(void) {
62+
VP8LTransformColorInverse = TransformColorInverse_SSE41;
63+
}
64+
65+
#else // !WEBP_USE_SSE41
66+
67+
WEBP_DSP_INIT_STUB(VP8LDspInitSSE41)
68+
69+
#endif // WEBP_USE_SSE41

0 commit comments

Comments
 (0)