From patchwork Thu Jul 25 18:15:23 2024 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: 50734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a830:0:b0:482:c625:d099 with SMTP id z16csp15686vqo; Thu, 25 Jul 2024 11:15:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXSssWkME0OipTRMg9minn9I7DlXkRrl0C05LqTWLKNA2bd6QOyqrK8hXvdw4VODmViluqM9C8yiunow/BYeO5w0orZ6QfE9d9Y3w== X-Google-Smtp-Source: AGHT+IGrVmUfF4B/z0ViLfxTeZNkGRv/pxEmISrW3LwWnElDYJkxY5BVakeGtGE+f0cB+nU+kVGx X-Received: by 2002:a17:907:6d06:b0:a77:d85c:86fa with SMTP id a640c23a62f3a-a7ac5129d70mr289554866b.13.1721931335670; Thu, 25 Jul 2024 11:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721931335; cv=none; d=google.com; s=arc-20160816; b=zDGSxO2CIbLoyJOA31+lCWfzgcLfFoC8IcAkYb+dyA7CcxHBJnT7xoYXYAHf0lMGHS cxybVwx0QqNj0s4PT2yMYb6jEKB784irRh2uJzQSuThCJsBNGRWpgzhbuKkXWsE3nR/3 m4bf738yfVrIvoGR7mhgxp4+097j/bw/l82tCQEFLVFLMnhmUsf4ZQ94lm0/gwZmv3cC YFVtpxJuSs64dJyJUUQJ9gax7A1WoXH200AhKFC6s0cwegH8KNFGabmH+va8JcJx2lHb Mp0viWX0R4IMlDZnvkuAgTHQ4EI30Q03Nq9k0Pf5+CzhmMSmfzPRg2I4picMWEIrofIA lrsw== 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=PErOWVPjXvUU6GhA33+3RatKg3oDORyUuphNa6yvWn8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=YWE7kdupENfg8Evopnwgb41dzEIeN+vZgIVCu10AJK332RKnaukhc4/cBwmKPiPS62 l0kdNIV9Q2tt1TSjSxuUw6ujmsOTps2km7DRHksHTrobAetZ7Fqt3OPcnW2Sw1+9oJok HYbiJ1m5s2GT6c5wOrRp+PGl+MEGbRxd3awnCJk1CMt8/USfa1ZnydutFsJtQWr8MgRO I8M99nXbqZrTkZ0Oyhiyf1rTKzwkGqqsQAfppiWussxvDLxWOOL9bRvfVq/MJZq7Y6Mt Gtlt/izhbrkhiJbs/ZqMOLQND5vkBCXUOfGFA2D0qgmOzdRvdtf01gxuLmeWlhimJlel hpHQ==; dara=google.com 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 a640c23a62f3a-a7acab3d250si137576466b.482.2024.07.25.11.15.35; Thu, 25 Jul 2024 11:15:35 -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 A601B68D726; Thu, 25 Jul 2024 21:15:31 +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 86D4668D097 for ; Thu, 25 Jul 2024 21:15:24 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 2223CC013B for ; Thu, 25 Jul 2024 21:15:24 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jul 2024 21:15:23 +0300 Message-ID: <20240725181523.93924-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/h264dsp: use saturing add/sub for R-V V 8-bit DC add 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: WUrwmoWy7EoX T-Head C908 (cycles): h264_idct4_dc_add_8bpp_c: 109.2 h264_idct4_dc_add_8bpp_rvv_i32: 34.5 (before) h264_idct4_dc_add_8bpp_rvv_i32: 25.5 (after) h264_idct8_dc_add_8bpp_c: 418.7 h264_idct8_dc_add_8bpp_rvv_i64: 69.5 (before) h264_idct8_dc_add_8bpp_rvv_i64: 33.5 (after) --- libavcodec/riscv/h264dsp_init.c | 5 +++-- libavcodec/riscv/h264idct_rvv.S | 28 ++++++++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 836c073559..671330d664 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -98,8 +98,8 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_idct_add = ff_h264_idct_add_8_rvv; dsp->h264_idct8_add = ff_h264_idct8_add_8_rvv; - dsp->h264_idct_dc_add = ff_h264_idct4_dc_add_8_rvv; if (flags & AV_CPU_FLAG_RVB) { + dsp->h264_idct_dc_add = ff_h264_idct4_dc_add_8_rvv; dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; # if __riscv_xlen == 64 @@ -108,7 +108,8 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, } if (flags & AV_CPU_FLAG_RVV_I64) { dsp->h264_add_pixels8_clear = ff_h264_add_pixels8_8_rvv; - dsp->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_rvv; + if (flags & AV_CPU_FLAG_RVB) + dsp->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_rvv; } dsp->h264_add_pixels4_clear = ff_h264_add_pixels4_8_rvv; } diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index a49a32c47e..3c547f1eb0 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -416,33 +416,41 @@ endfunc .endr .macro idct_dc_add8 width -func ff_h264_idct\width\()_dc_add_8_rvv, zve64x +func ff_h264_idct\width\()_dc_add_8_rvv, zve64x, b .if \width == 8 vsetivli zero, \width, e8, mf2, ta, ma .else vsetivli zero, \width, e8, mf4, ta, ma .endif lh t0, 0(a1) + li t1, 255 addi t0, t0, 32 srai t0, t0, 6 sh zero, 0(a1) .if \width == 8 li a6, \width * \width vlse64.v v24, (a0), a2 - vsetvli zero, a6, e16, m8, ta, ma + vsetvli zero, a6, e8, m4, ta, ma .else vlse32.v v24, (a0), a2 - vsetivli zero, \width * \width, e16, m2, ta, ma + vsetivli zero, \width * \width, e8, m1, ta, ma .endif - vzext.vf2 v0, v24 - vadd.vx v0, v0, t0 - vmax.vx v0, v0, zero -.if \width == 8 - vsetvli zero, zero, e8, m4, ta, ma + bgez t0, 1f + + neg t0, t0 + minu t0, t0, t1 + vssubu.vx v24, v24, t0 + .if \width == 8 + vsetivli zero, \width, e8, mf2, ta, ma + vsse64.v v24, (a0), a2 .else - vsetvli zero, zero, e8, m1, ta, ma + vsetivli zero, \width, e8, mf4, ta, ma + vsse32.v v24, (a0), a2 .endif - vnclipu.wi v24, v0, 0 + ret +1: + minu t0, t0, t1 + vsaddu.vx v24, v24, t0 .if \width == 8 vsetivli zero, \width, e8, mf2, ta, ma vsse64.v v24, (a0), a2