From patchwork Tue May 7 16:54:10 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: 48640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c99:b0:1af:836d:81b3 with SMTP id mj25csp38880pzb; Tue, 7 May 2024 09:55:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWjvaFVlmFoOjfdRJMgT5Qs1BXK08zs3iS8H4J0Ekg6QoeNfw5cls4aY2GKkkAtYqGL0SIYhBo6JwcJ6VL60AhalvzSo9bC3HUHHw== X-Google-Smtp-Source: AGHT+IEMBN9SlZuLQIUitLkzMi3CsslSzny72EjZiLuDHwV2pdoeQu4IA19SlHy0zQqFhw/krWmV X-Received: by 2002:a17:906:3296:b0:a59:a3ef:21f9 with SMTP id a640c23a62f3a-a59fb9ce6e8mr2774766b.52.1715100950349; Tue, 07 May 2024 09:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715100950; cv=none; d=google.com; s=arc-20160816; b=OJqdlx+1hg7ICjDgah8H+QUw4UZOApmRB2qU3fsxxwURU3erXX4u+ZAhTKASJDBURV 7P+s0ziCgfCSV334OBwF0YihwXgKbSf96sc87bHmwXya5KCAzcDTmMML6Njuu7QDNVnS l+BE2jbV5zqejoqem64LnCqZ7yq5UYd22CvD6RgfK2eCKXz6If0jKtIDFNosDOcwWW85 jCYjwtggfJ0bC9dB7rGdpOylNsmiL5vgq8ciWTX/mg6ILIsAuQjkC1itL3+dhQNAUuIW encBCYJ4eb+ekDfG8696IzF/voKLaGM/71I107LEmXMbFheGKKYpnmRG5HYqwNOf+E5u UKQw== 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=BvpSyC1cCv5/PnCuNSlXvefwNwM+Urwyn9H+kfk2mk0=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=aG+81RzRWhR0cSpq34cSNij/mJtXjX03B6wIMGHNuUlwxHYtyQTWe7REPAMgTateJo KXNP/BqyOyDoUvMtgrTuuoaLMt7gR//RBJAHv4C5FMAdJ+bc5omNGMRLNyGNw2msPOxo SCvnogFEGoMxR6G3jXXx7q4z3NAKK7tdqzpFv3qM6P7hn64s9caly7AI8c0PYSya5ApR xrNSn5YQ1S7359tstWnFFiD46KKXQk+k90PtXqcnaZo9SKh97Wd4EAQ8fWN5EbzzYAZ+ p97Pmas9cuLNEaU0NhpkT54Il/Bpqdx19ECKLWQ6FAz4Pj2AQOb/DvP1QYr9a+rM/+j1 asVA==; 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=WdWY1m2M; 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 z24-20020a170906075800b00a59ea3280e2si975495ejb.852.2024.05.07.09.55.49; Tue, 07 May 2024 09:55: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=WdWY1m2M; 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 ABEA268D7D9; Tue, 7 May 2024 19:54:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 793F568D4FF for ; Tue, 7 May 2024 19:54:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715100871; bh=W5Fy/o1bsw1FcKe1AKhlWE4ThNZZ5rhC4JNZzh78098=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WdWY1m2MOzwUYh/j625+us071YMTYzPJzFM3euSi6XjRWYv0BKxBBHCu8Zu3HXmps oRjylVB6eqwW8lGsbcVzQV3OMPWn7Z5zmZhgwPWs1B3h39yvehh0s4DxT5qo4JWEEp KmkjpZjmVmwyZZj6d+5UPP7Bw/ui31wUXw9kEWy4= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id D99244C2; Wed, 08 May 2024 00:54:25 +0800 X-QQ-mid: xmsmtpt1715100870tkfunmpox Message-ID: X-QQ-XMAILINFO: OUrMHMu9XZHvIvoaXaVaIStSyfN8Em1/2IWIgAkFzIoHYFPwNlB9lzN36ciISS 8c1JeuTJxId2dOV4y/gQ8UWtNLW0r+MDtNIMKBvGqZAinAsGyqEkND8rfv0QQwcTT8xNA+li48+h QGnFZC9McUhaL7fTB8KYQ2rQ2iGMqzkdQMqOJ5qnrkcxuW1mhs7GVsLCKcq8CZJ90+4O/+ttxdDX 6ZL3HCndamhNY3AZbjtlKHHDd+c1mFh/jFlq3vW5GJKB3sT3lvyen8WQ1Pn091ZVxCnDNrHuMgzl pCO0mSX/Q9AXxUo7acIfsLHjgm7VUHmGdaJV/zsHs6aWSvFwDw+kGBfnH53KplMr7fAoJuI2Qk7Y 8PwIyzwm8np8lhJkUN2OljQ/4gQjbRJ2Ife1V/LaThIGFSgWpkRNDdJp5oM8G9lwP5rOqZyBFALj aVNTH/iHFtlr728aXzp/tD4fffk7GTmz8ZZFYniLw/byJJRd0Aq4h2F5Z0JZoqkWuSn29hqmL+xk TeibuWKWfYtUhxqdlcmgWY8vfZg+/jQ58Uu4992tO/AlBb5/yNWYdpW7VjM12JfJCaxabKS2K2zA DsScFwan6AO7BuPrZvVkCv3xLa8P7ge+rbebqsYZgiNXnBnd6yRJgViE4rpES1XZy4Kgc/wgi2NJ UwnRFycKl0IYlS14JnAJaDBKSmTXclgWWX6m4EiqwHmN7ZpCF0hQMzncAq7fd/9EWPD20k/mlFbf lE49u0U7UkJv/SbnIQCmrOorv+GLUVhtOVfKN5BVe2HDKU5jGfFpmLTsB1jj0Q+KMNnWn8uPltZr OLyH5Ljt6RY3kKY70zvNipS7KmFfm9xuUrATQ06QTuMIjnq9FdYtn0Nge5b27tbyvqPysHrxhptT FaPMZKg3T47P/PhPAdx6THii8UZ9Fq2LXne++g02mHDgtvOjzrsTE69cx/hZSLnA== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 May 2024 00:54:10 +0800 X-OQ-MSGID: <20240507165412.1306563-7-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240507165412.1306563-1-uk7b@foxmail.com> References: <20240507165412.1306563-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 7/9] lavc/vp8dsp: R-V V loop_filter_simple 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: NG72A7964hed From: sunyuechi C908: vp8_loop_filter_simple_h_c: 416.0 vp8_loop_filter_simple_h_rvv_i32: 187.5 vp8_loop_filter_simple_v_c: 429.7 vp8_loop_filter_simple_v_rvv_i32: 104.0 --- libavcodec/riscv/vp8dsp_init.c | 5 ++ libavcodec/riscv/vp8dsp_rvv.S | 85 ++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 463c8fa0a2..3acfe75d67 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -41,6 +41,8 @@ VP8_BILIN(16, rvv); VP8_BILIN(8, rvv); VP8_BILIN(4, rvv); +VP8_LF(rvv); + av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) { #if HAVE_RV @@ -126,6 +128,9 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) if (flags & AV_CPU_FLAG_RVB_ADDR) { c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_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; } #endif } diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index fba72f8c15..4260545c6d 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -94,6 +94,91 @@ func ff_vp8_idct_dc_add4uv_rvv, zve32x ret endfunc +.macro filter_fmin len a f1 p0f2 q0f1 + vsetvlstatic16 \len + vsext.vf2 \q0f1, \a + vmin.vx \p0f2, \q0f1, a7 + vmin.vx \q0f1, \q0f1, t3 + vadd.vi \p0f2, \p0f2, 3 + vadd.vi \q0f1, \q0f1, 4 + vsra.vi \p0f2, \p0f2, 3 + vsra.vi \f1, \q0f1, 3 + vadd.vv \p0f2, \p0f2, v8 + vsub.vv \q0f1, v16, \f1 + vmax.vx \p0f2, \p0f2, zero + vmax.vx \q0f1, \q0f1, zero +.endm + +.macro filter len type normal inner dst stride fE fI thresh +.ifc \type,v + slli a6, \stride, 1 + sub t2, \dst, a6 + add t4, \dst, \stride + sub t1, \dst, \stride + vle8.v v1, (t2) + vle8.v v11, (t4) + vle8.v v17, (t1) + vle8.v v22, (\dst) +.else + addi t1, \dst, -1 + addi a6, \dst, -2 + addi t4, \dst, 1 + vlse8.v v1, (a6), \stride + vlse8.v v11, (t4), \stride + vlse8.v v17, (t1), \stride + vlse8.v v22, (\dst), \stride +.endif + vwsubu.vv v12, v1, v11 // p1-q1 + vwsubu.vv v24, v22, v17 // q0-p0 + vnclip.wi v23, v12, 0 + vsetvlstatic16 \len + // vp8_simple_limit(dst + i, stride, flim) + li a7, 2 + vneg.v v18, v12 + vmax.vv v18, v18, v12 + vneg.v v8, v24 + vmax.vv v8, v8, v24 + vsrl.vi v18, v18, 1 + vmacc.vx v18, a7, v8 + vmsleu.vx v0, v18, \fE + + li t5, 3 + li a7, 124 + li t3, 123 + vsext.vf2 v4, v23 + vzext.vf2 v8, v17 // p0 + vzext.vf2 v16, v22 // q0 + vmul.vx v30, v24, t5 + vadd.vv v12, v30, v4 + vsetvlstatic8 \len + vnclip.wi v11, v12, 0 + filter_fmin \len v11 v24 v4 v6 + vsetvlstatic8 \len + vnclipu.wi v4, v4, 0 + vnclipu.wi v6, v6, 0 + +.ifc \type,v + vse8.v v4, (t1), v0.t + vse8.v v6, (\dst), v0.t +.else + vsse8.v v4, (t1), \stride, v0.t + vsse8.v v6, (\dst), \stride, v0.t +.endif + +.endm + +func ff_vp8_v_loop_filter16_simple_rvv, zve32x + vsetvlstatic8 16 + filter 16 v 0 0 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_h_loop_filter16_simple_rvv, zve32x + vsetvlstatic8 16 + filter 16 h 0 0 a0 a1 a2 a3 a4 + ret +endfunc + .macro bilin_load dst len type mn .ifc \type,v add t5, a2, a3