From patchwork Mon May 6 03:38:07 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: 48567 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1152705pzb; Sun, 5 May 2024 20:39:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9P3Tb7XHLVqrrZ1v0RQ9FHeSydXDOecvPUeXb/V8gkSKxwbL52b3sQziuH5hiz3ucGBGOpwXlrtRCSQ/ddd9FtnqKbQisd2L4fQ== X-Google-Smtp-Source: AGHT+IH81fqRvXkdPLofpDtk6rWfOnFHBZAQStErdLKLX28lh1L94h+0MLOQCe2TNUc5IOyU0W+9 X-Received: by 2002:a17:906:5fd9:b0:a59:bc75:5000 with SMTP id k25-20020a1709065fd900b00a59bc755000mr2217732ejv.12.1714966762941; Sun, 05 May 2024 20:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714966762; cv=none; d=google.com; s=arc-20160816; b=PEUCGAhMPChF0rH9uWzByZ68PAjXQxDiAIykchl+DA//LiBIe5IczvMLuuS4dF4wo0 dvhwhczHJUqjVW8uLTVWqrQvDwFsFAmSBtz0KkbHiNIzmobB1WvFyMRXvF+GZu3oGg3v I5Oqt0HkYKTBGVjG9b5FPZFtRfleUmTlb1gW/O7ndQvEYqvgcUQXpaLkcEB/Zh2P8BTh /2j+q4azEdw8LmGypA1cP9ohgU6qOjER/ySQ0gjECQtjZtJoLfVvrcZ1TPVRfV7IWS+N YSUanwpcqS2cktlkKwUZYsfOPFlbYQkkYHeJ+/SYqo5YaUzNxSBMx9LMpI8m5C2voVI+ 5V5A== 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=4PVqwXJ6hs7wDjqPbRfE3dmo6/JvCCndEczUfNoS+Mc=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=hq7GmBiOqiv0oYT5EY5vP+GGrrZtT2IvxegbhSu9wvcJMgItClsrfMVTaIDv7JF/Ga LUto+pNzwvgLorrMTxRlbQrryRAaqiO7qoOUjs54hGJUN3FwGE6wq6aUjxjEfEUtOd7q UJoehgAw96a+6ubD678iUpM/eVgAq0T62LTaMUHhxWVaYqYA2hZyAneAw0eb2b2LbOrv U5kp0dOp7jn12Oq6aIcehtuaTu9EALV2ARy8nlKrNdfVGLDCyy++pXP13/HW8Psmj3UL qgopeV72UFh5hEaiCQpUMzWLaAjdtKNeieyBWgOWZ7NbUq11eKExoZUyMJ5okx6L9cqy H1Lw==; 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="R4/cwT4q"; 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 lx16-20020a170906af1000b00a59aaf102cbsi2363299ejb.743.2024.05.05.20.39.22; Sun, 05 May 2024 20:39:22 -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="R4/cwT4q"; 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 B47C468D607; Mon, 6 May 2024 06:38:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FB7668D587 for ; Mon, 6 May 2024 06:38:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714966699; bh=4Ma67yI8jZ4T2ePP3zNktb5NpbYrDRocVA+3roBCrQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=R4/cwT4q1QzEZsFtxoJPk2cDFgihiHongMoPLx2+O1Q+l9eoXHePcBR+l3WzAaccA wVXzFcU2VqDzsZwVu4gdr44fp2vmgsTtKFjSSOEF71I+BEj7MAQWCcI482LxZnLXH0 9+/SPWfjQX7Ya5yEIJa9ji87KQMmQv4cAxa6K+7o= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza15-1.qq.com (NewEsmtp) with SMTP id 98B83073; Mon, 06 May 2024 11:38:11 +0800 X-QQ-mid: xmsmtpt1714966698trm60sw5d Message-ID: X-QQ-XMAILINFO: N8AO27vo76JNmuquS6ojAYDvYW5haBsa3tymPraS661SNtTaIVLZ76wGEcwKzw ktEjFg1fiqyURP/tgULKWjNVWd5b5Mc+JaxxNJqCIX0n9yMG0kOQ/VGwb1Denq2wdasRf21VUO3a puZWfypXV43r/bNI9yHDNCuhR7ATTvUwqUUZM06jpcz197Fd1bpOvYROgDxddIc4kyYbwfcPJ36m liUbGpshsJJM//Jm3SepZM3EYJR4FpOzE7LkYsFo3wChO+4XorwySv4xSZMJqfJUhxMQSnepQpKt XSncgDXCpv/J3bn+Wdf9G0+NVDyPn0BxNbJ5ml24tXqIpBDncAnCsvqBRWXdaT7PgSFq5AXYmpPi BmLvox7c0y1EJE2gbU1hvi6FjOU9sxi/NAUwsg4oST8dA1bTxvQJ3qVE5XupgZZsXD+7MAS3C3ci txi/S8czQLkdKK8HapKEXhYVX6FQaqfVaf+6fwWB71bThwRbFzcE72sxFLDAPmXFJq3KTlavsDq8 TNto2qwvtc/j5nsxvRjCaHOUfyRqSDvf6oEEwqXuANg35XpbcrJMXxL6Wtl3jVzghaMeA4JqW8EX oT959PcsfuNAkTgB79I8d1dz6cZTvq73tLV3JJNNAC2SWxbFn3Wp/i5B7SeH+w/ImLjKAJnfxWs7 t68SnA2sVMDrRE7BSyQ5KlD5L0K+o4p0Em7lEHSds515h2MWL7LSUVH52Bpau8TKifl60HI8pwjw Pzzl8z/lTo6g5S7Wv9u0eij6bHBnLZvCxrspGWi06i4pzctlarBU6gcEMOzUDDN2t0ieTolg4BdA E1rpG7cepR8CIZtm/cdVw0lXOxOEDHedk1WxJLF2LBAwKQe//uzmdahUnjQWOWM2CdgApqgu0qEB O3KreI34/fWMpCiqHq0oT/YxY9wJ4mLHae11HkVYKQW14wCFcGN3K0DIibrg/Q69rLGjPnf0PxOQ E5e9S0inbnELEc4lPbsA== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 11:38:07 +0800 X-OQ-MSGID: <20240506033809.3790245-7-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506033809.3790245-1-uk7b@foxmail.com> References: <20240506033809.3790245-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: Nyyb9/MzCa4G 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 baa8152830..2ac79a3b77 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