History

avcodec/x86/diracdsp: migrate last remaining MMX function to SSE2

The add_dirac_obmc8_mmx function was the only MMX function left. This patch migrates it to SSE2. Here are the checkasm benchmark results: diracdsp.add_dirac_obmc_8_c: 2299.1 ( 1.00x) diracdsp.add_dirac_obmc_8_mmx: 237.6 ( 9.68x) diracdsp.add_dirac_obmc_8_sse2: 109.1 (21.07x)

Kyosuke Kawakami committed 2 years ago

Commit 61aa5321 parent 8f683ee2 files · +23 −11Browse files

Unified · Split

2 files
  1. libavcodec/x86/diracdsp.asm +20 −4
  2. libavcodec/x86/diracdsp_init.c +3 −7
libavcodec/x86/diracdsp.asm+20−4
@@ -228,7 +228,7 @@ cglobal add_dirac_obmc%1_%2, 5,5,5, dst, src, stride, obmc, yblen · 227 unmodified lines
228228 punpckhbw m1, m4
229229 mova m2, [obmcq+i]
230230 mova m3, m2
231− punpcklbw m2, m4
231+ punpcklbw m2, m4
232232 punpckhbw m3, m4
233233 pmullw m0, m2
234234 pmullw m1, m3
@@ -248,9 +248,6 @@ cglobal add_dirac_obmc%1_%2, 5,5,5, dst, src, stride, obmc, yblen · 13 unmodified lines
248248 RET
249249 %endm
250250
251−INIT_MMX
252−ADD_OBMC 8, mmx
253−
254251 INIT_XMM
255252 PUT_RECT sse2
256253 ADD_RECT sse2
@@ -259,6 +256,25 @@ HPEL_FILTER sse2 · 2 unmodified lines
259256 ADD_OBMC 32, sse2
260257 ADD_OBMC 16, sse2
261258
259+cglobal add_dirac_obmc8_sse2, 5,5,4, dst, src, stride, obmc, yblen
260+ pxor m3, m3
261+ movsxdifnidn strideq, strided
262+.loop:
263+ movh m0, [srcq]
264+ punpcklbw m0, m3
265+ movh m1, [obmcq]
266+ punpcklbw m1, m3
267+ pmullw m0, m1
268+ movu m1, [dstq]
269+ paddw m0, m1
270+ movu [dstq], m0
271+ lea srcq, [srcq+strideq]
272+ lea dstq, [dstq+2*strideq]
273+ add obmcq, 32
274+ sub yblend, 1
275+ jg .loop
276+ RET
277+
262278 INIT_XMM sse4
263279
264280 ; void dequant_subband_32(uint8_t *src, uint8_t *dst, ptrdiff_t stride, const int qf, const int qs, int tot_v, int tot_h)
libavcodec/x86/diracdsp_init.c+3−7
@@ -24,8 +24,7 @@ · 23 unmodified lines
2424
2525 void ff_add_rect_clamped_sse2(uint8_t *, const uint16_t *, int, const int16_t *, int, int, int);
2626
27−void ff_add_dirac_obmc8_mmx(uint16_t *dst, const uint8_t *src, int stride, const uint8_t *obmc_weight, int yblen);
28−
27+void ff_add_dirac_obmc8_sse2(uint16_t *dst, const uint8_t *src, int stride, const uint8_t *obmc_weight, int yblen);
2928 void ff_add_dirac_obmc16_sse2(uint16_t *dst, const uint8_t *src, int stride, const uint8_t *obmc_weight, int yblen);
3029 void ff_add_dirac_obmc32_sse2(uint16_t *dst, const uint8_t *src, int stride, const uint8_t *obmc_weight, int yblen);
3130
@@ -94,15 +93,12 @@ void ff_diracdsp_init_x86(DiracDSPContext* c) · 62 unmodified lines
9493 #if HAVE_X86ASM
9594 int mm_flags = av_get_cpu_flags();
9695
97− if (EXTERNAL_MMX(mm_flags)) {
98− c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx;
99− }
100−
10196 if (EXTERNAL_SSE2(mm_flags)) {
10297 c->dirac_hpel_filter = dirac_hpel_filter_sse2;
10398 c->add_rect_clamped = ff_add_rect_clamped_sse2;
10499 c->put_signed_rect_clamped[0] = (void *)ff_put_signed_rect_clamped_sse2;
105100
101+ c->add_dirac_obmc[0] = ff_add_dirac_obmc8_sse2;
106102 c->add_dirac_obmc[1] = ff_add_dirac_obmc16_sse2;
107103 c->add_dirac_obmc[2] = ff_add_dirac_obmc32_sse2;
108104
@@ -116,5 +112,5 @@ void ff_diracdsp_init_x86(DiracDSPContext* c) · 7 unmodified lines
116112 c->dequant_subband[1] = ff_dequant_subband_32_sse4;
117113 c->put_signed_rect_clamped[1] = ff_put_signed_rect_clamped_10_sse4;
118114 }
119−#endif
115+#endif // HAVE_X86ASM
120116 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t