[FFmpeg-devel] [PATCH] flac/x86: add ff_flac_lpc_32_sse4()
Paul B Mahol
onemda at gmail.com
Tue Feb 4 12:08:38 CET 2014
On 2/4/14, James Almer <jamrial at gmail.com> wrote:
> On 03/02/14 8:17 PM, Loren Merritt wrote:
>> benchmarked on sandybridge x86_64:
>> 1358232 decicycles in flac_lpc_32_c
>> 1244575 decicycles in flac_lpc_32_sse4, James Almer's patch
>> 650045 decicycles in flac_lpc_32_sse4, this patch
>
> Wonder why storing two samples at a time generates this kind of boost in C
> with
> the 16 bits function, but not this one.
>
>> I haven't tested the edgecases such as odd block lengths
>> ---
>> libavcodec/flacdsp.c | 2 ++
>> libavcodec/flacdsp.h | 1 +
>> libavcodec/x86/Makefile | 2 ++
>> libavcodec/x86/flacdsp.asm | 71
>> +++++++++++++++++++++++++++++++++++++++++++
>> libavcodec/x86/flacdsp_init.c | 39 ++++++++++++++++++++++++
>> 5 files changed, 115 insertions(+)
>> create mode 100644 libavcodec/x86/flacdsp.asm
>> create mode 100644 libavcodec/x86/flacdsp_init.c
>>
>> diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c
>> index b916869..24d9a14 100644
>> --- a/libavcodec/flacdsp.c
>> +++ b/libavcodec/flacdsp.c
>> @@ -128,4 +128,6 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum
>> AVSampleFormat fmt,
>>
>> if (ARCH_ARM)
>> ff_flacdsp_init_arm(c, fmt, bps);
>> + if (ARCH_X86)
>> + ff_flacdsp_init_x86(c, fmt, bps);
>> }
>> diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h
>> index 33184b5..b446916 100644
>> --- a/libavcodec/flacdsp.h
>> +++ b/libavcodec/flacdsp.h
>> @@ -33,5 +33,6 @@ typedef struct FLACDSPContext {
>>
>> void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int
>> bps);
>> void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int
>> bps);
>> +void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int
>> bps);
>>
>> #endif /* AVCODEC_FLACDSP_H */
>> diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
>> index 6f4935b..8934c0d 100644
>> --- a/libavcodec/x86/Makefile
>> +++ b/libavcodec/x86/Makefile
>> @@ -12,6 +12,7 @@ OBJS-$(CONFIG_ENCODERS) +=
>> x86/dsputilenc_mmx.o \
>> x86/fdct.o
>> \
>> x86/motion_est.o
>> OBJS-$(CONFIG_FFT) += x86/fft_init.o
>> +OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp_init.o
>> OBJS-$(CONFIG_H263DSP) += x86/h263dsp_init.o
>> OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o
>> OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
>> @@ -61,6 +62,7 @@ YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o
>> \
>> x86/qpel.o
>> YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o
>> YASM-OBJS-$(CONFIG_FFT) += x86/fft.o
>> +YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o
>> YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o
>> YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o
>> \
>> x86/h264_chromamc_10bit.o
>> diff --git a/libavcodec/x86/flacdsp.asm b/libavcodec/x86/flacdsp.asm
>> new file mode 100644
>> index 0000000..e28f905
>> --- /dev/null
>> +++ b/libavcodec/x86/flacdsp.asm
>> @@ -0,0 +1,71 @@
>> +;******************************************************************************
>> +;* FLAC DSP SIMD optimizations
>> +;*
>> +;* Copyright (C) 2014 Loren Merritt
>> +;*
>> +;* This file is part of FFmpeg.
>> +;*
>> +;* FFmpeg is free software; you can redistribute it and/or
>> +;* modify it under the terms of the GNU Lesser General Public
>> +;* License as published by the Free Software Foundation; either
>> +;* version 2.1 of the License, or (at your option) any later version.
>> +;*
>> +;* FFmpeg is distributed in the hope that it will be useful,
>> +;* but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> +;* Lesser General Public License for more details.
>> +;*
>> +;* You should have received a copy of the GNU Lesser General Public
>> +;* License along with FFmpeg; if not, write to the Free Software
>> +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> +;******************************************************************************
>> +
>> +%include "libavutil/x86/x86util.asm"
>> +
>> +SECTION .text
>> +
>> +INIT_XMM sse4
>> +cglobal flac_lpc_32, 5,6,5, decoded, coeffs, pred_order, qlevel, len, j
>> + sub lend, pred_orderd
>> + jle .ret
>> + lea decodedq, [decodedq+pred_orderq*4-8]
>> + lea coeffsq, [coeffsq+pred_orderq*4]
>> + neg pred_orderq
>> + movd m4, qlevelm
>
> Ah, I unnecessarily put this inside the loop. That for sure cost me some
> cycles...
>
>> +ALIGN 16
>> +.loop_sample:
>> + movd m0, [decodedq+pred_orderq*4+8]
>> + add decodedq, 8
>> + movd m1, [coeffsq+pred_orderq*4]
>> + pxor m2, m2
>> + pxor m3, m3
>> + lea jq, [pred_orderq+1]
>> + test jq, jq
>> + jz .end_order
>> +.loop_order:
>> + pmuldq m0, m1
>> + paddq m2, m0
>> + movd m0, [decodedq+jq*4]
>> + pmuldq m1, m0
>> + paddq m3, m1
>> + movd m1, [coeffsq+jq*4]
>> + inc jq
>> + jl .loop_order
>> +.end_order:
>> + pmuldq m0, m1
>> + paddq m2, m0
>> + psrlq m2, m4
>> + movd m0, [decodedq]
>> + paddd m0, m2
>> + movd [decodedq], m0
>> + sub lend, 2
>> + jl .ret
>> + pmuldq m1, m0
>> + paddq m3, m1
>> + psrlq m3, m4
>> + movd m1, [decodedq+4]
>> + paddd m1, m3
>> + movd [decodedq+4], m1
>> + jg .loop_sample
>> +.ret:
>> + REP_RET
>
> Isn't this only necessary for functions < SSSE3? At least that's what
> x86inc mentions.
>
>> diff --git a/libavcodec/x86/flacdsp_init.c
>> b/libavcodec/x86/flacdsp_init.c
>> new file mode 100644
>> index 0000000..d30a41e
>> --- /dev/null
>> +++ b/libavcodec/x86/flacdsp_init.c
>> @@ -0,0 +1,39 @@
>> +/*
>> + * Copyright (c) 2014 James Almer
>> + *
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> + */
>> +
>> +#include "libavcodec/flacdsp.h"
>> +#include "libavutil/x86/cpu.h"
>> +#include "config.h"
>> +
>> +void ff_flac_lpc_32_sse4(int32_t *samples, const int coeffs[32], int
>> order,
>> + int qlevel, int len);
>> +
>> +av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat
>> fmt,
>> + int bps)
>> +{
>> +#if HAVE_YASM
>> + int cpu_flags = av_get_cpu_flags();
>> +
>> + if (EXTERNAL_SSE4(cpu_flags)) {
>> + if (bps > 16)
>> + c->lpc = ff_flac_lpc_32_sse4;
>> + }
>> +#endif
>> +}
>>
>
> Looks good and works (I couldn't find any file with odd block sizes to
> test).
Couldn't you encode one?
> Next time however you could mention you're giving it a try so we don't both
>
> spend time trying to write the same thing.
>
> Regards.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
More information about the ffmpeg-devel
mailing list