From patchwork Sat Apr 20 15:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 48193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1312701pzb; Sat, 20 Apr 2024 08:55:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlgl1VVkbZjix47q2NdJDAXeIHOXaf83qD9M/vUzP6YSoCcJzZJAeEj9OWF3RUUVWvN4o6efbqumyd3tRnXgwC3emV4+4GCZrMFg== X-Google-Smtp-Source: AGHT+IGAdMQ5660refkC69q35ZfewNwrznMVjxqZfdTtYe4QG+6EoOiyeiEXCRpNXCnWibV+qo+z X-Received: by 2002:a17:907:2088:b0:a52:54f2:6ae6 with SMTP id pv8-20020a170907208800b00a5254f26ae6mr3257916ejb.1.1713628541300; Sat, 20 Apr 2024 08:55:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713628541; cv=none; d=google.com; s=arc-20160816; b=s5A1Kxs5x4Atryy+6+lzxll2c7Hl5j/clwzFRMVETrmSPfRuKvUihVQrX9/UTgLoKv ihOWGxhG8dIURTfdyhjNLx0hH5PynK2JGbR308Q3N6QQ8z5NAa4ouB9+rfEDPgXMrOEN 45W6dgtiRHo8DGjErTMUjiIsn7Sb4BKlGG0Yfmnu7e6FDXh4fudHB7R4IU6r6UHkIX3g NQZEhxOvLEiB8z0ZvH//Y0WxDb/VHm1QOspYomH1itL3VBbc4qSGyi41ab74Uvflpie5 /p6EcdFGQ//aIjzWYeIg3t6iBETBMwu7EWBsEVtWsmgXX5nrfG9AB3TYNc00EgqS3Tas jPDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=EjSlwe12nZyFJdzeG6tdMfO0BdvwmanuzJhMi54ETSQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=m8V3McEFuJMZcgTCdQbHCKeemTVbdAtv6hvmH6hIS/0qeO9rc+vccxkk/ukqXhKqUP w/lfXqKO4AvRhSPvSVARiI5Z8UhhMnrEL+gO9xty/LT2061v8MspNAimOZrqchERrlSB goFPiLxaCtA70FKM7/08n6GsD2+Xny4m4Pe77COri+aqCrmDDxt4ZRBLtxFQ0XjKIbqn RU5VrKjMESUwK6ompW5/mYpBUiKcNNNczfEKn6539dVKDaPWVCmW+A7PDcLS/rVAzmDd riOYoYpry8QGJrCu20h6J2AW2NTfmAaXoyrf7fgG1MHXrr2ao1AT2gKgUfrVin/rbbAD rSkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="YwixF+/U"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qt21-20020a170906ecf500b00a525293fc34si3446702ejb.821.2024.04.20.08.55.40; Sat, 20 Apr 2024 08:55:41 -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=@gmail.com header.s=20230601 header.b="YwixF+/U"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F04468D1FA; Sat, 20 Apr 2024 18:55:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D62B68CAFB for ; Sat, 20 Apr 2024 18:55:30 +0300 (EEST) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-69b4043b7b3so18122856d6.1 for ; Sat, 20 Apr 2024 08:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713628529; x=1714233329; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=gzvWsSxqEtAowkSRrI5KTT2y9mmocZuqtphJB5+e22A=; b=YwixF+/USPQjCT++t+WgxpRPD4YqPOVH9DvQek6/Er+kTegNFoI1Ih+dCHe7uC2haq Bqh9gL03kLbGF9ocNxljXQWBjBYunmvf+WXxpX2Txbq/6Sy0ID5kMKUUhjy1HOzc9Iq/ hJH4PZuXv9JqHL1fxvFMnftxr8KuCh03MpR0OkmmlQrzkv+LihuUWyIvJsF7Xq4VdLq0 Ibjvzn2nb3AQG2pHxwbltD2u4kLXRyi+sX9vAlGOF2p6Mq8qU1QoDmO2v0mJh7xs8ZDo o6RYKjMMC02TARFQO3NC/UbSLUnf+jrQxju1oHrbqRESVVM9IrmWvSaMnusmuosNQbPm d9Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713628529; x=1714233329; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gzvWsSxqEtAowkSRrI5KTT2y9mmocZuqtphJB5+e22A=; b=g0cOabmXHd1/knkrk5S//9jfS3zbzxd7JBEK1+o6liP385FmpDQixYNYYkQJ/ft/ZO Oxrow2d0EmlXsZDGzhScdtYME82z0xmJ0eeobyWu8DRwuDpZwaRvWFflr2trql9ckS2F vBYv7e5rZ0Y3kdFraJNkVENXlhyPKMg53/NzhkpBGpLIrRI3wmU9d9g7JdMvTgsYVPDK oF1RBh+eJsmGaMM21c+VCwVumfL1Oomjf1hV029mhQ5bjDnOqP67PWi1leSk4m/Lyu9x XCAMaaIQFb1DfXuV7fStIH38eEb32vD0ybhPwPxW5bijIdlou0XTlj7t3Mmc03TIB0iB 1raw== X-Gm-Message-State: AOJu0Yx1ur/tECvf5gWjVkk8/9K8gf0NNf5DuHq55NaLonAxMwcKiIg/ A0oYO/jYD1s0hBxtAmK+T5UjaTWukebpqVIH4PISc2u1QSQ1dlbrr/8hYecd9k/eCHMulUa1f0z w6q5/aUGqHu4IHO1pw56MU25lD0ZNyg== X-Received: by 2002:ad4:4e4b:0:b0:69b:58f8:c332 with SMTP id eb11-20020ad44e4b000000b0069b58f8c332mr5186982qvb.19.1713628528615; Sat, 20 Apr 2024 08:55:28 -0700 (PDT) MIME-Version: 1.0 From: flow gg Date: Sat, 20 Apr 2024 23:55:17 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 1/3] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RNJIqJBKy70x From 2f516e0236bd84d78ce6fd7e55c4b1a3c9d99baa Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Sat, 20 Apr 2024 23:32:10 +0800 Subject: [PATCH 1/3] lavc/vp8dsp: R-V V loop_filter_simple 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 | 105 +++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 2dd583d079..46ca71ed04 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -38,6 +38,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_RVV @@ -120,6 +122,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 ba644f0f47..2eadfc5766 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -72,6 +72,111 @@ func ff_vp8_idct_dc_add4uv_rvv, zve32x ret endfunc +.macro filter_fmin len a f1 p0f2 q0f1 +.ifc \len,16 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e16, m1, ta, ma +.endif + 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 + +.ifc \len,16 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e16, m1, ta, ma +.endif + + // 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 + +.ifc \len,16 + vsetvli zero, zero, e8, m1, ta, ma +.else + vsetvli zero, zero, e8, mf2, ta, ma +.endif + vnclip.wi v11, v12, 0 + filter_fmin \len v11 v24 v4 v6 + +.ifc \len,16 + vsetvli zero, zero, e8, m1, ta, ma +.else + vsetvli zero, zero, e8, mf2, ta, ma +.endif + 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 + vsetivli zero, 16, e8, m1, ta, ma + filter 16 v 0 0 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_h_loop_filter16_simple_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + filter 16 h 0 0 a0 a1 a2 a3 a4 + ret +endfunc + .macro put_vp8_pixels 1: addi a4, a4, -1 -- 2.44.0 From patchwork Sat Apr 20 15:55:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 48194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1312783pzb; Sat, 20 Apr 2024 08:55:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkwGOrVVkmdEldw+OaAh/cEst2vpyNciXN8gtgTuz+f4+eMTaGfHhnSiE2h4EDs6RHOV1L0CABvHWhbxWfRMZnEpmsmlhHvzTjDw== X-Google-Smtp-Source: AGHT+IETGysDnGMlXn0LGPV9pj0G0selDMwnl4M3r4KcJiS2Mi9JCn3KbS+WwENboeJcmC1HP3oM X-Received: by 2002:a05:6402:3da:b0:571:ba0f:fb8a with SMTP id t26-20020a05640203da00b00571ba0ffb8amr7503325edw.1.1713628555757; Sat, 20 Apr 2024 08:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713628555; cv=none; d=google.com; s=arc-20160816; b=kCXH+cp3zXHiZ90nlIx37ZnEfinxlVZR8PNZlWnQzbnFOoIkTrI/n4d2K0+j+WnotB +Lr4JqlAJCWADn3GWO5oB1NYAmlZg+1yT1exSZ2kDvNtS27rRDhePBNiLgCNj6sLgAeG bXWu6QQY1pqBwLsF9mHJqrlNuX50f+bZMcYbH2c1c4g7vn/naJkITn++kiYEz3yQJNh5 0u0lE2MZcr0Jg6sKZ0MdFi+MtRTCnGH1QPqzrw3Bb5sPTYv0hw1UoKJFvQ8fHZnJBd8g 2w3Ws35dnuUjV4SwRF3AEk8dW0bAw4W4vCTaEadceOwa5t+Xxan0vFiPoOVT5lzA2Wer Qniw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=W5cOPTL89NqVLV7oE6gxkAbr+y7S3R8hZwI1DbOjaGQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Ou2T5rDdGn1dkDuYJ1SUngIZCn017+gH1EVX5ZTpWSuu18V6BxSLjfWBXp+mp7PUbE 0yg0A0nUB5veoyS6VhWSDdWf57oGyjqNBu1vfvBMcog6o5EKQDSsk33ka5VSYWrbrlJQ 2/rKe2Igt8KyylJvX3/4/kaTI8lihq0AgbbDl/hSI4xo30UnbswqBBCqBDevBJaLY9Go /Y3xJbH51QagENapsneftLhWFpU9Ik31ADCtaGY1v7myxukqd+JDoPCTKM2YGz3CUnjq 54GAuPH1gX4LQXmUOh3+B5ZHW/+3hNsl3wNeizuSZdNi//n81XCDUkdkWmfslVRuOCG6 j4iA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Obdzv8w/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y12-20020a50e60c000000b0056fffc4c19esi3529853edm.165.2024.04.20.08.55.55; Sat, 20 Apr 2024 08:55:55 -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=@gmail.com header.s=20230601 header.b="Obdzv8w/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE7DB68D197; Sat, 20 Apr 2024 18:55:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4312668D197 for ; Sat, 20 Apr 2024 18:55:46 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-78f05b62602so196865885a.0 for ; Sat, 20 Apr 2024 08:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713628544; x=1714233344; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Ax2GeK1IODor/W4om+SMXwtTMHkxDhI0iGbJncZanJM=; b=Obdzv8w/zay+zVr3anBZA3wkTauVCpeK2fkryx94FIynCqzq5CbKwHaw90YA+OzIVb OoQdjSTkbQfOhejyMFME5Si/CNYotyvH9pBRSwtqpDQ8QhwPmhQ35Ml1rl083dt+Jvfm VxJd+Wo+xOol8d2hmKlLdSzIuvqfQES5Lxoo8D+Yt4c72ku1VQ777XexZD+IuWmSFpzZ yA11SzVX+SaMy2oL4AqrReSypR57Gb3O8GZUmoMNBUWzcNTpIzmsJBH6MvQM2gfoaxio +f7gL1hKuLejASj6K6DhSLQuwWzsa6XPMGcfTt/f8h/VlMvc88EA5bhmOiJCBp6LZRfo KgXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713628544; x=1714233344; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ax2GeK1IODor/W4om+SMXwtTMHkxDhI0iGbJncZanJM=; b=CGLpwz+iqJstnOm2PDNpCDDWab8ZZuh4s3lSW9hjNAf7EUk2LkBzIILV78t0o4n6As EtIKm8HNFc7Lp6LgB/Tgq0INCIZc7RDU4ln6MZrv6dn5zsoyo9vhkHdxC8QxwEFrkRrm jdmZO7ohBpdyCiFLPWUZkJQlG3s4diCOtui8CAlTvw/4gpa3IhwHB/hCusFLO8hia76O /ErkhTDtC+RoALJJqsxAUyLtF3K2ECF3ie6Jk4e3uECq9nupFYYIXxXqF2kJYl2/6bFD zSvzm7WKdUcEAbPrcUoU9Rsyh9rgBvuLjR36L7ogmcUg8WkqR4z3PjII414OpL7aSybQ msFw== X-Gm-Message-State: AOJu0YznqA6vZIsGvUJyVJYBG68JSCnrcGJ5nqcKe/Bkl57ubUCI2O23 8baJ2ovo4T37XALc+7wig+0PLhqDkhBu58XK3ircVXuXF4Lc/7JW72/50TJSkPGz5he/bttR2eA m3dhH0NwyTf14Z9tVqFsNYFmUCCRuOA== X-Received: by 2002:a0c:f6cc:0:b0:69b:e95e:cdfc with SMTP id d12-20020a0cf6cc000000b0069be95ecdfcmr6078996qvo.34.1713628544645; Sat, 20 Apr 2024 08:55:44 -0700 (PDT) MIME-Version: 1.0 From: flow gg Date: Sat, 20 Apr 2024 23:55:33 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 2/3] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MP92t9Y98Jhg From c033ab8d30135dc02b09b1747c0761baefdcbb4a Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Sat, 20 Apr 2024 23:13:07 +0800 Subject: [PATCH 2/3] lavc/vp8dsp: R-V V loop_filter_inner 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 | 110 +++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 46ca71ed04..aa95021df5 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -123,6 +123,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 2eadfc5766..f10e269d9d 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -72,6 +72,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 .ifc \len,16 vsetvli zero, zero, e16, m2, ta, ma @@ -101,6 +108,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 @@ -109,9 +126,28 @@ 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 .ifc \len,16 @@ -130,6 +166,26 @@ endfunc 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 li t3, 123 @@ -163,8 +219,62 @@ 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 +.ifc \len,16 + vsetvli zero, zero, e8, m1, ta, ma +.else + vsetvli zero, zero, e8, mf2, ta, ma +.endif + 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_h_loop_filter16_inner_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + filter 16 h 1 1 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_v_loop_filter16_inner_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + filter 16 v 1 1 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_inner_rvv, zve32x + vsetivli zero, 8, e8, mf2, ta, ma + filter 8 v 1 1 a0 a2 a3 a4 a5 + filter 8 v 1 1 a1 a2 a3 a4 a5 + ret +endfunc + func ff_vp8_v_loop_filter16_simple_rvv, zve32x vsetivli zero, 16, e8, m1, ta, ma filter 16 v 0 0 a0 a1 a2 a3 a4 -- 2.44.0 From patchwork Sat Apr 20 15:55:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 48195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1312873pzb; Sat, 20 Apr 2024 08:56:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyzrlilGkRz2sCgolIF1qMypR42H3+4gktUU21MaMKtXRi+Vz0zf2+m6OnNUO4Ip/TsNp/+6PqqDA8nRFhZaMRiP5i6tIvv4/ztg== X-Google-Smtp-Source: AGHT+IEoqNpu/J882gsgtaEPVcZbW+NKyKXxul6zIjfJ6rQbPPcPsvtcsdnHqhE8EyOrJwTHUPRz X-Received: by 2002:a19:e058:0:b0:518:ccf4:bd0e with SMTP id g24-20020a19e058000000b00518ccf4bd0emr3498199lfj.3.1713628572643; Sat, 20 Apr 2024 08:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713628572; cv=none; d=google.com; s=arc-20160816; b=hgqFpt1IOFvIpfcps1xliMcxyRPa1YcpRCmnrBb6qUgDWabUS9HZmAS0NEqSmQS+Hy G6cy1sGYc5gkvARKN7Nbsf3icYoaKwfWLbIlk1xAwXjNMhcf1ITc0i/4PT8hms9XLTzt yO61nE4vg5OntCYA2FPxVmM7nCfDs2tnvMMKZzvou6QbSqrNtQCa1hAPm8L22D+/XtD4 MJpWWBYLDooc9RVjonu/tZ3QOI+Bztp2z4SfktBGM9Cq4PivHvLPsYuxPd6YiGEsXXhK Aa7jIgP37k7e2+dX3wc/g1kFGV3VD5XNjdYQmTjDtKzrmqSoYoTLbjQbZFxXyRwfDWVI 5R6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=0I8Vbge/M2a3/3gP/InjWetqtZajyVRjj3BERMV185M=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YB3ntasAeDEYZAWrSEFsJBlkOtlZ0cXhTE3nU8BP0NCYQDcUuqXvKKpipusUIOvFNz yQoji6fKkMcZTiM6wpk3JYcpK7GvXTCb+TIObHSCbH947sxDizcysTaoiCisneAuNZf4 0baEOsd/c8g36U8botcD3BypVpIAduQl1FFf2Z/wyEmV95h1FaC4JgizvGGdHn5mSBjc KD5U92eFrVmjV4esUx3LvOUS4tBcyYGHh0WGyiR9lPx1A8G+bv3sLqXSUGnRN17IzIic kNkkI1GCwdoJWdTyjMt6tsMBnxA0kJbUhEhDndEU4qBnC7lOl7N1GtXo5hRaqftegXLd hzJw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=RuIIlzZW; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k2-20020a170906578200b00a51a11372a2si3547310ejq.301.2024.04.20.08.56.12; Sat, 20 Apr 2024 08:56:12 -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=@gmail.com header.s=20230601 header.b=RuIIlzZW; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E627C68D220; Sat, 20 Apr 2024 18:56:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4ACCF688189 for ; Sat, 20 Apr 2024 18:56:03 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-437a660c94fso17749351cf.1 for ; Sat, 20 Apr 2024 08:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713628561; x=1714233361; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=4Mmif4MIq08tthJf//mUFz8WcBK8z7kfjXN8TgS2MlY=; b=RuIIlzZW3PHLlXJ83SZxqZvrDtl9Nhp19nqFY0NjwsimC6QHhos62UV3302KN6HRdq TlGLfto/UmgaLuQvX0ArCmMEetsWoOlBxqLJHMjewvoum6PBSm2WCVizLumQQqlDkL8n hyfvgleEvhlZwMJ8T5YmySizaua6xHnqqwgB0KOOzjAvhHdsfaIDj6NEcOtOfreVmeaO wPJ+rZLqmmUzwH+ESBds93bJxK07OqXOQr/gVyraDSCTpAORe0VO24pqSMTpYS6Pz/jr ANQ3v3cNO7R+0+CmoO9/zCDijx0tnqDo2SwSoWGV6Itf0G1aXJ4BY53Fw5yh8gJykZak r5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713628561; x=1714233361; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4Mmif4MIq08tthJf//mUFz8WcBK8z7kfjXN8TgS2MlY=; b=EiSHr9zEbxmIiE/RHAg+FqMtd8+KxYPeTP3OvEoT5Tg9JEH7L5RRv7jXbcoC27Xmpz 0Wr98zafJP8KW2lSxgUq0LQN1mBBMe5WEV2qBZ2t9dS/JsBLvIwyYXCzFhpwg8AG4fzh ssNm5InUROXABU2zqS8Cx83tq5MxKRp0qQKZ5XqKY96UbCF3h4QIjTmPjr3OnOOxxkpM q/vdJmdvyAAnUVy3ODC76VBo1lEQ/zvtZrExNsQJCxHCbDLfBWdvcpJT8seXdSfz9xYM Ih36vuq9GgD6n+ZGWtfZ8igvXlDU5I0ivHrBWQvcGPYOacDpHHNKDfRp3JuC54Wjo/Q9 rgQQ== X-Gm-Message-State: AOJu0Yze93txdPjb84MX9Ew3QhOs28kJg1Xg8iM+wtDnaSVg4yBY55fF vBWsELkRQxe+I76KzA1+X8aXuD+r9lMqmMQnn9gZi388sVWCv44XD3TWyO12zp5bSt4fyK/nuXx IOTaxCZmHX1Fk5mflXVNv/6SVSMRaug== X-Received: by 2002:ad4:4dca:0:b0:69b:7b95:8ef1 with SMTP id cw10-20020ad44dca000000b0069b7b958ef1mr5615791qvb.22.1713628561677; Sat, 20 Apr 2024 08:56:01 -0700 (PDT) MIME-Version: 1.0 From: flow gg Date: Sat, 20 Apr 2024 23:55:50 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vp8dsp: R-V V loop_filter 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: z/Z27F/V1baE From cff79c9500b94f4c0abdd9cd68c91cc736366c78 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Sat, 20 Apr 2024 23:26:58 +0800 Subject: [PATCH 3/3] lavc/vp8dsp: R-V V loop_filter C908: vp8_loop_filter8uv_v_c: 745.5 vp8_loop_filter8uv_v_rvv_i32: 467.2 vp8_loop_filter16y_h_c: 674.2 vp8_loop_filter16y_h_rvv_i32: 553.0 vp8_loop_filter16y_v_c: 732.7 vp8_loop_filter16y_v_rvv_i32: 324.5 --- libavcodec/riscv/vp8dsp_init.c | 4 +++ libavcodec/riscv/vp8dsp_rvv.S | 63 ++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index aa95021df5..597e6acec8 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -123,6 +123,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 = ff_vp8_v_loop_filter16_rvv; + c->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_rvv; + c->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_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; diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index f10e269d9d..af28ea5258 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -229,6 +229,39 @@ endfunc vsra.vi v24, v24, 1 // (f1 + 1) >> 1; vadd.vv v8, v18, v24 vsub.vv v10, v20, v24 + .else + li t5, 27 + li t3, 9 + li a7, 18 + vwmul.vx v2, v11, t5 + vwmul.vx v6, v11, t3 + vwmul.vx v4, v11, a7 + +.ifc \len,16 + vsetvli zero, zero, e16, m2, ta, ma +.else + vsetvli zero, zero, e16, m1, ta, ma +.endif + + li a7, 63 + vzext.vf2 v14, v15 // p2 + vzext.vf2 v24, v10 // q2 + vadd.vx v2, v2, a7 + vadd.vx v4, v4, a7 + vadd.vx v6, v6, a7 + vsra.vi v2, v2, 7 // a0 + vsra.vi v12, v4, 7 // a1 + vsra.vi v6, v6, 7 // a2 + vadd.vv v14, v14, v6 // p2 + a2 + vsub.vv v22, v24, v6 // q2 - a2 + vsub.vv v10, v20, v12 // q1 - a1 + vadd.vv v4, v8, v2 // p0 + a0 + vsub.vv v6, v16, v2 // q0 - a0 + vadd.vv v8, v12, v18 // a1 + p1 + vmax.vx v4, v4, zero + vmax.vx v6, v6, zero + vmax.vx v14, v14, zero + vmax.vx v16, v22, zero .endif vmax.vx v8, v8, zero @@ -253,6 +286,17 @@ endfunc vsse8.v v6, (a6), \stride, v0.t vsse8.v v7, (t4), \stride, v0.t .endif + .if !\inner + vnclipu.wi v14, v14, 0 + vnclipu.wi v16, v16, 0 + .ifc \type,v + vse8.v v14, (t0), v0.t + vse8.v v16, (t6), v0.t + .else + vsse8.v v14, (t0), \stride, v0.t + vsse8.v v16, (t6), \stride, v0.t + .endif + .endif .endif .endm @@ -275,6 +319,25 @@ func ff_vp8_v_loop_filter8uv_inner_rvv, zve32x ret endfunc +func ff_vp8_v_loop_filter16_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + filter 16 v 1 0 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_h_loop_filter16_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + filter 16 h 1 0 a0 a1 a2 a3 a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_rvv, zve32x + vsetivli zero, 8, e8, mf2, ta, ma + filter 8 v 1 0 a0 a2 a3 a4 a5 + filter 8 v 1 0 a1 a2 a3 a4 a5 + ret +endfunc + func ff_vp8_v_loop_filter16_simple_rvv, zve32x vsetivli zero, 16, e8, m1, ta, ma filter 16 v 0 0 a0 a1 a2 a3 a4 -- 2.44.0