From patchwork Fri Oct 27 19:25:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 44392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp69267pzb; Fri, 27 Oct 2023 12:26:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEM8v+GZ04j2e89DtgW9e9cGY9vNnjc0d5YwxDRXgNWpjOvRiH4kafWkOHRPesy+efvl6xv X-Received: by 2002:aa7:c0d3:0:b0:53d:9471:76b3 with SMTP id j19-20020aa7c0d3000000b0053d947176b3mr3095656edp.7.1698434761399; Fri, 27 Oct 2023 12:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698434761; cv=none; d=google.com; s=arc-20160816; b=P0cvkEGT4EBWmkEQBK9pZrfozrE8acLHcAj6iZxAjQC10i8mhIPdTdvhgg5mV+mQwY aObbC+kpK0mUBe/y3+GC/AYRFHO4xYfrNTLm52+SPGslX0SVSmTYhtmK4UzNf82XoYPb cG9QimOYpoFrXGYjg/0hEiWxuugfFq7aPR7uZMnzjKZUJrG3Lf6scCAauqgg+LrvYA7X P6ihOo9pIUC/LTTQAe5naBvxyvo1if7F/sZZhglJES3VJmkmCDL9q2/hAb9R+1tC0Jvl xOnb/hlrwtKiA0dpRp/jAXQ8vHrH9TDqMts2/mDcwIoMNiMd6z3JTZYZJWDcsC7jJp/6 nV2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=5U2bHjnzTAGIGV3ER0Lty1IZxyFSQbvGfeLTqgzOcy4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ahz0ucTmLvO5SKeWM/j/ENzbD6My9HN+HwcCeo+eKf2d2sk9BIlebCKYVeTyLuGxcF r7lT0q/V80s4+vD6+QRh9E8G4jnhoFRysfOW5nQaMmNy52fYFGdzEvMRPgePLAufoKBY 6OfBjkHqXcsHD6+jrBBBFlLbnWyI1k1JlFLs86Gi01Y5mCZucRjOcGoTLh30GQwjS34Q 3egCq2GY8oPlQ/kAjeKl7eAz2rk9STkiMAewohV2F0kpI4nMl+D+rkLu1EsrKa4aFa8b R/hlVTXCidXKF/lGYpgFIU8rHgxv3lveNuDOh900R1YonaYao77NmhZ55nhnKQuSPHno 9J4g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m27-20020a50999b000000b0053e232b121asi1022514edb.674.2023.10.27.12.26.00; Fri, 27 Oct 2023 12:26:01 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F165968CB27; Fri, 27 Oct 2023 22:25:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAFB868CAE7 for ; Fri, 27 Oct 2023 22:25:40 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 40399C0014 for ; Fri, 27 Oct 2023 22:25:40 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 22:25:35 +0300 Message-ID: <20231027192540.27373-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] lavc/pixblockdsp: rename unaligned R-V V functions 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: J3EweKmxcWCO --- libavcodec/riscv/pixblockdsp_init.c | 26 +++++++++++++++----------- libavcodec/riscv/pixblockdsp_rvv.S | 6 +++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/libavcodec/riscv/pixblockdsp_init.c b/libavcodec/riscv/pixblockdsp_init.c index aa39a8a665..8f24281217 100644 --- a/libavcodec/riscv/pixblockdsp_init.c +++ b/libavcodec/riscv/pixblockdsp_init.c @@ -32,12 +32,12 @@ void ff_get_pixels_8_rvi(int16_t *block, const uint8_t *pixels, void ff_get_pixels_16_rvi(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); -void ff_get_pixels_8_rvv(int16_t *block, const uint8_t *pixels, - ptrdiff_t stride); -void ff_get_pixels_16_rvv(int16_t *block, const uint8_t *pixels, - ptrdiff_t stride); -void ff_diff_pixels_rvv(int16_t *block, const uint8_t *s1, const uint8_t *s2, - ptrdiff_t stride); +void ff_get_pixels_unaligned_8_rvv(int16_t *block, const uint8_t *pixels, + ptrdiff_t stride); +void ff_get_pixels_unaligned_16_rvv(int16_t *block, const uint8_t *pixels, + ptrdiff_t stride); +void ff_diff_pixels_unaligned_rvv(int16_t *block, const uint8_t *s1, + const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, AVCodecContext *avctx, @@ -54,12 +54,16 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, #if HAVE_RVV if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) { - if (high_bit_depth) - c->get_pixels_unaligned = c->get_pixels = ff_get_pixels_16_rvv; - else - c->get_pixels_unaligned = c->get_pixels = ff_get_pixels_8_rvv; + if (high_bit_depth) { + c->get_pixels = ff_get_pixels_unaligned_16_rvv; + c->get_pixels_unaligned = ff_get_pixels_unaligned_16_rvv; + } else { + c->get_pixels = ff_get_pixels_unaligned_8_rvv; + c->get_pixels_unaligned = ff_get_pixels_unaligned_8_rvv; + } - c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_rvv; + c->diff_pixels = ff_diff_pixels_unaligned_rvv; + c->diff_pixels_unaligned = ff_diff_pixels_unaligned_rvv; } #endif } diff --git a/libavcodec/riscv/pixblockdsp_rvv.S b/libavcodec/riscv/pixblockdsp_rvv.S index 1a364e6dab..e3a2fcc6ef 100644 --- a/libavcodec/riscv/pixblockdsp_rvv.S +++ b/libavcodec/riscv/pixblockdsp_rvv.S @@ -20,7 +20,7 @@ #include "libavutil/riscv/asm.S" -func ff_get_pixels_8_rvv, zve32x +func ff_get_pixels_unaligned_8_rvv, zve32x vsetivli zero, 8, e8, mf2, ta, ma vlsseg8e8.v v16, (a1), a2 vwcvtu.x.x.v v8, v16 @@ -35,14 +35,14 @@ func ff_get_pixels_8_rvv, zve32x ret endfunc -func ff_get_pixels_16_rvv, zve32x +func ff_get_pixels_unaligned_16_rvv, zve32x vsetivli zero, 8, e16, m1, ta, ma vlsseg8e16.v v0, (a1), a2 vsseg8e16.v v0, (a0) ret endfunc -func ff_diff_pixels_rvv, zve32x +func ff_diff_pixels_unaligned_rvv, zve32x vsetivli zero, 8, e8, mf2, ta, ma vlsseg8e8.v v16, (a1), a3 vlsseg8e8.v v24, (a2), a3