From patchwork Tue Feb 6 15:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46079 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1492971pzh; Tue, 6 Feb 2024 07:55:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHV4q2fmGCe9dX53gJEN8ig8o7RSzPnePyx92rQcyfZh1fxixJPmmcY82lPVDsmcxb9Ckmf X-Received: by 2002:a17:907:778a:b0:a38:c78:d4c1 with SMTP id ky10-20020a170907778a00b00a380c78d4c1mr1643854ejc.5.1707234954509; Tue, 06 Feb 2024 07:55:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707234954; cv=none; d=google.com; s=arc-20160816; b=l3GRtjcxGFqyZfHfQJ6Kx2YPu/+3XSEnw+lyHkI87ROgJRbEQ0oAiqDsfiQRswLJe+ i0UVfhadNohokOHQFTnM2W4q7ZpiBMwmT1gEnqUk+p3qjZX67hBkb5Wqtcld0tlo2W4O DdeFHqkZdDdUz8PVvxBd7hN84DyyyTNpDULn1QDciKcQxDIkDwpZ+jEYZ56QP/DdheR6 /7wZldTnDCJalEn366jW/f5uhtkXXVhgCLEryKGfGjqvUJr4qmqDGmdz7eFGCWDbXgBP 0RhkL+OyN0bkBGxbbTP/+XxUquQEzo1v09ALxOzd5VIexqcwYLRKVvxz/mfNnjQrYFOK 3vUA== 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=nuWAtm9Y+dkimC5hIKfJqOqsnZrzfHqvpuT9v3F6upk=; fh=wC7FFo4WFL3YF2HH6X6DR7lcGXyRwxgSvaw9pAxufsQ=; b=fITRYA5MIqykafqahmAoVX2xiRMhdWlm2ykfXQ/h407aPqS1xhaV5cdcfjENOvyN9n pIMClJovUdNzuguD+cpi6m0oF9EXQxeroz3al8vQANPnjHSdfIuBMGUqmlaqs+5wBMe9 5zalQm+XCp1A8KXQhjJ+ncqhYSxC219m9TqFgwTFJqOWhcT9y0J0JrhrQD3ElZdE54Oj DfYYMgQjVJ/L/JFTehE63ctkwEQwSjD5wGQOg0vou001LaZMr6M9jNLqUQHnQasKaSiL 8bVBhw+t5aB8iTzRUB+XiSLNCneIahHMPpQ0OF5kN0ENar4KlZRtpkojo38VP05AjGJL 5ljA==; 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=au7hIVc5; 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 X-Forwarded-Encrypted: i=0; AJvYcCVsrPV5ne13ZPIDe5aIYqzmkTrKToGqp17/zWGTTDpeqGqvzzSLOkcqUWdLvGuLHHOLhJ7GYeHd/SrXTs55okebwrThoTIkujGtqN5aIoCbRXB5Qlb0sQdHDA6mfR2OBFS3NhpcFjokTF3u/KT7MRnMytsPlcCDWks/Da+pAMoaWqVMtEFxHYD7PGK0Js3EFkrPt3evq6NMysS7/aE8+06QfqyVbmI0xsh9G/dXe6jhkWQKkx+SXj3xAQck+0l/Wa3vPgg0hIQuFsjKof/Fj8mjFSqG+TBL9tefQF1pZW6VrMr8wk/BjWH3RKOTcT5PK7ZV8FIvDyYAJLm85B2oe1fM8mzmCkVy7XDc2QLEQ2kbgEtBiSDQxNm3yAuB7c2u0+JjbfYgKdEoG07hIOEvZRrmcw/Cmif6saINdsgicfmEiePOYM2ATcc+igkF8xmm4vlDFnAxBpZRKkJZTn6leReAbFPdW8AXV7uwg3q2CuLs5HiX6fNTTjlrcFwGrMw+trOIvgFKXoiZf68qiDK8qEJOqK8JhlVVKxUd/dq28ePGMR7EiEeFy48mjBX5r8PVfdQ7RDQbREWC9+iL2EOO5P8IgSihTghUNomyo23Cs5nFuVHzIgzb7zjAxw63C6yo0CQ8cuDZL1dl3L+S22j1/U+wPSyS8AZcgfPITTlOK65tkibfvGRs7kH337MuxEtZZn0Vi423ZWLEH97dyVczcSSrbENzQt1b3xzbdmtG1MaU9J2yJFI3ncCKQcgOk2+vvxdiOJ/uaBJDjie/gwdrZaO02oHPCFpmQiBQ+Udv5mbIhcs1pB5d1EBCPVcKWXhV18RaVVMw0qJCSy9mz28wI5VNUKqhVvlCh98dXnU5JoCSMJnao11Ubuc9hhIuNqP6K8ViuD/ySJi/I30IGe5Eor5hAZVowcFhngkkn3TzVQlY4fht4hCzCvdotSJ7lj+A+Wp6ET CNu694XiNF6mbMPvBB42rCJ+AbWU/4IOhV2qDV11u+M+CDHYcweIoohxCtYdAVjcICv314nr3xLQjI8zGd22kgVPR0vHME1vLLT4DdL5LxomrGg9XAGQSGhe5D3mlr1BkjUoA3iuPzflLSybFmyecK2PTHnCWbm7WBbGKbB2UG7P9BEVnIU5JgtjtnwauvOlktVVvZZr++nnB+0MxzZnx5s2WvgT0CVZbwqKCv4CfmISc5L3w+2v//YQ1U1d4h39TPUVWlw8QZqIDo2ZeQl5XO77yrPBewNDTB0nac3pTMwoKfHyo1tH6AxKC0JzR4j1SqfARSv6E52mdyUiFc+Y30HEEoUaF9rB6Dq46Oh/u/fXTIWmlgGEZgLsJzJO9V6lD9dHm1Bm6cJvx9KZr7VQsBox/gH3bhbUzo39pPhB3vPY3DIjw53ViSChXfrZIjSArfTdHZAJUMJSfdLlC8v2y6PuIj/E1F89sbOqG+ZUIukGCSwahYCJ7cnDU8lpJlBrjQEwEAIFiUDIttxhM1cpwmyQxIQxmvA9JP2SV64lAfIyjqKY3e9oZ8zuw91nPHgtKZK78PTIOZqQZFAPxF7MNw/rlNLueYuhwCoyI/DB5ZIneH7TEihNrZQcHkILXWb1Js76Tu Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z22-20020a170906241600b00a38055a71c6si1196135eja.632.2024.02.06.07.55.54; Tue, 06 Feb 2024 07:55:54 -0800 (PST) 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=au7hIVc5; 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 25F5F68CDBE; Tue, 6 Feb 2024 17:55:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC9BE68CADA for ; Tue, 6 Feb 2024 17:55:44 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6818f3cf006so27500776d6.2 for ; Tue, 06 Feb 2024 07:55:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707234943; x=1707839743; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Jsw8qYJnYEplyZ35u9etE45zI5gAueiJUjpgreEzzLM=; b=au7hIVc5K92OYjp5hn++eV7FnHEMnlunnuWsWgGIylElTr9DV5qxnnTuwEFSV8bYf4 HOs8VDUQyNFeXmOGY5Wj4vp44RAGQL4iuNhruSCl+jJ6g6T0bg4FMYHUq/nYOHg3UB4v 7HHaAKs74O0VwAIC7ZEBaXNsGOaQihY0fdTnyI9g+eHGRL7WVwoB8E9EzAuvRqLSRoUx EQBqJSx7l5aUaL/yd+Ovadhc8v19b0nA9vHRZHjeqd5hnhi/Eu954vNDgI7AYNOnXkqd HHIDykwQbtxAStl9B8T0SZHQh2pY0WTmscFiQIaIBHThZ/J5Alno6HolmAIVpN4TjIb5 cGSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234943; x=1707839743; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Jsw8qYJnYEplyZ35u9etE45zI5gAueiJUjpgreEzzLM=; b=W6l2BP9gGUBdTt4OJBR9tD7rwD0Zf7dGLCWKCGjhhi5Khz64stX1ediM6Al1RfqZgD Y1Lb4K59n1yapkIbw2CUMYXJPhb7vDKdr7yLVB7Vt0n7ghzk4BQ0rL97Jo6qcE9z3knK 38Fhtbk9I0F+QTUoMlOOuN6AsIJC0SgMIU2fnGjKSpyql11VRKKVbndJuCXPSBBImNIX hszytrH4XR167giqyzIDIB5TRvEpcnG0dtA+9RD9V93L6nPCltIDC+VpbmcdbTmAzYq+ 0YcNS+wX/yOACAVQQKFtcbNdT9q3bMpHhUtLqNSnYnM0UszxuOMl0/KzQa0RyJA6ZAAC 4pDQ== X-Gm-Message-State: AOJu0YxtlR7L63W7lmAoEzx99Q1vBwWWxohK2rFN8nOrvbNXQGhtm6jN vYkDpJmkSSWjWYcSaW3BnvQuvHfIK/FQKp0DBCy1Z/6sP4zXwsuHr520c/5fZZW4ltMZQej4loY HsBCvjN63ENBXAq0Xf9+zloF1a9aU3uYs X-Received: by 2002:a05:6214:2583:b0:68c:9637:3c79 with SMTP id fq3-20020a056214258300b0068c96373c79mr3205516qvb.30.1707234943256; Tue, 06 Feb 2024 07:55:43 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:55:32 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 1/7] lavc/me_cmp: R-V V pix_abs 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: MsFao7pVPQub From d4d6b3ea040f3f7997463b4452813bc75d1c9f9d Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Sat, 3 Feb 2024 10:58:13 +0800 Subject: [PATCH 1/7] lavc/me_cmp: R-V V pix_abs C908: pix_abs_0_0_c: 534.0 pix_abs_0_0_rvv_i32: 136.2 pix_abs_1_0_c: 287.7 pix_abs_1_0_rvv_i32: 125.2 sad_0_c: 534.0 sad_0_rvv_i32: 136.2 sad_1_c: 287.7 sad_1_rvv_i32: 125.2 --- libavcodec/me_cmp.c | 2 + libavcodec/me_cmp.h | 1 + libavcodec/riscv/Makefile | 2 + libavcodec/riscv/me_cmp_init.c | 46 +++++++++++++++++++++++ libavcodec/riscv/me_cmp_rvv.S | 67 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 libavcodec/riscv/me_cmp_init.c create mode 100644 libavcodec/riscv/me_cmp_rvv.S diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index fecd70d723..8f4b3d0ad5 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -1136,6 +1136,8 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_me_cmp_init_arm(c, avctx); #elif ARCH_PPC ff_me_cmp_init_ppc(c, avctx); +#elif ARCH_RISCV + ff_me_cmp_init_riscv(c, avctx); #elif ARCH_X86 ff_me_cmp_init_x86(c, avctx); #elif ARCH_MIPS diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h index aefd32a7dc..fee0ecb28e 100644 --- a/libavcodec/me_cmp.h +++ b/libavcodec/me_cmp.h @@ -86,6 +86,7 @@ void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_alpha(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_arm(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_ppc(MECmpContext *c, AVCodecContext *avctx); +void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_mips(MECmpContext *c, AVCodecContext *avctx); diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 97067558d8..dff8784102 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -41,6 +41,8 @@ OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_init.o RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o OBJS-$(CONFIG_LPC) += riscv/lpc_init.o RVV-OBJS-$(CONFIG_LPC) += riscv/lpc_rvv.o +OBJS-$(CONFIG_ME_CMP) += riscv/me_cmp_init.o +RVV-OBJS-$(CONFIG_ME_CMP) += riscv/me_cmp_rvv.o OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c new file mode 100644 index 0000000000..9228f74cfd --- /dev/null +++ b/libavcodec/riscv/me_cmp_init.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" +#include "libavcodec/me_cmp.h" +#include "libavcodec/mpegvideo.h" + +int ff_pix_abs16_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_pix_abs8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); + +av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { + c->pix_abs[0][0] = ff_pix_abs16_rvv; + c->sad[0] = ff_pix_abs16_rvv; + c->pix_abs[1][0] = ff_pix_abs8_rvv; + c->sad[1] = ff_pix_abs8_rvv; + } +#endif +} diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S new file mode 100644 index 0000000000..8dadf39bc7 --- /dev/null +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/riscv/asm.S" + +.macro pix_abs_ret + vsetivli zero, 1, e32, m1, ta, ma + vmv.x.s a0, v0 + ret +.endm + +func ff_pix_abs16_rvv, zve32x + vsetivli zero, 1, e32, m1, ta, ma + vmv.s.x v0, zero +1: + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m2, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc + +func ff_pix_abs8_rvv, zve32x + vsetivli zero, 1, e32, m1, ta, ma + vmv.s.x v0, zero +1: + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m1, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:55:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46080 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493131pzh; Tue, 6 Feb 2024 07:56:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHvUaUDRMyS6ldbYKCnpMRhgwT6HCz45C3JNTHZ2GfpJpVRsOIc5P/T2R//FZSFs8Pkmzl X-Received: by 2002:a17:906:1b4f:b0:a36:fc15:d724 with SMTP id p15-20020a1709061b4f00b00a36fc15d724mr2207926ejg.18.1707234968789; Tue, 06 Feb 2024 07:56:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707234968; cv=none; d=google.com; s=arc-20160816; b=Ugra2+canJss1HLJ8bL8eKJwZjZFEAjOQ0BG9kVi9VJGycqbdOl/rXtQNP0gnTyX0B cJCrd/5TX/zip5GClc+RCpD9K8iwCopWiKRoNHFhwLlMwyJUmVw9CWWYKCtMaUNj65e+ hLN3LhEpAtAn+cliWU6ADSksJ+lS5lwks2EicKH209SaQFjhGWnGKWT0Y8WETXCuKWah qci+cd8Ry/2lC5DCQ3jw/Z72twieDmbQixPDEW8s7LgBE8nHos28Ipd9kDRo3bO8zMWE MzPb6a3PWkA2hGWtoxkOlWTM++LFE87cxODMeZBG/Rk7kabkIBgcqqARiZN4FZXsdDRy znng== 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=c1H4g9N3UwM9bq//kSvqMPZO5lVKxNGB67dr4ItAbL0=; fh=TpNHkrt+ydmexK17lv/hoyfn6c1uDDjkp4KMZbOnjv4=; b=FilRCN87r8KmhikfP5UizbUPKHwMGqixQmSzqSYkDzy+W63lz+a9O7pYJeEVf3ljC5 QaEkeRdRCVWpelLv+LjlBWEOnAPmbAvTR0S4B8egpkXrZEW51RiTbi/iAeTQ/TUaK1DJ cjsu2PsLmyxqAn6rq6Xh+tWXoQ3g6zXCBmJy7WUvNGBQfKz1Iw6Bz1mzpprmYo3PrRJ6 crwUD3xp4l09udLRaeuspieJgsdFdq8rRH9hLhHwUfL5Ga1Wlt1bvdw2YBGk+YlPZf3c Ph4Vvmf7sgsBKmQn8aUewRh80b4Iq8Juym+nD8zgXpNRlAucfrRS8b7+FX1wwsd0w+5e x+pA==; 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=idG5ynzG; 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 X-Forwarded-Encrypted: i=0; AJvYcCXHdE3fgMtk2SqLnx6Fhf4XADH31m7mvVaJRhL+VYfdwXDw4NcFayEQtXjAl2/i+amCr2hPWm6CTXxn9DLt1DQyyaTFNIS5Sg5/Qx9k0gAW+aLWPwaYuvzkoi3iN55ppzL8jmqOHNmiAc2ZbAF4U/V7VHDeKmTXqGYm9oLHFv1pxARdRFh/Q1+t2aDeLyduyEK6+GGlFkP1dfUQh5tmDzuNbze03fZctNFGeqdEI8ifmppDHAD663FwvHDkU8iv2X7H9T0iktQARivcB0M8X9tVLQSRDwmHhK+hYM70FpwjnNE4TFZujOHNH8tfeDsuRNveSMXxA1Lh+DPOgQdtFmHEH1TThp84Mwwp5dGLoPQNeLRfLATYEYiHZAcY2MW6+PHE0LD2pCyCavfbm2ZQApSbytIKFCuooxh4kiaKPXGC0xzucaWQQxrIj2PG0W2swHl0B4FWjzLozwE+ylysTFrPmVr2Gf0AgDDq41UtzYmZkjudMgxrwLgzvbKHOMbVHuo3KaVs+63a219GC7YG2hRxPIjBnInt+88bHtwoVxNp+3ZoLX20+L25Ad/gdQJ82VW78FfVU6Bxgx/u1nfFfLNC62A9UxYjSRyFBtCgy9pfsCm3zeTNu4onNG+A2EgS3R/xz1VoTaCPba9xVh7DlP/RFqJ4UZZb+w8DjDSAH3DCfm7+1ypLfDiLB9AY+jJ28/v7/qlSPZ9+PnsEb5EbWpAChwt0NTyWtU99qTo+95pueJM8GfjfpJC8qNXrtt+7tA9BocJ/HFSu6lVHU0KeR3oaLdGYoDPRyDq8+iaK91E8iMer7EDqa65JI/GXsvCoTSvuVSRlH5lNp8KTHl3MIZjQsGRTgbFOBIkbaSSVFqM+gSR3fATJmHK7U/34E44COaDa2UPD6+K6NfkQxkkMF16AMLtg41JYewVIHz1+whaH2VIOgy/N8zJXO2GrvnOJOOL97n sy9MH18aHb6VXi2mjMW12Bnzdxf6hkT7oaQWqd6b5g3PuWQGt9R3Ci9PRzdRRbJ4lW6U+yX/8nPhqpW6pqJ5DDuNhiK02unbMw/JOpXjtR7GyhNnW5dIvrK5LNe5N2XZlisOD3i4m89dV8WY58dH1QKKrjzn3W+nEjwDJQfJ3BORpLawJT/hBcR9/mooVJ41drF/kr1G4KuB2zM7OUksnYrs8a+JRj3zgtqkYP1o/dTsl7juMIrkLmzSeo44V1SX0pQ/qG+pmtBWXeMvmsqDOVR7FX/H5Yr9AgH0cxwIMON0Ls68d9gNcB3IevB4j654aAIYkF2mdxIuqVSGSY6I+WL+MMZlEmtkc/Ng9ukHZTvzpt8/ha51VqV1YfkhuzueNZ9bkud1k92Lrsb2fY85eCJin/HOJbUM1bxni0VVNlmcgTryaBkGiTLKEKUu047QVZlpKDqRaMAfliaNy2d2lljVZNfnzQEqmp0beMgATgs2CGSvIbdrt4gOaNdwHYzSoXKsTAguPUT1Mwzj2GD6cQNY1nnl4zBKv7uS9DC/3POq8A7gzIdoucXlOF/uha2Tr4gS1sa/acImuiJrxgAM+VQXGm3M6H845LZM0LeJBJ8VIp3UNWt5/oEiiksbHgQPBr Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bq23-20020a170906d0d700b00a3828bc6d74si819400ejb.572.2024.02.06.07.56.08; Tue, 06 Feb 2024 07:56:08 -0800 (PST) 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=idG5ynzG; 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 3FF3468CC2B; Tue, 6 Feb 2024 17:56:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41B2968CC2B for ; Tue, 6 Feb 2024 17:56:00 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-68c4fb9e7ccso24210076d6.3 for ; Tue, 06 Feb 2024 07:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707234959; x=1707839759; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=b+rw21ypWQUAzsenZRkm4mQGDTu4Z47CuaACXni92IM=; b=idG5ynzGW5StXj/fQOAgOY1mMfCNomFTOHH1EYfiYm1YGU5oMruf92kS9FJRhHLJMs Ml9QaPVkNV78ombiX019ba4eIXJZdgMbztlyZvwuvB8DQETM8iUqtcTb2whxiH9B3e01 vhcA6CPwuK6AgYnCQrZo5suTCmaSbK/Py0h44SzifUdDtR423alyKl4SqEioNKOAcTOQ +qFz8YocchUvnPq8dQ4CZMxwtMG7wUaDUH5LpQyXIXtFT8LOlbpylVZ9jbWnZKFPNy+J lz+aybu4tMTVHFXMov3EEUgcjhYIwjbbZ1kLdDBN+3FVBlR5ig1eMqqSOVYBKHsNu9jd XM/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234959; x=1707839759; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=b+rw21ypWQUAzsenZRkm4mQGDTu4Z47CuaACXni92IM=; b=Ab0zJtyKY1Jjcbjld0CMNldX7ryT16StikyerGZHAF1A8SfKTi7ICrSUBmtOXDemTq CtP8X/ppsephFZS9tsqI54HP4mFLhzfVQpnYDY5AXGaIpMvmbWP90sD7kYHQrw/GqzGN tHel77UU+CWU01F2h4377slrG991wSRr2ZGD4O8Tyr+nrcc45Rl6cudUHnmRnXQDO/JH EE70hvK2FUBqO3/O3AMHE0d1fdinxrx+2Jz55iEauO3shORt6uWRwbiA8xW5vi5whFK0 r0FD9QIvAFT1R5C49d3c7aGPIq/sG5L50F1Yn3WE2UDPsudK3ddj7L4R73KEFm5E2DO1 lU1A== X-Gm-Message-State: AOJu0YxvDflQrmRpfchrmfviRdETSd+tKVhGqLaXWbTW5Iou4tTYz/Zp mz9ar/ldfJ381eyC3Hu3Y8sRB4FjwmaksXIXDTnZELCcI0bIl0NTovPFfKwcHuysOKtaZRudpvd YFnGY3QccCfZYJtHzqJMu3dNy3J4stGDz X-Received: by 2002:a05:6214:f01:b0:68c:a6ad:10cc with SMTP id gw1-20020a0562140f0100b0068ca6ad10ccmr4035885qvb.41.1707234958808; Tue, 06 Feb 2024 07:55:58 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:55:47 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 2/7] lavc/me_cmp: R-V V pix_abs_x2 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: tNBy+GfrG1Ny From ea0cf15e43c9a3e1b56c1a43d50f0701d42c7e9f Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 21:41:35 +0800 Subject: [PATCH 2/7] lavc/me_cmp: R-V V pix_abs_x2 C908: pix_abs_0_1_c: 767.0 pix_abs_0_1_rvv_i32: 196.2 pix_abs_1_1_c: 388.0 pix_abs_1_1_rvv_i32: 185.2 --- libavcodec/riscv/me_cmp_init.c | 6 ++++ libavcodec/riscv/me_cmp_rvv.S | 50 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 9228f74cfd..e46fb09c11 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -30,6 +30,10 @@ int ff_pix_abs16_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2 ptrdiff_t stride, int h); int ff_pix_abs8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs16_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_pix_abs8_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { @@ -41,6 +45,8 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->sad[0] = ff_pix_abs16_rvv; c->pix_abs[1][0] = ff_pix_abs8_rvv; c->sad[1] = ff_pix_abs8_rvv; + c->pix_abs[0][1] = ff_pix_abs16_x2_rvv; + c->pix_abs[1][1] = ff_pix_abs8_x2_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 8dadf39bc7..cc60219466 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -65,3 +65,53 @@ func ff_pix_abs8_rvv, zve32x pix_abs_ret endfunc + +func ff_pix_abs16_x2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + li t5, 1 + vmv.s.x v0, zero +1: + vsetivli zero, 17, e8, m2, tu, ma + vle8.v v12, (a2) + addi a4, a4, -1 + vslide1down.vx v24, v12, t5 + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m2, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc + +func ff_pix_abs8_x2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + li t5, 1 + vmv.s.x v0, zero +1: + vsetivli zero, 9, e8, m1, tu, ma + vle8.v v12, (a2) + addi a4, a4, -1 + vslide1down.vx v24, v12, t5 + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m1, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:56:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493294pzh; Tue, 6 Feb 2024 07:56:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVGK+ICvs1hKtKzFzHNN/IS7g2YF6Lde2EJ5NN8tSOQ1LO/JNgzJErtnNYv2BC4KRNmSiVaQbo5Hz8ttOONeYNtOzdgTMh5D9bDjA== X-Google-Smtp-Source: AGHT+IEr91nvn0jhxceH3+SuvQiyxtJy9v1AJl1IDrN8Lb1njN9gx3Wvbm6NgherC2Enk1IgFcsi X-Received: by 2002:aa7:c54b:0:b0:55f:8c5d:e55e with SMTP id s11-20020aa7c54b000000b0055f8c5de55emr1953261edr.26.1707234985733; Tue, 06 Feb 2024 07:56:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707234985; cv=none; d=google.com; s=arc-20160816; b=RdE1nYx4WY6TLNsEeNOk/tM0s3EXK6PZiixTvIJ8Z0a+caFfs13yDhxqdAvezZZU5P al+mStQ3DWTz6d6VblHBd7jeF9YMv815W2yEDKwDDJXZkC3I010Vqhz2NquzlNIo9J4Y +gBinfvOd4MIT6mKJz9B/b/UUWWNGsXkZuc1YZ3sVSegV+AsAP0aA9ALy/NNss6kx2Hv P11hkSv/ooOHYB7zGXftnairRWOjCTarLyoP9rjZMjsOGEid26wyve49HSh9hNw7pNNS Dx6vBccvvykdwmkBVaThKSmw/XSvzK61KwKSX/0DDL/GspoMGJZlmvvo4b0+D/zcLoof wBFA== 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=7c43yx6ow09f0VMAJok12EfBTfkINOg4rCWi28zG4mo=; fh=RMQvn5iFULidJQ9baw1gPa72f19kU/FchHoVCKr79q4=; b=t4XyE+Pz7ILLl0rEcah9ksAixwcB6ilMBrQiAaPqR+K/iuLbH+lQPZ1GYPt7tcR3W3 EHZq/jq4DCyufI6DbnEl+wByKH0e/QbhIfpbSUgmPMxj/dnxrCMIsAQXIiq1pzKCmNaa Mb5wGSQiDMpwfw/mYycFdx18xyfjoMWAFH4Hi+GdTlx7PxzBzxsx3NWD9luU8gIFwWuw BCFRzqp33M8zyThKCakYKneiFf4Fgfgor6V10KiqXBa/6uUh3uPGCg3iaUeO4aIBc+kq /BlbhP7Um8YZz3Um9ETHl4AsrIbP7P3F7d7ZedsniymaoQOxJ1st+FwrpBILT9SJDmyB fPwA==; 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=UqqIWS7Z; 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 X-Forwarded-Encrypted: i=0; AJvYcCUEHNUsfrGWdynPRp6Y3SqxjXKpqyh5ews4OSu6agjX+81GMGKIhFoycLY11CiXv+F6zXObxoJpjbhV4lplyecoLP75xzi6Jumz4OFRt1gCw34DzKON9tJ2KETO59t2iS/wjAV7VsTnJkC4zYiupmO+nndpks/uTHSyAToOkkwRhTTI0XLjrei2Z47dFwTVPocc1xqYsEU8IN2UxnyyBsnZaT0vQ1Dxyqys8RxIeCBqTDWeKeLniqtils3u2INQf62EoKuz0ErHoTde69wpTTKS7FZyTZCOv+QygceSGDAaHivmgcMHWcKHM4aTBdIGGumE3mU62cL57FerBMtbzWSKKdB32pgjnoY8Oxe0co8i80jaOxw1IEgm3OndTBxZA0q5WAzlpmoWzhC3aK3ofFybtEs5UJORo52SSK5M9G/DW1cuPCs47lNVK49/3RLSKpKHdQfun+OEoTciSHU0gg0s6GwcKVSQGWQ7o/jk4ajgmbm6wDmjBUeoUbb/76A24bfWmZ4QOVua+SBKATibh17GXRrbnVt8Pi+0h7Td+yOiu09f6pwMOShm0tD+Nf53Ve+bQaVhgbrk/VVEJxn0U9yFyvxq3kCUi5w0Vz6K1cWHbYzUA0guNeKgWE22dJ+9IjCETESlwFs9EMDlk1J7JRo7w2P81m+BXav2G6W5f2rVafGVbNwet1XLJsL9vzOPJPx/7lSoboTaBxtTKE704swRwql8ht/MLhOYMWDuZfPwIpWa5aKakKibLqpyn4NLAtCEKCUETSztKAVjHSA1tlA4mHnI20/9DqbbXfFtdrC6SqZmSMITiWRY/crhGJGirwy9mi/rMdse4nifO5FyfQD8rNC5Zhm8w/07W8k/QNBlM8YgPh1KWfpuaIguGL3DxV/l77F/WswrTTFa8XpUhFozfH2H7rqbdV2qQLfdMzcwY8Enx9mVE2CmvdNqO/Bej5V835 H0u1EbHPKJHz7Xr31hREKCxq2Zl1vdUxfmThgkRBwWq5Ryj7+bCDsZXRI15DSjo5TZHTlSGezsYmF5Z/D64X4JeSNNoRub4T2CeYbuLKL2/k/rwroC3NrShWkUJ3K9FwGmD2vA9+Lndop3wT7eq38tQVvlFhXZkZCoxXz0lJ3benwEhAEm7jLr+VnDrd6rCx21ZRlhou69PjuFfYNvySz3woHjY3p1smNDnsQMxWm5//1Bd0uiFbTS3NposxaJWCisapH/K11VzmsmO20Zgv/Q27xvbbpmxEY31hLfLRQQsHhs8228IdSqdQgVctczRLd8DhQfMxXpS5Kr2q+jNj5DOxnYH0squaprqHEAznL+8VpKlFg99DfcpNyF3VvVETVGYlfF18TAV5dmchSyBmuPodHxQEcTQG/AhPoB8Lb4TSS/eu0rcXZm+gVuurIvtQgPbp6Hz+v3XuUVnb/XMj5xeQlxeFe2Tv/ww64bImPCOn4wJkkEfhl2lYJ3wZmmVimSJQBNbnsADFEdJJw+4hiEag4Kmu4LRRYGWJwqEAEedp/eNkoE+KBNl+n0FxRvR9QEgVie6XmIlE4QwENOOD6ZacJWJqgGrVy3RIKEHm9HUImqWTUCVGCJ5R5cAj1eXnjz Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n5-20020aa7c445000000b0055fd61c9be9si1241866edr.438.2024.02.06.07.56.25; Tue, 06 Feb 2024 07:56:25 -0800 (PST) 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=UqqIWS7Z; 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 4CCE668D01B; Tue, 6 Feb 2024 17:56:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECDD268CAB8 for ; Tue, 6 Feb 2024 17:56:16 +0200 (EET) Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-59a29a93f38so2336306eaf.0 for ; Tue, 06 Feb 2024 07:56:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707234975; x=1707839775; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=uisR0pcEiJN/R8S+4qmpWd/2KCuOzoU1voCwaMY+ybo=; b=UqqIWS7ZNYABaWLlOTfxVsKuboPEMfy3D22yLRmXiZhYYZtF2nzHpJBdZZ6pbduQZh iHLa9fgUtZj4sLilbNxGoYigc2JKXFLwLono3KioRM043VeH5SBTYqdHpfQI9GRQuptI B/BWcpvyFUfac6mYVJcW9LY/d12H/+kJdDku1TbWLsIsVagoHZYZzzv/ppOfpK9z+578 +TI/NS1sNRfIYEUOUJwCCIEdwOQ4ZJFdgXTFr1F0utTmb4PedwvX6D18Oa9Dswx+X4kS TDYX+ZmhircuJPDarSUBnx2g+tWKGphSPvRDyatU36fkrTiry+C3PPHn7k1BNhQsx0oW UJ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234975; x=1707839775; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=uisR0pcEiJN/R8S+4qmpWd/2KCuOzoU1voCwaMY+ybo=; b=hDsfc7dmK0hGzXZjRMRNdf7ZRdFXBHWefH+h7rAoKKqMa/XpMUfTv2eXcQgH4G5AEi 4Jsu1ZQWXPPsa6g+hxYi1fWmH6VjFgD1UkffGHjbV6d+fc6OIn+4HalTETN25hxZS6DU HOeZ//cN4d8VLPCabM71Svrd987Igo9+QVyYIXqIHK+A9C6Ue5vSy+9oPAwXkCdfxJF2 xvJvjimWPmjeJSh059kJNHzVYSidbBNQWG7NtTdd0BEGbsILegJD+YBCeMw37PZVcH3H 7W1mQMNYnfsXDFzOTLhLUICE/XQegPAsBM1qbznhm7/bw5T9vdEYvp+xW6djhrog//5a lQPw== X-Gm-Message-State: AOJu0YzGk8R5O4y8bJsXyTj8B+IGWgVx/rlVwFjqlOKD1CUOZDQYB1ms DtPQkR/P0pF52UagO9GQPDmal4SoL5bDGD6M5E2j42V7Ycn4EyQnH09Ldta98psm5cPndHNhgBT l8iV+jRXkHga05KGLys8OFfOMfHfgp9+C X-Received: by 2002:a05:6358:9044:b0:178:b0c5:9aef with SMTP id f4-20020a056358904400b00178b0c59aefmr3619295rwf.9.1707234974841; Tue, 06 Feb 2024 07:56:14 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:56:02 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 3/7] lavc/me_cmp: R-V V pix_abs_y2 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: XPNm2XHONYKI From 01cdfde56c4a88022f0ed8c12a2442e6bebb6a60 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 21:46:07 +0800 Subject: [PATCH 3/7] lavc/me_cmp: R-V V pix_abs_y2 C908: pix_abs_0_2_c: 904.0 pix_abs_0_2_rvv_i32: 172.2 pix_abs_1_2_c: 460.0 pix_abs_1_2_rvv_i32: 168.2 --- libavcodec/riscv/me_cmp_init.c | 6 ++++ libavcodec/riscv/me_cmp_rvv.S | 50 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index e46fb09c11..72c3248b01 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -34,6 +34,10 @@ int ff_pix_abs16_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *p ptrdiff_t stride, int h); int ff_pix_abs8_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs16_y2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_pix_abs8_y2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { @@ -47,6 +51,8 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->sad[1] = ff_pix_abs8_rvv; c->pix_abs[0][1] = ff_pix_abs16_x2_rvv; c->pix_abs[1][1] = ff_pix_abs8_x2_rvv; + c->pix_abs[0][2] = ff_pix_abs16_y2_rvv; + c->pix_abs[1][2] = ff_pix_abs8_y2_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index cc60219466..308d707136 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -115,3 +115,53 @@ func ff_pix_abs8_x2_rvv, zve32x pix_abs_ret endfunc + +func ff_pix_abs16_y2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + add t1, a2, a3 + vmv.s.x v0, zero +1: + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v12, (a2) + vle8.v v24, (t1) + addi a4, a4, -1 + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + vwsubu.vv v20, v12, v4 + add a1, a1, a3 + vsetvli zero, zero, e16, m2, tu, ma + add a2, a2, a3 + vmax.vv v16, v16, v20 + add t1, t1, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc + +func ff_pix_abs8_y2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + add t1, a2, a3 + vmv.s.x v0, zero +1: + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v12, (a2) + vle8.v v24, (t1) + addi a4, a4, -1 + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + vwsubu.vv v20, v12, v4 + add a1, a1, a3 + vsetvli zero, zero, e16, m1, tu, ma + add a2, a2, a3 + vmax.vv v16, v16, v20 + add t1, t1, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:56:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493432pzh; Tue, 6 Feb 2024 07:56:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGh4xh7vdhDXg4w0BQmZAr2zDEEnqeRykhM5JgOGCVn9a9D+ZgwA9jv9IXnUconjPxY8bYt X-Received: by 2002:a05:6402:893:b0:55f:d60a:b1ac with SMTP id e19-20020a056402089300b0055fd60ab1acmr2027687edy.16.1707234999954; Tue, 06 Feb 2024 07:56:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707234999; cv=none; d=google.com; s=arc-20160816; b=z3N0w481fjo1fcUL3z77JXEquYbdYJlB9/ykvTXkluZdyzlbVqrkwWzpbnvgWuwvli BhPdt4MO8OusO+rmjRqIFk/nUDcVkeSeVLa2s0kqBMc1s0YCrGBnU0MKcdGbadl3UBbH hg/vpA2M8k+hG5VtDSR48Wu1ou/aSQEUh5n1nVqBPit7oqyb1PPsGP10koYrRg58UFlb hgOaHKb54JrPtQS7PPbpNcYjiojTyu7mMR3JdSd9uNIWdktIWG3MFjppC1LReY5PKFiq UAtJHFu/03FDWya9ZatjwXyNX3AEP5/118xcYQmFyQ6Col7Lu9t6te7vb+wYgoLn/WsP 5UjA== 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=koC442YmbcjxsAGsr8qyiGzdXPRds7fXh/jziFvP/mk=; fh=1N30gCb1stadVa6+RsyuEqe3ByDqjvsvIK2MUQpeuhw=; b=dh2Okzmz11TvFQQDEk/Zc/BiGrxg2dGDBf/WDTpVJDDNEUgrafbmRz8U4wKXOZeJ4h Dh2/cw7X18/Yrw8+ykeOFo37XE8eRfwVf/Gkrr5FM/BeUp07+KGrinVMgGnX8qaI+HTf ODbiTD+ROPlaI34KkcvgetWJwD1DTOTLLBb2HID9aBUmNvVkSk7siY7mIzsp3KeDD3yy hcoxr6YnzCWarbwRnoBpzESh+EmWds0PZpM99KrXDCI7iJjkA9LjS5s+Y5pmG71ZR4vn FiFxdpBGA6OPfvnY9R6UPKVPPoaUHW+mQ8BpSzhKuQKSqM+p19+WPpEZgPOC013lxVie KfOw==; 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="XOR/9O9Q"; 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 X-Forwarded-Encrypted: i=0; AJvYcCW12QJwVrHreTmL+BoUIC1gNb3aJj5ZfGipsCSktASlXwQK/5j3VOAP5gSRyBYFPjP2RwPbrdlifNieganu5PVUYPUBkUXfK322VqBSX7wTV53sj60XaddaUQ+MXU3yC2yMsYC298KIKM+hChi1vki2yXFskmyp7nl5f2d6ikzVFvMJFWNkIjiMWnQjZ4u+u2e2u+c8x2P/3afievhvYz1IIu5AsWx6AhS/lekyw0lFH5MHqOf4LCw60VTPwBpI2DMpN4S+2Bu7T2VYzUSDnBLzL1c9CdqqVm7qkQbZOAYfkrF17UWmdhyyiWBdwObawqXjbCy5H5FLzCWeJkCCfAcnNVIedD9Z/3Y+ALuSPD9a9CTlM++aJj5PuSevB9CXDjMKFQtflYI+LpA7IqgaG9ZaUbjKOgCgUp3N3MK9FG65dX+vyDplxciI+7lo6u+i7ijqm7bEYM8j+Yh+tdCP9nUoSyKoYJldzw07dF+xqAJ33+9HaVdgF5NiO9tl+ZEbqp0EdVejKX40kqCmmEIoD72OFvE434+ITKKbTEtutRw5IqcwihiW+sfI0MJpqbCtONEzXcMkxNQ0fZ/ck6D1oOPeMmNJSwsVCAduurcCIBIfOTHLMyRk5srDUNawyZ9PdexnLwKCPcQHB94JSUOZqVx38zP8lDpamF+lLcP4Z0fXyX5e0/VzYSC5FB4ZVmyTJeMCAcfGBqVoSJPHltddvDlVMZS1mGHAuW3u17FVxP/lpOLRc+Ede/xO3POVOfXXmgKXIxi4jC2YzxmrBRmFikZdO5fb3n7E8+3MpE8hS9HA+WDZUkR6MxKABAjvNVQAW3v1Pwqic9xnITMhpJh3rN9CvcbTF7fW8clv5D0NyUnCYsCt8V6GEaSTo4aFF9/41XVXMbkoJMBR7/RTtUVlXbEM52WDVPi2pDPE7MgPZOIfNwP8IAilOUCcqfMIh4jFWh9brh 6y3pUcvEyqX8gZZPtuCz2cHUSPL1NJ8kLyPpiWvdWBYW5lYrYvf6Gb/6KLYokgHZBOTnfMMkZ7qJlhYep4irpUQS5vqMvSk6U50yPbE+6iw31WhrfIA/Kvkmhp3sVzMUEpRCNUQh7qdqR8dauo6BTpI8ZhkAWYRZ4LHDFaKTaQhY1SPDk89iEjOp/MVgjHgmcgG1TZ4o0k/f7SJxFRPgoxkvMhtTworp94V0qtIJl+SDt38jxYHCN+9QV4r1FbVzubah05OamgJRw+ID267ie0gNpMqVLpuH8r8C0xXZjISg2glpVco7/4jVG6l0Q9BjFFHMN7zC1PVQsEh6safUnCDNf/qNyOz1QOif+bMCgE0B1Nt6ockKp/gXhZ+cw7gnrTwjWL4Sx37NLg5Yb/opRoKqaAMFU3LRY7oUSXr8DGEFktSI0xb/sEroypnrm2AU4mkX51qpfLcCiyYjylkoi+HyNXQoZiQK2nfme0HhEXdQJlwvqzRyEdsBH0neFRFvpFdxAmuCXLbcaK5+Z/3zuY+8L3mIY/CvOj51hn4LjWi+auvzTboibpsvCa4gNmoyiwwnyx/2TkcNqAixIi0CO5TayETeMvCVEy5mZVa4cHkVrdKGie2snfij+Xd+TOkeOS8aI+ Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r19-20020aa7c153000000b0055fc1a01f3dsi1200326edp.662.2024.02.06.07.56.39; Tue, 06 Feb 2024 07:56:39 -0800 (PST) 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="XOR/9O9Q"; 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 4924568D085; Tue, 6 Feb 2024 17:56:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A356368CDBE for ; Tue, 6 Feb 2024 17:56:31 +0200 (EET) Received: by mail-ua1-f43.google.com with SMTP id a1e0cc1a2514c-7d60ee03b54so1857066241.2 for ; Tue, 06 Feb 2024 07:56:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707234990; x=1707839790; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=gpOEl4Lrf42knKmx8G/LjUTZWVlKQKv+lYDJkO6O6xE=; b=XOR/9O9Qk6VmMyRTZwfgO0SlTvQGUk5+NgfVcwZLTQlLbmzOiulDbKj4my7ujlMfiZ tTZUcbqo4hyt70V8IDrPrR26psnwaAtO5brqORA1ITHHHxXNsS976b65xZMJCws0HPhR D9Qza7kQyKLelGcAC932kBsPSw+PkYqd4Nmsaa0IKxySLPj+DSaW1OSacaElE/QnOrMr z/IGvvn2uMMH9LWTawP+qVuGi7ekFaBABYdg5V8IntHwt65463R+mfpejCpFX/nVvmNa jis7ptP1ooIiG0kvmG6DFcNxdD6kp9P187oIqJI5Ud/xnIGsrwD8GucbdXS3EXrkuwNL 4Xsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234990; x=1707839790; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gpOEl4Lrf42knKmx8G/LjUTZWVlKQKv+lYDJkO6O6xE=; b=hAoKLoY6DyYq3tFdcDTSAdCO5dZKgKPTGnfYusjrs5u0UKWPDgNp+r3vikUh6V5z2F 00/QFMhkDri25oXyp5MRlG8N++5SuFVxgPdpsx9IqiI5IpDilBVQGaU+I0R4JCl1axKF goQaJAVofhWZNjp0DniVsPuZY+78l7Np4fsdaQ8pzM9kvfmN+CaZR5b94HmVYamt1MqZ FfS17aanM8I59Y5VKuwO4ISuiYuRLT0uJscWVCj3W8BGM3q2r235xRhi1bVHsrDPkHco XDcB9Xdyqp85nn89eCT0VKnqfAK+esE9Zy9AWhbrH8cX5wFrHiZc+5zdRQdPY9fmd2r4 qQlA== X-Gm-Message-State: AOJu0Ywo6vKyNHIdyrKJYL3mahCE4EkytL0Wo845Dt2ZDQslSNCXhIHf 8JKsr4DdbyykVpNgnknLEW+VENbhUC48kVmk2UXiRh7HQZioYkNAhvPuS+68rMfpgg4FBXjsfW1 wrz93gJJqDILe4Rv6R5lR3bhN5/xSXF8L X-Received: by 2002:a67:fd09:0:b0:46b:303d:471a with SMTP id f9-20020a67fd09000000b0046b303d471amr3578347vsr.31.1707234989815; Tue, 06 Feb 2024 07:56:29 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:56:18 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 4/7] lavc/me_cmp: R-V V sse 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: vFwyjR874kuf From 7d153e6b166d53c94db57be4f024986d38290042 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 21:55:07 +0800 Subject: [PATCH 4/7] lavc/me_cmp: R-V V sse C908: sse_0_c: 614.7 sse_0_rvv_i32: 138.2 sse_1_c: 302.7 sse_1_rvv_i32: 107.2 sse_2_c: 175.7 sse_2_rvv_i32: 104.2 --- libavcodec/riscv/me_cmp_init.c | 11 ++++++ libavcodec/riscv/me_cmp_rvv.S | 66 ++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 72c3248b01..85ecc22cbc 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -39,6 +39,13 @@ int ff_pix_abs16_y2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *p int ff_pix_abs8_y2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_sse16_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_sse8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_sse4_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { #if HAVE_RVV @@ -53,6 +60,10 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->pix_abs[1][1] = ff_pix_abs8_x2_rvv; c->pix_abs[0][2] = ff_pix_abs16_y2_rvv; c->pix_abs[1][2] = ff_pix_abs8_y2_rvv; + + c->sse[0] = ff_sse16_rvv; + c->sse[1] = ff_sse8_rvv; + c->sse[2] = ff_sse4_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 308d707136..11848f3f21 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -165,3 +165,69 @@ func ff_pix_abs8_y2_rvv, zve32x pix_abs_ret endfunc + +func ff_sse16_rvv, zve32x + vsetivli t0, 16, e32, m4, ta, ma + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m2, tu, ma + vwmacc.vv v24, v16, v16 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m4, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +endfunc + +func ff_sse8_rvv, zve32x + vsetivli t0, 8, e32, m2, ta, ma + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m1, tu, ma + vwmacc.vv v24, v16, v16 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m2, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +endfunc + +func ff_sse4_rvv, zve32x + vsetivli t0, 4, e32, m1, ta, ma + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, mf4, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, mf2, tu, ma + vwmacc.vv v24, v16, v16 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m1, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:56:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493536pzh; Tue, 6 Feb 2024 07:56:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyv07yyhMLnytSkPFqlmqI5VW7kdTV88eSSpU5QL9lBLuPxOK87KJD9uA7lU5ZPf+JQcyq X-Received: by 2002:a17:906:4b:b0:a37:cea1:256d with SMTP id 11-20020a170906004b00b00a37cea1256dmr2070201ejg.0.1707235013141; Tue, 06 Feb 2024 07:56:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707235013; cv=none; d=google.com; s=arc-20160816; b=Hm1CuEXagSSXbg0DmhS0a4Tyo2sA+r9L0Ay9O/LIFUBTzwSHxNABsKjal/9uB59+G/ s0FqzrixHQaCj93aQLjz9slzBKCZ8u0/izVKQhjQMgkebVdi/+6K0deIaAKPtYL+CU2O 545SNWLqwh5P8/XLu66M1c33lbVgvRt67FGFdSzQzXuUa/JNLFjHpLsM8OjtLmFNs2Ar BmQJQdkNha/XNRm82Kl5KmCmNbeR370v/8d2L8KRxKuTdUqJQsZjoJzyFtAf4v1iMesd ttjmQO5hn65uxH+CxrioKDPoHb8u6rCjr9k6k8Pby+BFe3EaWVNRTPgLp57gEvw2qakL KsrQ== 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=MNf1qGN6W37x6foldmSsl2pbrYfEZCvz9qSSrYZi3sY=; fh=WXmKIhJaPWDuZEIWXO848sRtIoZIYKIJr2273fMT4rw=; b=PdeJucuhHMMRS6HaQfOHcMycsLNKKY+J5xPuVckIjyjyvFBpkr8oU4lUzEkMMNM4g2 l47KAoHCS3iNWs4+QQkxd3bnL4YSFta97GfZXhu5fj0j0tFv1TvAlGRje1+JpJbFpBN4 8DzeY98JkYHPKEof9uKb83BG09uAt36UYRhDtYtVNOcDxrcLndlZZI8Obt+JxiDn9EvX 2kJ4FArsqlujY6oDmnqZL0CnZgyhVbC4Si33rQSwpcp4sE5nK+zAgeP4qZp0gLdZlQB/ 2KV1J7fd3wP5kHiSL9y4h2akma2cVqNTkpVR4QpezMFEfHCzfZIpvcKDsGg+fZAqOjdf T45w==; 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=QWpoqAGJ; 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 X-Forwarded-Encrypted: i=0; AJvYcCU3Q6ZlylLQ4/Gc91CuI3+q6mIv82rKjysTXsudEPzOYtli+QtX/mrgJdWXxyMnmaiHWtCEIiB5AUZMLAX3Og1vOUu2/e6iMyTsMvv8uAK1GDGd2SWFnOmDTwQGpXdvowj5hdMxEYtMBwIAwyw2SXDR2I5ou8LfOoNhBHP1xgEDAbthmYJj4IT98fsECtdI9JCgEDsCTB7Dh/N44b1u9kUWwWfJSuIem2pSXg/aQEbDOlSLkCzAhNSRTBShxu0twRfYQG9HjjAyXY+eTrw7gxQ5fYWUgxmn0OiKFaWVplFojQBjtTzURs43Z8sBsfZIFGX7x++yL3DyJW7pDqddVwXILrUu+zzEM5cKSwIxrf5QRrC2T8gcgIzHsIUYK54OT4/luj/GZeAPX2YloFd5cm1dHcCBLk8+/fOP+Qqr9zahnYq4y4y3yI7yNXQlk3es5z5xXYg/x1djfLqWQRcNrhjM4jkRrS9FLDBK7G8anLFdHgcf7kByVoW1aFZhj2xfseYIUvmLFGsUiGLX1U1CrHjZ186SWYlxKRlmCSAaHYxEasr+FoTapiwPwRxK3nsDcFIkae87O2i048BpJlUwTP9oFo0kCKPCU08R3V9alFRz5o0Q6s1/kBG9hJvTBH66D02PEWQWmDqEphUR3uolGtc/6nnBIKchG+ALHbgaoL5Di9GHRG68Zca7WeGpEtxlsVd7gfr/CPFBI5iaUpm+gpNO1zMHIuXES20b2kimgMc7CVs/Jo9F7rGtXYBJ/lFiV5omVsDonyKT56rcmBupv9KTcuT7c+p/3BwycZor+A1FwBMj8lBpxsMaBVM3zw7LvCOy35YnoeREgy9892VJ0l1imAgDmJaFEjVPahsKDRTfGVLIcPg1TZ17LB0rPIkMsipP034NEkmibgZ5skezhqUefpSB07KSX7MZlB1OI5nUUVDUZpkKb3rpcgoXylII2RLxZb hKlfDcYsTgax1696wv7A04mcQ8n+Y8mTnPIXy8W/BKAggKHrEWV87Jq/yr6SEHahGt16JAECICx1kiFqGVuVnR0WOaSIth8GWoc73RKtUnsRmAFii8tJpNRXnSIpIVk+0rWTKqRaYH20eJ1nQetLAg8aLjoc2DWBjtuq/z6JCoDppi5j8dkxOLi1yl0WDdqpxwPLLt4x90rCyvk7lcZvxvPY2s0ZQ5EmUIDY1uCuGw3O+BBG8UVsoUOBFUNgZuDlvPkatZV5u27qvUStGHpI0Q0PCV3FLBpjYIGsISWbsDi2rsjmJ3n4RcgXSEZpjagrWFLlakK9abPWZ7+atEhLvuJ4spSqTvnfgHR95GgN37leJRtgEtK/T0EkvbFRcC8jkpZD3AXTlEz+9pN1+ZHSA6BXsVCks8wc/M6Ik85uHP9OiN4T+yL7QiK9Y8rcU1+HEGG4Fl7VCUV/16gd7jfbSljpUG16nf7CwRplzt1kBrVjrwCLmLY4+2B5cBYxvaeS65/fMu0fzzHRwJI7iyrV7ZnCGvMLQlwOUUkCwWI+kgsF2LCPKSiKGQITgpjMTIgLGtHt4paG1hEnAiFxcGt6AorqAS35AJsSPEto31aj64Rft+yRcjrzBKi7Pm1OZWjFbR5+w= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d9-20020a1709067f0900b00a3613bb338fsi1178144ejr.227.2024.02.06.07.56.52; Tue, 06 Feb 2024 07:56:53 -0800 (PST) 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=QWpoqAGJ; 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 4CFBE68D062; Tue, 6 Feb 2024 17:56:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1BB768CC2B for ; Tue, 6 Feb 2024 17:56:44 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-68c8d3c445fso13541056d6.1 for ; Tue, 06 Feb 2024 07:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707235003; x=1707839803; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=sHJWaQmFOUJMbBXGmJjAOGwDpEc9hY064z/Q++htK+k=; b=QWpoqAGJNeXVyfKKKpr0UlEwIX8ECH8s2qu0DDFWyt7/wdprC+MisaII0ZqKtbCc+O bG7vhVUDpVV5bRu5Sr6n2uQWspHmKpWUW39BYEp7vvxyTVF57k/Xdea4EC6OTis35GyG Kwzss5X7E8yil+7+qdPkXOXpwGAJeX8tjtRf55tPOMMrj7ZTPZyqq/95inaOQsv3H24F +LwKzilwacKZyZiGMkpBK0A4ApZsJnnJYZs9t0HTL3uwAEtMDvPcsare5e3Mqmz/wkVG Rp5xDLnZnG8IDajfBLfUmSWPxEalDh+vJYqoPpu15kGSQAuoTsnlSwGmKEbq7gVC97nV d80w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707235003; x=1707839803; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sHJWaQmFOUJMbBXGmJjAOGwDpEc9hY064z/Q++htK+k=; b=ILYn0CXr7/LwNrg0bNk04b1XaQ9A3LM/a8MgpDLw/epXACWdPmttr8fL8QtDpzDnJf 2XJ21bxNX+OYXW/QYrhWbMYKZ8tuwVS4h+EkCqFU8rkGYFtfMClwgtt/X6m0t2uWwASx OlIPlcv0yvHBdJfDngmqpcigqbE8bmMN/fbxywvEEhXBxE3ED48qPfSBzn1gk87cwsTH xwdoe+TUzkSctGUKaxwPjqeZx9WYcQtpglhgl6ITMm3l7NRncxWkbA7Xqku73v/pnm2R oQEy/ZuaX5A7ox4+pGYAzku/givu1dLu//xrRvCI0nBwHUIvCSsHgCyycUpCElkuSsWj sreQ== X-Gm-Message-State: AOJu0YybReH0sqdmV6kWIRwboXscy9D5h0FtOcznzr8FJ0/75WfbnPW8 uBbD5PL6SREuJxTSoPuU3+h4V5NoFUonjoXBdaiYtxEjBS03oZ6I6et6lo5h105BfKzbRuMNagW BYszIVicYn5yysA50KkNMKFpc3jMO4fEN X-Received: by 2002:a05:6214:27c2:b0:68c:8abb:73bc with SMTP id ge2-20020a05621427c200b0068c8abb73bcmr3266144qvb.61.1707235003401; Tue, 06 Feb 2024 07:56:43 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:56:32 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 5/7] lavc/me_cmp: R-V V vsse vsad 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: TLbIr5s+UwjX From 67f2a662be1533e52a28971152bff670f78544fd Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 23:18:51 +0800 Subject: [PATCH 5/7] lavc/me_cmp: R-V V vsse vsad C908: vsad_0_c: 936.0 vsad_0_rvv_i32: 236.2 vsad_1_c: 424.0 vsad_1_rvv_i32: 190.2 vsse_0_c: 877.0 vsse_0_rvv_i32: 204.2 vsse_1_c: 439.0 vsse_1_rvv_i32: 140.2 --- libavcodec/riscv/me_cmp_init.c | 10 ++++ libavcodec/riscv/me_cmp_rvv.S | 98 ++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 85ecc22cbc..a6ef5addd0 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -46,6 +46,11 @@ int ff_sse8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, int ff_sse4_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_vsse16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsse8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsad16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsad8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { #if HAVE_RVV @@ -64,6 +69,11 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->sse[0] = ff_sse16_rvv; c->sse[1] = ff_sse8_rvv; c->sse[2] = ff_sse4_rvv; + + c->vsse[0] = ff_vsse16_rvv; + c->vsse[1] = ff_vsse8_rvv; + c->vsad[0] = ff_vsad16_rvv; + c->vsad[1] = ff_vsad8_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 11848f3f21..25b15c74ce 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -231,3 +231,101 @@ func ff_sse4_rvv, zve32x vmv.x.s a0, v0 ret endfunc + +.macro vabsaddu dst src tmp + vneg.v \tmp, \src + vmax.vv \tmp, \src, \tmp + vwaddu.wv \dst, \dst, \tmp +.endm + +.macro vsad_vsse16 type + vsetivli t0, 16, e32, m4, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + add t2, a2, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v8, (t1) + vle8.v v12, (a2) + vle8.v v16, (t2) + addi a4, a4, -1 + vwsubu.vv v28, v4, v12 + vwsubu.wv v12, v28, v8 + vwaddu.wv v28, v12, v16 + vsetvli zero, zero, e16, m2, tu, ma + +.ifc \type,abs + vabsaddu v24, v28, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v28, v28 +.endif + + add a1, a1, a3 + add a2, a2, a3 + add t1, t1, a3 + add t2, t2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m4, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + +.macro vsad_vsse8 type + vsetivli t0, 8, e32, m2, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + add t2, a2, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v8, (t1) + vle8.v v12, (a2) + vle8.v v16, (t2) + addi a4, a4, -1 + vwsubu.vv v28, v4, v12 + vwsubu.wv v12, v28, v8 + vwaddu.wv v28, v12, v16 + vsetvli zero, zero, e16, m1, tu, ma + +.ifc \type,abs + vabsaddu v24, v28, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v28, v28 +.endif + + add a1, a1, a3 + add a2, a2, a3 + add t1, t1, a3 + add t2, t2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m2, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + +func ff_vsse16_rvv, zve32x + vsad_vsse16 square +endfunc + +func ff_vsse8_rvv, zve32x + vsad_vsse8 square +endfunc + +func ff_vsad16_rvv, zve32x + vsad_vsse16 abs +endfunc + +func ff_vsad8_rvv, zve32x + vsad_vsse8 abs +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:56:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493671pzh; Tue, 6 Feb 2024 07:57:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IErObrTshiTYGsnhO+ANCRTREuX7g4yJ/Y38GDKmSHs7FQMaNug4f4IxskLJm/G5PZ1AkeO X-Received: by 2002:a2e:8396:0:b0:2d0:adde:cb6c with SMTP id x22-20020a2e8396000000b002d0addecb6cmr2220131ljg.22.1707235027889; Tue, 06 Feb 2024 07:57:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707235027; cv=none; d=google.com; s=arc-20160816; b=I8d4MejJGXOqP2J03I+585zupIbgzCV951RKZfzkAQsmJC2QMn0ALbDoW2kfTYaqqs P0qdTVuGbwkA0UzpHeje6IQqSRpvp1ZctiuB5n5SaC0OxQKTSqmaRh+fPWXeLj72ccOG 5zDNi5rkz3P3A+g1cjd49sXFg5u97mGoyThhuxTDu6UgsfEVMb+ycCuHzTI/OASVClua ojX9KS0D2QYr7UmbTymgof/dashM7F/Q8xNOsprgQhCWdnu/TsbfJuVxE8aWrL9KDMVw WjgafsRzuC99ehojeUwWql9NKvI208CkoNyzhU8za0ylSBG7/m5gj2PDf1D6G4Ku8ABg 3sEg== 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=aIuAGJevp8xVYU6n1cFiFp5Nv3gEjQ8LeUFjVaD/Cq8=; fh=dKRvGB1Euy4BJtx5GblK1r/WyHYjTVzfohUkoWIrkUI=; b=ngteQxeNbgOb6grC9UXVyWyM9s3wERB2lonMI9vALSMHD1v7D4aMalKWc7xaIOlF// ijBCZHeZYeTddcf1YThQCxV/VHkTp9vk/V8KgNwQt6pmu70xQODDwqyzfuc0H9QJhgKF cqXnNfMeeB7X0bpXQCStpRTstfN8MJI3DAAhW0mY7CqHrVrvhsNR9Swc8wgyPc5YzqaV 75sutswYCfZUur3qx2LxnEiuuOX9xSEU39Gv3DqtqTdzmdK/Mw+twEgURJfH7oqe2Wem 60fqPYuehuzrXJzFjZFOAK4Zf3H++WMDREl/6RkPFibrEra5qz4oZSwwU0FOrmhc6+ne g7yA==; 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=e+awsW9s; 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 X-Forwarded-Encrypted: i=0; AJvYcCW9+XG6oC87xPO1IdBMoQ7jvA0gNF0hg0+ncYOL+lHtR3En1bKH4cTCQAoIh0+c1IR+eMbmhnFJ/YRLqaTSaCty8azEuC/Jb91PE9u7O8/S7EqhRY8fpDav+HNFfvvKp5yPB61L6FA2ewTRozbm9A2OQDI0KT9pmOGzcB6kYWmN1rUBeZoM+7gB5Fyf/iESeypAmNftUjjH+s6nWmKnZXvQdfTj6orIadRDLoY9+7HWGaoNxYqtTW+TuQ0U6RizJg27WFjMNlpse0fABqDi3c5SF/tL0GKg32ZfuGI0mY8OYbTvfwV3SD6DkYDmSbwg/QOjHVE+kv78wGQQSzRrcE/tgOHIco0AjNSQmncZJFtR1kbMW7JT1qJnvgnv+UPFpjj3bDp6M1DRWiNQ7pVsBF1LB8MQnGKi/eIgzR8K1+wRAst6VkuyyeVkU8l7EAciH7sulnIsnuvIC8as4qHIdx8pbJvRC9uWuvehlKNupLbuYtAopbDps7NW1eF0I73Fs4R0UzLxUJs0B0uo4+o0A/kQoh3v/AXo70zlykhJc8L2/OrJsnUzxBbGC+TvAsQTF4T/Gh2xorqE51XUpLdI0tCN2JOITgNbdUGc+Srnlk62Hs8FmFcF45HKY1OSmbN9c1HzeiWtZaPw4O+EzIaTkndv1DaTUeMbai2qtmT01/prkxBna4iGBCYMDY+HxQ4ib+9pK/RYFOCVd5/x02OMqhG13IxeQgFNsCE2Z1W+8pNwSyVZoXjINv5Bex1Pq39KzDOmQGuQd3AA3XxWXxhRLDuXVd7QJRb5e52nI+KaMCIIuGc4nDx+FhI8q/DwtLWk2K1NvLAoe+CMndNbroYBcbC3KmjNJ+Ct3rmQUdl5awKNUm/kb7u4vbedAu2w2cbFgCYl84qXdGPYNZgYIr3zz9ommnFw7GQLIqMWPPOkmbZW8nfBOx2+5x26VvcN5g+Zb1hrCH 1ueUCkz8HbH1wUvFrnLsGhoNdKUFLjFlG0vsBmNrPSCjr9DIYvauohUlQSGFZYTAbU9xfEwHoG9Yc5+ThcR3ICNw+SzGvGnXCSdUtHqFGfXzI5A+VnymYDkWAIsFKQgmxPOlUr8hcoirR9DY+zYB9FfIdV7ePnWJt2XUkAHHhgC0/2LBHkhTbKNFV5/42dB5duoUeTORUBGoY7oEkY7J/VVRTIr71ISl5uUObILgX/8zBk8aXO3yYzpn6NYI/WWUAlWfcffRLKtRYOmu961Z9oRE8tZVJy353Fzfy3YjhtOEtULxMNdFhbd0ZARP2mZRoew8+Gvs9wNHtvMUFcLWYb14h/oEAsqrVSzsx5zy5MnPwzPYxD7iKDsdmT2lzlyEwYpP+bsXrdZ25si4jlA85PZ5EkyGNOfPGSNk5FYm7dUJl8P80JV3wewlwgC8ok2ZwPEprG92H+h+fOVdI2YbkbdqSqJ96qsCTyVWoAe46x52eDLs/gtcjeLQqqX427D9M7lUUT+7Umo5r2ARACPxivbGfFi/ouMCm1yZq9JFxJXbAXnYY1QcA/IdBzQHIVgV9mf6Ivq0/veOmcdTH07svzZV/FtZXT31sMAEt5fvsNHvrVOf9tIlETquCrOVA= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c16-20020aa7c750000000b0055ef7edb086si1251160eds.365.2024.02.06.07.57.07; Tue, 06 Feb 2024 07:57:07 -0800 (PST) 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=e+awsW9s; 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 4A8EE68D065; Tue, 6 Feb 2024 17:57:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0156B68CDBE for ; Tue, 6 Feb 2024 17:56:57 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6818aa07d81so34485926d6.0 for ; Tue, 06 Feb 2024 07:56:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707235016; x=1707839816; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Kpx1UcikwOdAcqRkXxTazwfIApdnxuz/x7OeRW9WJEw=; b=e+awsW9s0QpXjpPp3LToYcukRxrrsreIjieNZFfQI8DrNcjW453mV0DSrA643qGcM6 Yty59T+sVZ0lhFYazdZysXQu75NWKvpokzQXq5nhMWNCejB/81fHHkRWNrZ/P4UGps46 CVid80xU0AbSeKlBXptN4zAOaFjtpJY8+/kFTocIahzwGt8MWarffS5QkvaXPYALZ4MA QoDC/y0YD25nTy2371jWJgKFkAmd9UaA5ZSXW1kexvwiMgbvxvo0KdwTAN9BWmf3vu4m Ul78H9zLa5SafgGQGSFMPuVfRMBNtg+/uSis7HLMXlr7Ef6+yh6Y6RpRt9vovHU7lD+4 0LkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707235016; x=1707839816; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Kpx1UcikwOdAcqRkXxTazwfIApdnxuz/x7OeRW9WJEw=; b=FO1ipSZP5J5BIaFFoisk94MtbY65+zmGx98884watQ+Y7LN3bw/WbB22eSspb2Rz4i Sz6JvJPJ+ZE5U4ZpiikFosRYqx5X0Mv20BwlzixcLOzlkkq2GjvLDydfAf/JGZ9I6LUZ EBldnP2w1wySSFzo8ihafrFXc0OCV83o3cn9I61HJ1G1cy+IQ4fi/OrKReDsI2wBuNCw pSU497EyOTnCSXXoOYts3K1RtV9+ks1/wtgdYJppIV5UHzxa2R78JJT5semUW5Lbc+P5 ugTTTAwrYn1h5vvkvSBNhGoFaGnkihvoOA01Bp9GHJrc3TpI+VB2K6JrHm67Dk/4Hfea X+1Q== X-Gm-Message-State: AOJu0YyvDCTt6NYq/evjrrysNEktWoi6WeAsLtqXZbxrcGVMF9hVf358 P1I6W2NzhnCVPBwdDXBQyFYcaALVcBzh/1uHKY1k/7Fq3C8rbTlnGa0dXa9Kzy0//tbjFX9KS74 i/RW4GF5Q3IWFBhWO1G9Jw2AZeXoroSmk X-Received: by 2002:ad4:5def:0:b0:68c:7903:827b with SMTP id jn15-20020ad45def000000b0068c7903827bmr2516279qvb.62.1707235016596; Tue, 06 Feb 2024 07:56:56 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:56:45 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 6/7] lavc/me_cmp: R-V V vsse vsad intra 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: wQ4O/6XN4G1H From b4abb039f8f769104a29819a1d709f5a00bf84d5 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 23:28:08 +0800 Subject: [PATCH 6/7] lavc/me_cmp: R-V V vsse vsad intra C908: vsad_4_c: 681.0 vsad_4_rvv_i32: 182.2 vsad_5_c: 278.0 vsad_5_rvv_i32: 145.2 vsse_4_c: 595.0 vsse_4_rvv_i32: 125.2 vsse_5_c: 281.0 vsse_5_rvv_i32: 101.2 --- libavcodec/riscv/me_cmp_init.c | 8 ++++ libavcodec/riscv/me_cmp_rvv.S | 78 ++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index a6ef5addd0..24e78e3eeb 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -48,8 +48,12 @@ int ff_sse4_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, int ff_vsse16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int ff_vsse8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsse_intra16_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); +int ff_vsse_intra8_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); int ff_vsad16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int ff_vsad8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsad_intra16_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); +int ff_vsad_intra8_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { @@ -72,8 +76,12 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->vsse[0] = ff_vsse16_rvv; c->vsse[1] = ff_vsse8_rvv; + c->vsse[4] = ff_vsse_intra16_rvv; + c->vsse[5] = ff_vsse_intra8_rvv; c->vsad[0] = ff_vsad16_rvv; c->vsad[1] = ff_vsad8_rvv; + c->vsad[4] = ff_vsad_intra16_rvv; + c->vsad[5] = ff_vsad_intra8_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 25b15c74ce..f32ae6b259 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -314,6 +314,68 @@ endfunc ret .endm +.macro vsad_vsse_intra16 type + vsetivli t0, 16, e32, m4, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (t1) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m2, tu, ma + +.ifc \type,abs + vabsaddu v24, v16, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v16, v16 +.endif + + add a1, a1, a3 + add t1, t1, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m4, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + +.macro vsad_vsse_intra8 type + vsetivli t0, 8, e32, m2, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (t1) + addi a4, a4, -1 + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m1, tu, ma + +.ifc \type,abs + vabsaddu v24, v16, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v16, v16 +.endif + + add a1, a1, a3 + add t1, t1, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m2, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + func ff_vsse16_rvv, zve32x vsad_vsse16 square endfunc @@ -322,6 +384,14 @@ func ff_vsse8_rvv, zve32x vsad_vsse8 square endfunc +func ff_vsse_intra16_rvv, zve32x + vsad_vsse_intra16 square +endfunc + +func ff_vsse_intra8_rvv, zve32x + vsad_vsse_intra8 square +endfunc + func ff_vsad16_rvv, zve32x vsad_vsse16 abs endfunc @@ -329,3 +399,11 @@ endfunc func ff_vsad8_rvv, zve32x vsad_vsse8 abs endfunc + +func ff_vsad_intra16_rvv, zve32x + vsad_vsse_intra16 abs +endfunc + +func ff_vsad_intra8_rvv, zve32x + vsad_vsse_intra8 abs +endfunc -- 2.43.0 From patchwork Tue Feb 6 15:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493764pzh; Tue, 6 Feb 2024 07:57:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFodr2IeQVi1PAixK+mpFiqDL2Ot+Ju0EP5dMG2CLtOtq5PwPJW4WX2P6f7w1FPtQ2HB5MH X-Received: by 2002:a17:906:18a2:b0:a38:4b66:4200 with SMTP id c2-20020a17090618a200b00a384b664200mr503574ejf.57.1707235041091; Tue, 06 Feb 2024 07:57:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707235041; cv=none; d=google.com; s=arc-20160816; b=Eb0vqJX6YxuwjG0+poZ5OF/vzV+OkoXi7kdClC0XJltkowWu0LB3ytYMqk7mKyI3uR tUznC+PyGUiLKupIjxITv6nUjnAow69BX54tvv9FwmZeKThMJI0QMh+8I8u1FLfIsmGp UoX5zaGJZzPYPbo41xEMPuUQa2bid36H0K9iADlGd8xS2/KdVhkdSvygIWoMd6k2qwep LGgNvELhYEfT/aANuDzwZHcvWTeU3NwUkkGb9EaOA+umcqcyb319rHhaZOcqGoPPxBkz rto87wgHU6xKYRlSQnyEXKx/TduvLd0zkNAyEpIAYYIk+Z7C6PPIAf0gZhqEDNgdTEM4 ncbA== 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=Zw66EgrFbKf/GfSZKQtw0ygiQL0DbnfDJV7PbhY+ncM=; fh=mSOn0YDPfVdYVfXf9OoFTvbIr3duKKXIgxW2VcpUs1s=; b=QA2Og1zWemVvWkq79iD/3/F/aESh88UQwzPoDwtnqCXwyYAKr0XGC4Y3eSJeEynNtU X9kt3pNJoJb75tgDCwxO9RCtnrYnXdNfRCQ89RUzWrPRhenWVlRDMW+F1DsjvMRuz8lV yx6hMlb690RX2hzA3925NO2f152RNlia4Ggy/DmgA6K5XC/yDTGvofZgzY7CNYXz69f5 qDx60NOSGTXcsGIbrmcZ+c5dhHiBGo5z8jsUEvBmMBN/wcl6JJksvkmNGbLmQVmmJeoV dlmdViPqdHgyvh1QY1MYgTfnG1cKdfxIzy5KQtIF8GGQNtRlwdWJYWUC9luukXVS5CdJ P31w==; 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="Y/5Lw6Bw"; 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 X-Forwarded-Encrypted: i=0; AJvYcCUFrlPnjLUbWvsolaiQ6iocws4ZwJ75iys6JMOjnh4tpuzRrpV09XQXT8X5/VTSj0o1L3cJTO941hL1FHG+7WCzKcUL0R1OW6KweK99qpJ1YSFsV3KzppWT8HfDLcaY5Oa3Jx5XV0oW91V1B9jfsV0y1Gg5RCLvHLl4mbrXQMMMMZ6m5c28ni2G5sKbYuTIY9NSXJJSb9OHvSdAMh/RYt+SwtY2Xp6u8l5phwTR+q6JDhbeKU8fiD06TvSwYW5hQtt+/MoW8mDU33tUNxr5imQLwVjJqLuQLD2sWRF+o2cgxUWO8h0W+dqxwLzjQvNpK5qIVSCgN7M9tGQAwTkXjjlzA+ZXgmEN66ffTM3SN0FBK7NzVFWwGfUpL7Xg8auTFYGfMBTlRYRWtlNeXI2BNGyUKbp+xaUJQay0rSDcCJHs989Suv9xpK0PrFAH5zKNI/erT3alYDhky6OA4jJafmCzLqsagUU/O/xwh50Z5AdrpYxoax9HbrIohX20WDXrD/5CD7tcDgRgqGuvu/ulFOoeR1I46d60382//OoI/WfE1RJWYcBqIxI+E1yRvGFz7ajhODF/BlNenWk8zaPxNra7Io6SOgqSHdLePdxz/3dwi/UEJcWzy9BxSc1EbxyN5YSu0Jsww+/TqsvuZq76r/4VoVuNVSXUrbIVoxOSBmUSFZXrriyWdmG6M65rWIGYm+LpuA0YlZ5vek0+kTTl65oVIlWrFw/MmC/qe2p3FYovueRAJJj+DAt5ETdd1Men/dKsLQ0+BxtWZCdYwV9+Iv6cJF7DLfRtAeNI2ty8MegNAGEOOjNAhycn5hZIulFZ+VZ9TCSEMtLJXeF6U4sRqf6DiLUxiGqlAGstrMiZ89SXWSyIxpSdXWxp/DEzPziIqkzViKmaf0QTsgxqm+BOMK67W4N/nNJM9NCU1XVICYhTnh7VsEV/66iq7fp0vqpjGJmLC5 BrmAJwvFt+qCvY6pd5tkjlh6qs1AV6Yp2FXKGOcH2RjXHlUQ76Y3VhBw8KleFKL2EovC0qcx7LMBWJvp95HmphsquXfp58/mEkz75ODbFySsrEkji5tobH52LnP5jgR+6VUXWLZ2jfMd5xqo3+bag907klrlMfTYfHkQ/r0Nd7kqWP0jM/oozouOT1W+KEpUw4GxSSw2YPegQQXB/X6Tt+YF00x+I+S4g7mqLeeAgjW2jgjoQOGK7kbUgHgaguKaXI5UntFN3m7d7/qNmM8Wlpbk+ANoC1OKyqxOhW7pGuaGA9cJFT6txtucDpF9FIg0uwXAuJN5YTHtGhBmuzBO3gU4MN1qdOZrX6Afhfgrcwm7RKa+muLeQKKcdcKJxapWvbApFEEUDZ+VLIPgLZfRqQ7UBck+tEUjqUUdl8CNF1xa6lH+OsncaLKc/V6wQfi1TOs9SLDwMGHACl6Qd2Cp3qs0optD0JWh6mh6qGTuqDXbiP/KQzQq9iAimQbPX7jZHVk2XhZSkOITXbBjkHiUlTm3ZgrP3VrRBNgtBYMASxRnAaqfdH+lcoWYUs7nhQVbK0w3rnBg/MTOTswtRxh+b8u3Wf+nZmOHIoHY3XlF43RQy6r5iZYMNmduI+nA4ChhD5CUo4 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u14-20020a170906c40e00b00a3794142672si1214597ejz.875.2024.02.06.07.57.20; Tue, 06 Feb 2024 07:57:21 -0800 (PST) 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="Y/5Lw6Bw"; 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 22E8F68CAB8; Tue, 6 Feb 2024 17:57:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7E2268CAB8 for ; Tue, 6 Feb 2024 17:57:11 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7857947b179so183686485a.3 for ; Tue, 06 Feb 2024 07:57:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707235030; x=1707839830; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=ySjB/iaWJObX1OaTmijo5cumZjrlFnJjKHygtLRvN34=; b=Y/5Lw6Bw3YEgZ6luAt0SlDlmF9RtuyoC/FQODBhJkFlwzoA/Xfv96pwY8seU9emAoB ozSPm9Gp+xAlPvGej/az1adVwXWRIRSbZrtN6a05w0urinhoB/yEfBNLxjoglW/uQzpt ZrjsdL0vGWJIHux/4/jH2iZoFOVWr3kx+CZML5oe9k+vPPg0Boz+UPvgCYgyFF6ZUDXr kZzTVcylCCDSh9RgjSGiJLjINn+sI48uYlSwPNqU3LKxn0BhdOhsCtn8BVDyZRvi1myQ Uf7AIEUHvdYNGKBAQZABoLlnyd1T9wYXdBrMriX/7RKQ/09w7d3wLHu0lcjO1C0elxq/ pDkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707235030; x=1707839830; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ySjB/iaWJObX1OaTmijo5cumZjrlFnJjKHygtLRvN34=; b=Gf5XmSDO9vojRzcDVFH14NJOuUD3/0olzRSZKE6xyFuciqWY4CJxfvqKqxBaqtfIpN m2S9pvSALTeBH+MkA1p3y2DYzds3p1LrBVeKBgZYbQUk1ygLE59hmlm1v73E3B9p3d5u EW9U2y/sw51cf//aZewmuQph2tiJuTpJclh23uPvgzC9ni7r7j3jbjrz0z7npbV7YzI5 iUmkP15kXPCYZTcd6dnzNDeG4ii0XS3UDadJjswbwr8uMXXnD7FfpYb9dx3qNvag8pzc 25QeEFYfyRY0egsE3GjYJGYGDTydnMPpSNge/8YA2xi+WlDpYyOzXEDGp2fA3n7+Z475 dVBA== X-Gm-Message-State: AOJu0YzEcpx/rIC11BdjR5RKeAk7FVd98pNlZ+ONVX0tyNIvWlYakMqJ FAfObWpDw9d6DjJ6hBeEtQUjAOY+bJU25KEf5QukOsphIMVzeFSXa7FWnjLLHPETL7p6hENe4mF Lzy1Rf+UtRdPl66yrScCJNO5XA/Cpv0kR X-Received: by 2002:a05:6214:f27:b0:68c:50a8:9 with SMTP id iw7-20020a0562140f2700b0068c50a80009mr3582797qvb.44.1707235030337; Tue, 06 Feb 2024 07:57:10 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:56:59 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 7/7] lavc/me_cmp: R-V V nsse 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: tdXRc7BgnKsu From 31635394e89318c554a9653bd22791336309951e Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 22:51:47 +0800 Subject: [PATCH 7/7] lavc/me_cmp: R-V V nsse C908: nsse_0_c: 1990.0 nsse_0_rvv_i32: 572.0 nsse_1_c: 910.0 nsse_1_rvv_i32: 456.0 --- libavcodec/riscv/me_cmp_init.c | 30 +++++++++ libavcodec/riscv/me_cmp_rvv.S | 118 +++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 24e78e3eeb..48c0d3d827 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -55,6 +55,15 @@ int ff_vsad8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdif int ff_vsad_intra16_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); int ff_vsad_intra8_rvv(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); +int ff_nsse16_rvv(int multiplier, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); +int nsse16_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); +int ff_nsse8_rvv(int multiplier, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); +int nsse8_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { #if HAVE_RVV @@ -82,6 +91,27 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->vsad[1] = ff_vsad8_rvv; c->vsad[4] = ff_vsad_intra16_rvv; c->vsad[5] = ff_vsad_intra8_rvv; + + c->nsse[0] = nsse16_rvv_wrapper; + c->nsse[1] = nsse8_rvv_wrapper; } #endif } + +int nsse16_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h) +{ + if (c) + return ff_nsse16_rvv(c->avctx->nsse_weight, s1, s2, stride, h); + else + return ff_nsse16_rvv(8, s1, s2, stride, h); +} + +int nsse8_rvv_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h) +{ + if (c) + return ff_nsse8_rvv(c->avctx->nsse_weight, s1, s2, stride, h); + else + return ff_nsse8_rvv(8, s1, s2, stride, h); +} diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index f32ae6b259..c9ae5bb6fc 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -407,3 +407,121 @@ endfunc func ff_vsad_intra8_rvv, zve32x vsad_vsse_intra8 abs endfunc + +func ff_nsse16_rvv, zve32x + .macro squarediff16 + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m2, tu, ma + vwmacc.vv v24, v16, v16 + .endm + + .macro gradiff16 srcx srcv + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v8, (\srcx) + vslide1down.vx v0, \srcv, t5 + vslide1down.vx v16, v8, t5 + vwsubu.vv v20, \srcv, v0 + vwsubu.wv v0, v20, v8 + vwaddu.wv v20, v0, v16 + vsetivli zero, 15, e16, m2, tu, ma + vneg.v v0, v20 + vmax.vv v0, v20, v0 + .endm + + csrwi vxrm, 0 + vsetivli t0, 16, e32, m4, ta, ma + addi a4, a4, -1 + li t5, 1 + vmv.v.x v24, zero + vmv.v.x v28, zero +1: + add t1, a1, a3 + add t2, a2, a3 + addi a4, a4, -1 + squarediff16 + gradiff16 t1, v4 + vwaddu.wv v28, v28, v0 + gradiff16 t2, v12 + vwsubu.wv v28, v28, v0 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + squarediff16 + vsetivli zero, 16, e32, m4, tu, ma + vmv.s.x v0, zero + vmv.s.x v4, zero + vredsum.vs v0, v24, v0 + vredsum.vs v4, v28, v4 + vmv.x.s t1, v0 + vmv.x.s t2, v4 + srai t3, t2, 31 + xor t2, t3, t2 + sub t2, t2, t3 + mul t2, t2, a0 + add a0, t2, t1 + + ret +endfunc + +func ff_nsse8_rvv, zve32x + .macro squarediff8 + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v12, (a2) + vwsubu.vv v16, v4, v12 + vsetvli zero, zero, e16, m1, tu, ma + vwmacc.vv v24, v16, v16 + .endm + + .macro gradiff8 srcx srcv + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v8, (\srcx) + vslide1down.vx v0, \srcv, t5 + vslide1down.vx v16, v8, t5 + vwsubu.vv v20, \srcv, v0 + vwsubu.wv v0, v20, v8 + vwaddu.wv v20, v0, v16 + vsetivli zero, 7, e16, m1, tu, ma + vneg.v v0, v20 + vmax.vv v0, v20, v0 + .endm + + csrwi vxrm, 0 + vsetivli t0, 8, e32, m2, ta, ma + addi a4, a4, -1 + li t5, 1 + vmv.v.x v24, zero + vmv.v.x v28, zero +1: + add t1, a1, a3 + add t2, a2, a3 + addi a4, a4, -1 + squarediff8 + gradiff8 t1, v4 + vwaddu.wv v28, v28, v0 + gradiff8 t2, v12 + vwsubu.wv v28, v28, v0 + add a1, a1, a3 + add a2, a2, a3 + bnez a4, 1b + + squarediff8 + vsetivli zero, 8, e32, m2, tu, ma + vmv.s.x v0, zero + vmv.s.x v4, zero + vredsum.vs v0, v24, v0 + vredsum.vs v4, v28, v4 + vmv.x.s t1, v0 + vmv.x.s t2, v4 + srai t3, t2, 31 + xor t2, t3, t2 + sub t2, t2, t3 + mul t2, t2, a0 + add a0, t2, t1 + + ret +endfunc -- 2.43.0