From patchwork Tue May 21 17:13:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 49107 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9214:b0:1af:fc2d:ff5a with SMTP id tl20csp127759pzb; Tue, 21 May 2024 10:14:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXx5I/Rr+0z6VZ/FuHvgmfZt6AJuG+PcDBvhBx/Ea9BL7AHX7j2HdLnv6zigKHUhvU/uHL912j1dJMkp3VnNXZHU8LIb8S7/B2UaQ== X-Google-Smtp-Source: AGHT+IF0p0GkziWzHQonJ5oMmMb+b8KMrM8AfWcN8n2hiPtu4NOBJm4ddnL3g0XvE5phWO1LHwuL X-Received: by 2002:a2e:9ac2:0:b0:2e0:298d:65ec with SMTP id 38308e7fff4ca-2e51fd45214mr282540511fa.17.1716311690061; Tue, 21 May 2024 10:14:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716311690; cv=none; d=google.com; s=arc-20160816; b=oFX+XTT5ETnBodYaccmbnv9SBzw61PO5haB9vepj3ElOCtWtC6DwULfUaDx57N7rW5 bE0SkzfLKwks48L5s+w9pVGQuTVfqqQtxS+sET08aJ8lx8ttyZogtzq4s0+JUA3cLJlV DtVnstZt5O6iQySkktaPYKBeQnalZH4MogpbCzgXCql4Qur0ZTheUt1FuXQ/AHVRPkfl RsJOpCN5pcUt584eJkklAQlxpqeMs6Cfl2TNUJlEvI1l17Zy9Gaaxz5Hgfg7eH+I1a1E xdZHrc9gvbOKZm2Qq7HSeMmpS83ytl9dqTUviTSeTLz8mnKcbnRlFuov7Zu+VN4VCeVC nV6g== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=byZ29F5/X7s2NosuE63EZ/Jp5wL5NXYBWKlUBdpRiTw=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=jn6EpxfXgdhi+ntT9c1MBYuEwojGE8npIZGFrmfSpnyORahXsM9O0BrKMtmLVtRx6b nNY77JlaWeEkGzcxFpNR8be6qtYA/ySPe6PZH5OzETqz1RAPIh4X/Zmy1u5H3p075klb +t+qX9B5l/IRlgeIabwxIl40qKXJeCtPc5uvh6ilx4oh0ZEPWQmtgGdDSTcKl9RRy00e mZ7PiqKkmaoqr9YDmBIz+NZAKTTFX821BlXOZzwEdk6EbdTHnPaQVZW0II7uKur4QXp1 JkvimTx99pV3jyCfJIWFpSiemLVutUKLExNu78EtbIMly/E2MKMx8MaiMMilfVEuF5Rr 4GIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aor1drxb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17c2c712si1458017166b.938.2024.05.21.10.14.49; Tue, 21 May 2024 10:14:50 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aor1drxb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A289768D3C0; Tue, 21 May 2024 20:14:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D5A368D0A4 for ; Tue, 21 May 2024 20:14:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1716311636; bh=kwKeqirTVSpBgQ3f7DY/FukohOvZtEnXrykfz8mocds=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aor1drxbKH+gssX4YQrmF5MGtQ0m4BdPsuZ2wjepZiIRf0Ezu4QeMK2fyNbQNcEHR 5r1ju43Gb22x7mUSO1yWwSWwa7PyasKwl2lhaeSVtv/qKFrE2IEulpGD7prANW/ziG s38etmDEC837r4qjiels1iFPjjrrDYU7ddl+fTaI= Received: from localhost.localdomain ([42.177.176.187]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 374AC612; Wed, 22 May 2024 01:13:52 +0800 X-QQ-mid: xmsmtpt1716311635t04agjpuu Message-ID: X-QQ-XMAILINFO: NDz66ktblfzJKu42naTa998anm/YXGdOcuQkPaCkpo4uXvuzxi90xURHXQqN53 5/iRTuAZBK7Wl3Xk+EVqpxV0b3xoOGBYNa6vmTTDT3hbNDtN4t4BsUJUwSM4MaUrQ5ewuCASerd4 8iwd8JlRf26Ntwd56Rkfh2qSmQ/4FQNReNIw7Eg+SBZLhYRIq7ldJ8KD6K+8WM5w5OaSE1za/J31 chSbT8EevFVbV6gxGyb3n33RXYGG2qTpWAlIZvnNxVK4wSo83GWY4czx1FgTohMWa/7Kx5yaBPzq t0kyzIB5SKZer9B/mLczYXK59bbMfk01wOolCIYMO1BYpAzpnyspSoFn7+I2p4qHDkqr9LG5SYrY yXsKMTEeBoy+B6+NSXIeCkgLTpiqKtnXHMw6Q8YpczkYMWxAaHfc8k3hxXkHYdLzgYDPk0lBNTBU SlKiRL2rYEXO5E82T39A/2YkklT0+Q8QjPqDT7Ii7aUGbBosnSMRdQDqKnVrxFedQIyTeZaGbVLS a7MCfH+AGmcVnoCHbQNygvIxY7p1E9ovLdE1meyRewHgyGEPSbA2vRxhPyZ78K341VXe0ht3Cgp2 deH5LJ8izwvVkODhyanGfgz2fNfQksK5tmFp9/LEi986D5CLoc1f0aP92T4ZvysvcuutQo8B7l54 jBkcUOudI6RIzKg7WvJ9oVLbTUqy4V6L7VVLv8OmhWaATnxr1Za0MwnC2WJWDHUUScmLKXUPtkx9 oUn8RWZ/oMu91Ygox/iIG9QM6euz5wjulShhy+pmm8/9wG5+gu6kAhjsZykMRdhn5lm7ud6qz30+ UgLPNb0c8dyfV8j2m5yEFkembUBqyZMIRpugRzqqEkAeb9UH6CDe2Gq2N8pKo+G4KgLhBnD1yZx6 0gJUCirPsv2Nlujp8/tuzvbkbqZ9uZqHu20Eyv39jwbMJazZCd7x1HA6IOJPYBjg== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 01:13:18 +0800 X-OQ-MSGID: <20240521171319.2629938-4-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240521171319.2629938-1-uk7b@foxmail.com> References: <20240521171319.2629938-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/5] lavc/vp9dsp: R-V V mc bilin hv X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GcGmFtvzCnv+ From: sunyuechi C908: vp9_avg_bilin_4hv_8bpp_c: 11.0 vp9_avg_bilin_4hv_8bpp_rvv_i64: 3.7 vp9_avg_bilin_8hv_8bpp_c: 38.7 vp9_avg_bilin_8hv_8bpp_rvv_i64: 7.2 vp9_avg_bilin_16hv_8bpp_c: 147.0 vp9_avg_bilin_16hv_8bpp_rvv_i64: 14.2 vp9_avg_bilin_32hv_8bpp_c: 574.5 vp9_avg_bilin_32hv_8bpp_rvv_i64: 42.7 vp9_avg_bilin_64hv_8bpp_c: 2311.5 vp9_avg_bilin_64hv_8bpp_rvv_i64: 201.7 vp9_put_bilin_4hv_8bpp_c: 10.0 vp9_put_bilin_4hv_8bpp_rvv_i64: 3.2 vp9_put_bilin_8hv_8bpp_c: 35.2 vp9_put_bilin_8hv_8bpp_rvv_i64: 6.5 vp9_put_bilin_16hv_8bpp_c: 133.7 vp9_put_bilin_16hv_8bpp_rvv_i64: 13.0 vp9_put_bilin_32hv_8bpp_c: 538.2 vp9_put_bilin_32hv_8bpp_rvv_i64: 39.7 vp9_put_bilin_64hv_8bpp_c: 2114.0 vp9_put_bilin_64hv_8bpp_rvv_i64: 153.7 --- libavcodec/riscv/vp9_mc_rvv.S | 34 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 10 ++++++++++ 2 files changed, 44 insertions(+) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index adba4afb90..d7db775df7 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -104,6 +104,39 @@ func ff_\op\()_vp9_bilin_\len\()\type\()_rvv, zve32x endfunc .endm +.macro bilin_hv len op +func ff_\op\()_vp9_bilin_\len\()hv_rvv, zve32x +.ifc \op,avg + csrwi vxrm, 0 +.endif + vsetvlstatic8 \len, t0, 64 + neg t1, a5 + neg t2, a6 + li t4, 8 + bilin_load v24, \len, put, h, a5 + add a2, a2, a3 +1: + addi a4, a4, -1 + bilin_load v4, \len, put, h, a5 + vwmulu.vx v16, v4, a6 + vwmaccsu.vx v16, t2, v24 + vwadd.wx v16, v16, t4 + vnsra.wi v16, v16, 4 + vadd.vv v0, v16, v24 +.ifc \op,avg + vle8.v v16, (a0) + vaaddu.vv v0, v0, v16 +.endif + vse8.v v0, (a0) + vmv.v.v v24, v4 + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc +.endm + const subpel_filters_regular .byte 0, 0, 0, 128, 0, 0, 0, 0 .byte 0, 1, -5, 126, 8, -3, 1, 0 @@ -334,6 +367,7 @@ endfunc .irp op, put, avg bilin_h_v \len, \op, h, a5 bilin_h_v \len, \op, v, a6 + bilin_hv \len, \op .irp name, regular, sharp, smooth .irp type, h, v epel \len, \op, \name, \type, 128 diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 314a1e5808..be5369d506 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -84,6 +84,16 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) dsp->mc[4][FILTER_BILINEAR ][0][1][0] = ff_put_vp9_bilin_4h_rvv; dsp->mc[4][FILTER_BILINEAR ][1][0][1] = ff_avg_vp9_bilin_4v_rvv; dsp->mc[4][FILTER_BILINEAR ][1][1][0] = ff_avg_vp9_bilin_4h_rvv; + dsp->mc[0][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_64hv_rvv; + dsp->mc[0][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_64hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_32hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_32hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_16hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_16hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_8hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_8hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_4hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_4hv_rvv; #undef init_fpel