From patchwork Sat Jun 22 15:58:05 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: 50087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1137888vqz; Sat, 22 Jun 2024 08:59:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBKYW6BIzLFAjSJKGRnPW69WMsM3uEpAYymlRoBYfasIKZYTGTBGT/su+j6YF2z9TA7mRRkTBLeKojghvFP0FWoYNts4dArA0KAw== X-Google-Smtp-Source: AGHT+IHyyXFIAIz4AW4jxzqEKBQSWFy/iDhZjjMZqn9Ut5Dv146pHQiyCpmhvbK7WUt7iVFSYDdE X-Received: by 2002:aa7:dcd5:0:b0:57d:3df:ba2d with SMTP id 4fb4d7f45d1cf-57d447aa7c4mr1033069a12.2.1719071945647; Sat, 22 Jun 2024 08:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719071945; cv=none; d=google.com; s=arc-20160816; b=RHHevrdYdljA1/IbAFfhw3pDZ4EwssGfxnd1g15wYXAz5e1OEXhszdLVWtQ5UTAKHs DTmzb7uqZ7n0K42BWUhxB4FGL+9fqg4XJLncDpm5RnRR/IAaaifW7EbSHe5WGedCFKP4 AQ0LZY43V+C2abtFwGkraEpbOFccYDWeB6OTTczZmI7Qt+ndS5gpVjjjShm8zDJjnnpx Bdzv5sQ7cAg5F7jYfZSF3NOH8/UjLtMA6Cj5RiR6lG+HWonTX2eUbxGav9zSWIr3Nfuk HTBeypNYgNTO1w3X2jd/psXinAKm8ssHUyP4l1KjFDnf1/jmjuYLrclfxXSDcCOB15SB q2ag== 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=Wr8s16B4xaovX2y40hdtLo0zF/s1mQMUATG/zHXiCyg=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=MGK3AyEW33/5tfmhjXUCqtNxqXkcDNcCDw/vffTu1jG5I7TAMFmtKqm82aq4gecYni DKF/acR6ppvclXwLPnuYqBvvJt7zpDXXRViQvRDwZE7YHPyLgIkvGBPJyyMixELtPHRt SO5OM+oYR6Rs/TzsdlNaN/PvVpo0BAjoes1+1n9GcRuqmnq1DazcM7Xijul0lHTjuFtC LR7MJkbUzw6/paU0FCexPdHx31eFLue4Lozpq2fc8hKMwTwjLRhcjzDU+SQB/F7mm7Mc guvJyUmD+iFPt53LKmVME/I3/2YivMsKLcgStmxGIp0oKEKzMY3f7bKtSxGK73kh4eKo 8YLg==; 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=hQYIzH6q; 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 4fb4d7f45d1cf-57d306b6b08si1822343a12.308.2024.06.22.08.59.05; Sat, 22 Jun 2024 08:59:05 -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=hQYIzH6q; 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 5B8B668D5FB; Sat, 22 Jun 2024 18:58:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-59.mail.qq.com (out203-205-251-59.mail.qq.com [203.205.251.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47E4968D406 for ; Sat, 22 Jun 2024 18:58:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719071893; bh=j8etcHNgcIfslvth63LHCcU9EPd2yE0T1d21QB/CgPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQYIzH6qEyAtHfv9KZ7mOzkZj6N/3vbSOZuynuhJ8mqxk1b857DW9ZNJypd0A1gaQ ZeQyuQuUjtwZcfMQqJiLCcdV+/ARShejpa9KZ/KYW3b4MRvw/mrzEcpY5TKygkl25A RkH3eANYcvV8EAYkfczuWsfW4XmACwkLNFKEb6ao= Received: from localhost.localdomain ([116.139.97.96]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id E8A868C7; Sat, 22 Jun 2024 23:58:10 +0800 X-QQ-mid: xmsmtpt1719071892tqmluuyac Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uT+FxWOUm0LKjHa7CXcb7Xi3LgF56Vs9Q+Lgo11S6Akw8J4i1MCi RjeCMgMcBhDiaiPW/zRWupPgu9+PrHTGsjGK+glx7UXOOWspq+faVDGfhFNzoLiWvwB86Ah9LU56 Ck7IEYR5pqnWZ14Rluq8UIlcuxnOPT3OxcN3W3brFpIcyIk+Iad5aO1p2tiaavloHQ6d1xx7lU7R zUC6wsmNIlKxRY0/50Ku0p9HPADS3MqJNIwAbJ+mGXs5rbKArXSpTXYGy+Gl2sx+c4n1mvqxh/E0 DUMAlbtm2Q/CIbboANpol9bn7tUrHnQfgqDsGHFIo/3ZCEjpUxW9NlaUBzKrpJgmbmKwQmKxYQpR IXWvmPdkWztL4W0wguU1I6AH4sO6Aq1DaB7oqXqHkKZqiM1CMXVIji0iaFSCB57rJQn0mo793vms 0fHMDhqX1JbaKVYcjsJYNCjM3URzK1M/WWQUXA/EpBwauIQC4g2UivEj35pa+H0wNRcmoIUu4vup ca/2nhZfSM50Um5ptj6OFvirRypcSJoBAXTIdcjXXASsmiJahphdrI1hPWPLOTLcQWrnK6Pa6Pw9 k9B9kHTVLpVl9V/N3Bm/bCJmYX0qjxizqTDd/zXRpdoVfl18XdODatfiTfQaeXm08KszNAugLV0X qoy0R/nMnI/0nedQPMkWnARwcmW3RwVIDSv7NdQ7gEsgRyYRH17cIH1LVFKvCGnNO8/4JsuFFzRV 1wFOfcUBpQ08oxXvK/8RTpryCaKZfvMI2uVNCRPjCYV6kd8E35CAoJZi/tktwZOvUjxKWXLxqp1m 5zyXAJn+rW4Me0flXUYPNrrvjqZLALR8dS5cpYHDWNWEIA5W1ddf0hQt/phpsY0RpELKldww0AxM hlB7M2bjzMnvvHsiPTb8GsrMFZWDUgORV/u7GN/X1+s/mzu0cAR0PBYSYBgBrFSg== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 23:58:05 +0800 X-OQ-MSGID: <20240622155806.3191984-3-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622155806.3191984-1-uk7b@foxmail.com> References: <20240622155806.3191984-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/vp8dsp: R-V V loop_filter_inner 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: eN+qhNfAMfca From: sunyuechi C908 X60 vp8_loop_filter8uv_inner_v_c : 12.5 11.0 vp8_loop_filter8uv_inner_v_rvv_i32 : 7.7 6.2 vp8_loop_filter16y_inner_h_c : 11.7 10.2 vp8_loop_filter16y_inner_h_rvv_i32 : 8.5 6.5 vp8_loop_filter16y_inner_v_c : 11.5 10.7 vp8_loop_filter16y_inner_v_rvv_i32 : 5.0 3.5 --- libavcodec/riscv/vp8dsp_init.c | 5 +- libavcodec/riscv/vp8dsp_rvv.S | 104 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 8c5b2c8b04..94f78cd84b 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -154,7 +154,10 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) #define init_loop_filter(vlen) \ c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_rvv##vlen; \ - c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; + c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; \ + c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_rvv##vlen; \ + c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_rvv##vlen; \ + c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_rvv##vlen; int flags = av_get_cpu_flags(); diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index b5f8bb31b4..ed789ec4fd 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -275,6 +275,13 @@ func ff_vp78_idct_dc_add4uv_rvv, zve64x ret endfunc +.macro filter_abs dst, diff, fI + vneg.v v8, \diff + vmax.vv \dst, v8, \diff + vmsleu.vx v8, \dst, \fI + vmand.mm v27, v27, v8 +.endm + .macro filter_fmin len, vlen, a, f1, p0f2, q0f1 vsetvlstatic16 \len, \vlen vsext.vf2 \q0f1, \a @@ -300,6 +307,16 @@ endfunc vle8.v v11, (t4) vle8.v v17, (t1) vle8.v v22, (\dst) + .if \normal + sub t3, t2, a6 + sub t0, t1, a6 + add t6, \dst, a6 + add a7, t4, a6 + vle8.v v2, (t3) + vle8.v v15, (t0) + vle8.v v10, (t6) + vle8.v v14, (a7) + .endif .else addi t1, \dst, -1 addi a6, \dst, -2 @@ -308,9 +325,27 @@ endfunc vlse8.v v11, (t4), \stride vlse8.v v17, (t1), \stride vlse8.v v22, (\dst), \stride + .if \normal + addi t5, \dst, -4 + addi t0, \dst, -3 + addi t6, \dst, 2 + addi a7, \dst, 3 + vlse8.v v2, (t5), \stride + vlse8.v v15, (t0), \stride + vlse8.v v10, (t6), \stride + vlse8.v v14, (a7), \stride + .endif .endif vwsubu.vv v12, v1, v11 // p1-q1 vwsubu.vv v24, v22, v17 // q0-p0 +.if \normal + vwsubu.vv v30, v1, v17 + vwsubu.vv v20, v11, v22 + vwsubu.vv v28, v1, v15 + vwsubu.vv v4, v2, v15 + vwsubu.vv v6, v10, v11 + vwsubu.vv v2, v14, v10 +.endif vnclip.wi v23, v12, 0 vsetvlstatic16 \len, \vlen // vp8_simple_limit(dst + i, stride, flim) @@ -322,6 +357,25 @@ endfunc vsrl.vi v18, v18, 1 vmacc.vx v18, a7, v8 vmsleu.vx v0, v18, \fE +.if \normal + vneg.v v18, v30 + vmax.vv v30, v18, v30 + vmsleu.vx v27, v30, \fI + filter_abs v18, v28, \fI + filter_abs v18, v4, \fI + filter_abs v18, v6, \fI + filter_abs v18, v2, \fI + filter_abs v20, v20, \fI + vmand.mm v27, v0, v27 // vp8_simple_limit && normal + + vmsgtu.vx v20, v20, \thresh // hev + vmsgtu.vx v3, v30, \thresh + vmor.mm v3, v3, v20 // v3 = hev: > thresh + vzext.vf2 v18, v1 // v18 = p1 + vmand.mm v0, v27, v3 // v0 = normal && hev + vzext.vf2 v20, v11 // v12 = q1 + vmnot.m v3, v3 // v3 = !hv +.endif li t5, 3 li a7, 124 @@ -346,6 +400,37 @@ endfunc vsse8.v v6, (\dst), \stride, v0.t .endif +.if \normal + vmand.mm v0, v27, v3 // vp8_normal_limit & !hv + + .if \inner + vnclip.wi v30, v30, 0 + filter_fmin \len, \vlen, v30, v24, v4, v6 + vadd.vi v24, v24, 1 + vsra.vi v24, v24, 1 // (f1 + 1) >> 1; + vadd.vv v8, v18, v24 + vsub.vv v10, v20, v24 + .endif + + vmax.vx v8, v8, zero + vmax.vx v10, v10, zero + vsetvlstatic8 \len, \vlen + vnclipu.wi v4, v4, 0 + vnclipu.wi v5, v6, 0 + vnclipu.wi v6, v8, 0 + vnclipu.wi v7, v10, 0 + .ifc \type,v + vse8.v v4, (t1), v0.t + vse8.v v5, (\dst), v0.t + vse8.v v6, (t2), v0.t + vse8.v v7, (t4), v0.t + .else + vsse8.v v4, (t1), \stride, v0.t + vsse8.v v5, (\dst), \stride, v0.t + vsse8.v v6, (a6), \stride, v0.t + vsse8.v v7, (t4), \stride, v0.t + .endif +.endif .endm .irp vlen,256,128 @@ -360,6 +445,25 @@ func ff_vp8_h_loop_filter16_simple_rvv\vlen, zve32x filter 16, \vlen, h, 0, 0, a0, a1, a2, a3, a4 ret endfunc + +func ff_vp8_h_loop_filter16_inner_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, h, 1, 1, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_v_loop_filter16_inner_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, v, 1, 1, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_inner_rvv\vlen, zve32x + vsetvlstatic8 8, \vlen + filter 8, \vlen, v, 1, 1, a0, a2, a3, a4, a5 + filter 8, \vlen, v, 1, 1, a1, a2, a3, a4, a5 + ret +endfunc .endr .macro bilin_load_h dst mn