From patchwork Wed Jul 12 12:02:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kaustubh.raste@imgtec.com X-Patchwork-Id: 4308 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp714571vsb; Wed, 12 Jul 2017 05:02:26 -0700 (PDT) X-Received: by 10.28.59.69 with SMTP id i66mr2222036wma.67.1499860946336; Wed, 12 Jul 2017 05:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499860946; cv=none; d=google.com; s=arc-20160816; b=aIAFMuSPpR1lMpwPFHu9dEfiCtRKnF+ZZ1cvuSkjOaqqzIMT+nv8DDz5em7beQ7fgn E3uRhoiL4eLYhA2nuZeGJa/e2dOjK20nnw5oxYKO4JuGSzdzyvLJGIe7dHk7FLaopPT1 Cx0zUjKyMpRboN6U4OYGXPrBxqJ0KqrEeFOB1PcCS30eH8azFiI2a1FDGEp0/L4vHCzA ti/yMOgeE9PF7yCqshA+RZegxnxzVDBa8f9KLfRXaXSGt26PeZtodyyziGK1FrTdethW T6s9AJ7xjOAhZO/kekYbdqxi6MvqUNVP9T0q5BsFhkoWqp4q4jXci7s2r+NM9/1gJnof heyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=9MNzHtYT2OHEZ8H9+KNti/n2cxyONwbC5gmJ7rwDycg=; b=eUdkKN73mzAt3GEpAZ0xItjkiiuZhBD1F1mJiEgajddUXt2pKVbQ1AtW8PWeFIvD+0 88Bt8Qy37oxdAFo92JdzrSQhoawkFFL9WjwvfCkP12jKIGFprvcrBht9EZCIVNVyLpP1 C0Ovf6RJw9X8b/2TIiqI5atLdzMWGXcG99LioX2garTdx2OtPTyzx1aTZIGKPWUjwCvH TBKN2zkflMfYwVXo7thUkFH/KlxdsSLYYHtanwbwXRLlq+sEChpJahTmk1UfX9NSnkhT EodPr2UDWKyFXOvvHV2do5xvfAq+EjpnU8pAV0gmZSBmFsUTS5scv0M8ZqAQCJtmYo56 QoDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g15si2054675wmd.94.2017.07.12.05.02.25; Wed, 12 Jul 2017 05:02:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FACB689A84; Wed, 12 Jul 2017 15:02:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2CBF6891DF for ; Wed, 12 Jul 2017 15:02:11 +0300 (EEST) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id 931296A53AD53 for ; Wed, 12 Jul 2017 13:02:11 +0100 (IST) Received: from pudesk204.pu.imgtec.org (192.168.91.13) by hhmail02.hh.imgtec.org (10.100.10.20) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 12 Jul 2017 13:02:14 +0100 From: To: Date: Wed, 12 Jul 2017 17:32:32 +0530 Message-ID: <1499860952-21196-1-git-send-email-kaustubh.raste@imgtec.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1499755739-17696-1-git-send-email-kaustubh.raste@imgtec.com> References: <1499755739-17696-1-git-send-email-kaustubh.raste@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.91.13] Subject: [FFmpeg-devel] [PATCH] Add prefetch for mips X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Kaustubh Raste Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Kaustubh Raste Signed-off-by: Kaustubh Raste --- libavcodec/mips/Makefile | 1 + libavcodec/mips/videodsp_init.c | 51 +++++++++++++++++++++++++++++++++++++++ libavcodec/videodsp.c | 2 ++ libavcodec/videodsp.h | 1 + 4 files changed, 55 insertions(+) create mode 100644 libavcodec/mips/videodsp_init.c diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 797df09..1f659a0 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_init.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_init.c b/libavcodec/mips/videodsp_init.c new file mode 100644 index 0000000..8170404 --- /dev/null +++ b/libavcodec/mips/videodsp_init.c @@ -0,0 +1,51 @@ +/* + * 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 "libavutil/mips/asmdefs.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; + + __asm__ volatile ( + "1: \n\t" + "pref 4, 0(%[p]) \n\t" + "pref 4, 32(%[p]) \n\t" + PTR_ADDIU" %[h], %[h], -1 \n\t" + PTR_ADDU " %[p], %[p], %[stride] \n\t" + + "bnez %[h], 1b \n\t" + + : [p] "+r" (p), [h] "+r" (h) + : [stride] "r" (stride) + ); +} +#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 */