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