From patchwork Sun May 5 16:45:35 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: 48549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp962967pzb; Sun, 5 May 2024 09:47:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5Wv1WMVBwVPk5XfE/Ow/mDnpusBtILnEFrwskPxLSbgws9qKAU8CqLLyvupUCc0Am+3r++4129zbppNa6RPipgjYSZ/JXgZlHfQ== X-Google-Smtp-Source: AGHT+IGu+s4E1zEMQKovD+Le0/EtHb7+ZTJzkQACrOiyy33emOyu17TOsg0eOwIezJyH4CpqOrEL X-Received: by 2002:a17:906:48c4:b0:a55:9dec:355f with SMTP id d4-20020a17090648c400b00a559dec355fmr4270819ejt.70.1714927623986; Sun, 05 May 2024 09:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714927623; cv=none; d=google.com; s=arc-20160816; b=v3Cpr7YeuVvlxvv4CcWXXoThnbim8H285iL+LuT62VPt81lIU7oOG56Wb4I2CqVpYc Cbgj98JQ2RkHety14a54rMO05nDuoxIA69ReVeYKrflKX0nch3PGv1+V0H45owZYZ84S zS8lfuE6/H5YMc0NjR1B2HR5AKYEc8jQunlZvpREYxvGlobni/ScoQaSI6m/J3AcgRub cQXXOYAC1ZZTq/xafuVkw45S6Alz2M8/hLIbjEZOn+Xa5R11RDudVXtkEN23kYY0/XKF VTUbCvUDCbT9MD/OT3+OPMNRDgkJrfukFolUZrtYazRRmhXOui7mWDl+suNMcqrjHViz z/3g== 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=xehpv/iHxiy8pw2jma82f134zUDeye0czOwzyKy6BmQ=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=RDktZONo3BDW2F4dU+FuVuxDdSbszCo6etPxlSeEJqc8g+HZxd0hQEl5e13/gfGgfM 82Y6yrJNS/m+fKF/QlLMY2bWDhtfLf9sCQp6h+MDVIGKH4OpQg5dswLBVio4+VfmlJnE TNURY7g3z/MvKyR/dv/RhARKg0EZXeixM3P9LuAbwm3Sg13+ysZ+CF4AG15kHc5+H7UQ ovnxBXngCme7Ugifn+6a3td4SnVpICnwqSurSSrZCXZ3X5JScVyP8h9fX6sjZDO49S0g u05H7tumVDa8TwbmLNaiCICLKy0nDS3i6a1Ur6H1zUAb1krrpJj7z1vL1B7wQEud54M4 fhFw==; 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=wM3+sHSm; 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 le12-20020a170907170c00b00a59bedc2204si1203680ejc.1022.2024.05.05.09.47.03; Sun, 05 May 2024 09:47:03 -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=wM3+sHSm; 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 9E3BC68D5D3; Sun, 5 May 2024 19:46:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-221.mail.qq.com (out203-205-221-221.mail.qq.com [203.205.221.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DED968D5D3 for ; Sun, 5 May 2024 19:45:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714927545; bh=8qcvgCiZDfzxbIlm0YqRVNIfHA4CYMN8+cLPMSBHeA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wM3+sHSmHpVYHp1CLV7LEEu4NAD7tcRTFBm/M09KYz7M01pAqf9ETCtl3wclk116f zwvR6Bu3zQ8mNTO6sr/ogLJ7kcsUmCYYwSmiZAmJX3ZoQtTaf2Y7anTLX7ZdtwtnB6 +N2NzIShOvJLYi3DUxZxQOkrWM6zvR9dMpQl3drw= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id B65A42EA; Mon, 06 May 2024 00:45:37 +0800 X-QQ-mid: xmsmtpt1714927544t5faks814 Message-ID: X-QQ-XMAILINFO: MWxZUaxBV+u3L+OGm+gy9GZP6AkHRxFQnnVhOk7WIf65bWUtBaSzwCvYkpHM39 XLmmZqHybtzdbB3AkCoqctjGA0/ZqYP0omr819ppCKjuagBSdaA2NkvwImK8752sbAN7EXc7wfwC buKbpVfbLI0g6GWRVgbDLocqjvINdVu0fp/cMYldRIb3MMSCwU2BPAvfb9IudsaEnR/aS+ZoIKsY Q0i7lADNk1P/IpnfG+Xoe99bIRMetwKot6XthLnOaNc4pEXwe7U9w2MTLAF2RTq9btYyKbJPCcUu UoJK5fMMNeCE0Pr81G1V1J3qvtjfO2nDadaKoXG7N1ejlOn0HFM5Y/HkfEFNSSE5jdjEWWEL44iQ b/pmzwm7P5vr6Ot1nvlK3dqyAK+MKl483Pdm9wtgJFRlKI2MGbAbbGq539/lh4iS21xieYdjMy50 KIF6M6hEZxJlnaouBFPEy6+tLBICrJn53z3dZkReXBsbwkt6ucg7S/bnvBKFhWgDMWlWINl4OuFf brNDmG9b6uvE7HZqBRRCydFlm33A9SqtFsxDxPWxvwWu6ZYW7rgPdbjJ6K0iziP1aUeLVZdlUMiO nWmYHIjZasX4IviuvcI0oF4Pj3wPErsKTjRxSJ7DzEzEIlKhs8r/lEGp+1DWjEMIZpCjyeZtUDBm y8Rq8dDEvsYtB6nhEDpjcDeClx9xmvQPTl7BUJ5XdYJTUuttWU2KtWHeFib0lcbz8KuxP7DlQNJs UmQwXsPl2IT06hFWw11hykMeDIHY+tQQFP8KDik5V3ku64uFKBQj4CfS4EK1xIWlKe8jXdLK9hk4 0GDtYCm/YCQcTmF08W0I63OIVCfeZC+XWtcMpPuzk+2Qy2Fquwb/0/hBix6p920CQNlgtS6gTVDk +1pIzREmrgD6KFZf1H9LaDfuyqSo51kUUDHEAwGdBeON2noo+DuzRTIS9OMwS0TqVpz/s7ZZru X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 00:45:35 +0800 X-OQ-MSGID: <20240505164536.872683-9-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240505164536.872683-1-uk7b@foxmail.com> References: <20240505164536.872683-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] 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: MnjlCMwtcXzW From: sunyuechi C908: vp8_loop_filter8uv_inner_v_c: 738.2 vp8_loop_filter8uv_inner_v_rvv_i32: 455.2 vp8_loop_filter16y_inner_h_c: 685.0 vp8_loop_filter16y_inner_h_rvv_i32: 497.0 vp8_loop_filter16y_inner_v_c: 743.7 vp8_loop_filter16y_inner_v_rvv_i32: 295.7 --- libavcodec/riscv/vp8dsp_init.c | 4 ++ libavcodec/riscv/vp8dsp_rvv.S | 104 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 6037c86e19..4f38abba93 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -130,6 +130,10 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_rvv; } + c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_rvv; + c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_rvv; + c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_rvv; + c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_rvv; c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv; } diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index bef5f0ebdc..d7e8b6ae58 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -95,6 +95,13 @@ func ff_vp8_idct_dc_add4uv_rvv, zve32x 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 a f1 p0f2 q0f1 vsetvlstatic16 \len vsext.vf2 \q0f1, \a @@ -120,6 +127,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 @@ -128,9 +145,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 // vp8_simple_limit(dst + i, stride, flim) @@ -142,6 +177,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 @@ -166,6 +220,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 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 + 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 func ff_vp8_v_loop_filter16_simple_rvv, zve32x @@ -180,6 +265,25 @@ func ff_vp8_h_loop_filter16_simple_rvv, zve32x ret endfunc +func ff_vp8_h_loop_filter16_inner_rvv, zve32x + vsetvlstatic8 16 + filter 16 h 1 1 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_v_loop_filter16_inner_rvv, zve32x + vsetvlstatic8 16 + filter 16 v 1 1 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_inner_rvv, zve32x + vsetvlstatic8 8 + filter 8 v 1 1 a0 a2 a3 a4 a5 + filter 8 v 1 1 a1 a2 a3 a4 a5 + ret +endfunc + .macro bilin_h_load dst len vsetvlstatic8 \len + 1 vle8.v \dst, (a2)