| Message ID | 1499755739-17696-1-git-send-email-kaustubh.raste@imgtec.com |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Jul 11, 2017 at 12:18:59PM +0530, kaustubh.raste@imgtec.com wrote: > From: Kaustubh Raste <kaustubh.raste@imgtec.com> > > Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> > --- > libavcodec/mips/Makefile | 1 + > libavcodec/mips/videodsp_mips.c | 42 +++++++++++++++++++++++++++++++++++++++ > libavcodec/videodsp.c | 2 ++ > libavcodec/videodsp.h | 1 + > 4 files changed, 46 insertions(+) > create mode 100644 libavcodec/mips/videodsp_mips.c > > diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile > index 797df09..e2a779c 100644 > --- a/libavcodec/mips/Makefile > +++ b/libavcodec/mips/Makefile > @@ -38,6 +38,7 @@ OBJS-$(CONFIG_ME_CMP) += mips/me_cmp_init_mips.o > OBJS-$(CONFIG_MPEG4_DECODER) += mips/xvididct_init_mips.o > OBJS-$(CONFIG_VC1DSP) += mips/vc1dsp_init_mips.o > OBJS-$(CONFIG_WMV2DSP) += mips/wmv2dsp_init_mips.o > +OBJS-$(CONFIG_VIDEODSP) += mips/videodsp_mips.o > MSA-OBJS-$(CONFIG_HEVC_DECODER) += mips/hevcdsp_msa.o \ > mips/hevc_mc_uni_msa.o \ > mips/hevc_mc_uniw_msa.o \ > diff --git a/libavcodec/mips/videodsp_mips.c b/libavcodec/mips/videodsp_mips.c > new file mode 100644 > index 0000000..c2c8282 > --- /dev/null > +++ b/libavcodec/mips/videodsp_mips.c > @@ -0,0 +1,42 @@ > +/* > + * Copyright (c) 2017 Kaustubh Raste (kaustubh.raste@imgtec.com) > + * > + * 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 "config.h" > +#include "libavutil/attributes.h" > +#include "libavcodec/videodsp.h" > + > +#if HAVE_MSA > +static void prefetch_mips(uint8_t *mem, ptrdiff_t stride, int h) > +{ > + register const uint8_t *p = mem; > + do { > + __asm__ volatile ("pref 4, 0(%[p])" : : [p] "r" (p)); > + __asm__ volatile ("pref 4, 32(%[p])" : : [p] "r" (p)); > + p += stride; > + } while(--h); generally doing a loop in C with asm in it is worse than the whole loop in asm, speedwise that is [...]
diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 797df09..e2a779c 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -38,6 +38,7 @@ OBJS-$(CONFIG_ME_CMP) += mips/me_cmp_init_mips.o OBJS-$(CONFIG_MPEG4_DECODER) += mips/xvididct_init_mips.o OBJS-$(CONFIG_VC1DSP) += mips/vc1dsp_init_mips.o OBJS-$(CONFIG_WMV2DSP) += mips/wmv2dsp_init_mips.o +OBJS-$(CONFIG_VIDEODSP) += mips/videodsp_mips.o MSA-OBJS-$(CONFIG_HEVC_DECODER) += mips/hevcdsp_msa.o \ mips/hevc_mc_uni_msa.o \ mips/hevc_mc_uniw_msa.o \ diff --git a/libavcodec/mips/videodsp_mips.c b/libavcodec/mips/videodsp_mips.c new file mode 100644 index 0000000..c2c8282 --- /dev/null +++ b/libavcodec/mips/videodsp_mips.c @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2017 Kaustubh Raste (kaustubh.raste@imgtec.com) + * + * 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 "config.h" +#include "libavutil/attributes.h" +#include "libavcodec/videodsp.h" + +#if HAVE_MSA +static void prefetch_mips(uint8_t *mem, ptrdiff_t stride, int h) +{ + register const uint8_t *p = mem; + do { + __asm__ volatile ("pref 4, 0(%[p])" : : [p] "r" (p)); + __asm__ volatile ("pref 4, 32(%[p])" : : [p] "r" (p)); + p += stride; + } while(--h); +} +#endif // #if HAVE_MSA + +av_cold void ff_videodsp_init_mips(VideoDSPContext *ctx, int bpc) +{ +#if HAVE_MSA + ctx->prefetch = prefetch_mips; +#endif // #if HAVE_MSA +} diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index ba618a7..ce9e9eb 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -52,4 +52,6 @@ av_cold void ff_videodsp_init(VideoDSPContext *ctx, int bpc) ff_videodsp_init_ppc(ctx, bpc); if (ARCH_X86) ff_videodsp_init_x86(ctx, bpc); + if (ARCH_MIPS) + ff_videodsp_init_mips(ctx, bpc); } diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h index fc01a31..c0545f2 100644 --- a/libavcodec/videodsp.h +++ b/libavcodec/videodsp.h @@ -83,5 +83,6 @@ void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc); +void ff_videodsp_init_mips(VideoDSPContext *ctx, int bpc); #endif /* AVCODEC_VIDEODSP_H */