From patchwork Thu Jun 27 19:04:33 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: 50198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2d88:b0:482:c625:d099 with SMTP id jb8csp15665vqb; Thu, 27 Jun 2024 12:04:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfNVniCTdyi+1jLJGFFmJAfKflkYWVfVB/K+mhxNlPItJO9JyLCO+qa4aA0nOKNPGYAhKbmemqIaWIcUSddmVeNRUiz6fEPQtcdg== X-Google-Smtp-Source: AGHT+IFvE2pBisdiZVniY1GEwy8jXLwtxHQRKJ61r3n5MvgjCACWOoTT/0Gu9Krl0PLJ/woI1xEX X-Received: by 2002:a50:ccd0:0:b0:57d:4fbc:3e61 with SMTP id 4fb4d7f45d1cf-57d4fbc40a2mr11003473a12.4.1719515097749; Thu, 27 Jun 2024 12:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719515097; cv=none; d=google.com; s=arc-20160816; b=qk+i9EgZ/FgbmqUYajET1JYu5gyb07m/BmAebEF80bFj/i77DcVAFBszQEtGG2M0QX YLIDYpJUsrZUUeWGNHR7fJykrax3fcqE6X9NRzpWc342tR6vhYuzFM4zCrBPpMB4dHm0 l0GJptQ5DSWmOlS0ksK6a5qgDsCtfXpKY0wagfJ5mhTtZXdS7GuAfVYbmYESXLZ1+Qts 8DovnHsWpwMPh1t0mEwHhmvwxNvJALT1qXE0bTFFNNbpLV7zrgciicQKORgnIAP1vmzE lrfa3M9FnAkO7DlNp7j07Sr/F9bCzkwxuNg94coZLgZ84+07nHV4UrqlTBYYsC/J35ie P2AA== 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=tauzzZGnRMrdfd6FqIdg4by3JlY1BQPFzg3MGXrElsM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QSN8XKkuaLUZzdNn8v32j3669A1eZUxTFyXYFZJEpzyigaDV5H5YGrHNUOtRlF0cSR ECMssaIy4CWf5bnMK1J2nzeTjbuEB0LW/HbgTfup+UFQfNcUDbYVVMH2x6pDq6+PnFZA iv0ezZLALvDow9hJDN7OpF0UpiM25R2zZNrGCvXmOcPqC07vxbfY3L5I32lQjyfnm4Wn /qL8M4RN6P7cNRS93RqowGv02X0bUVsJMaDzPTOIa2FA8EJRtA12rImn1Pqhj/770Lkh YFVV9I+xFh6H/0tD2bJsJDLpilPsQBoS6BZ9JwV68cZiPfbT98ZBkD26li7HkXjprAqa DpEw==; 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 4fb4d7f45d1cf-58613de02e7si36716a12.168.2024.06.27.12.04.57; Thu, 27 Jun 2024 12:04:57 -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 2107C68D622; Thu, 27 Jun 2024 22:04:46 +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 91FC068CDFE for ; Thu, 27 Jun 2024 22:04:36 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id A0D4AC013B for ; Thu, 27 Jun 2024 22:04:35 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2024 22:04:33 +0300 Message-ID: <20240627190435.12159-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/vc1dsp: factor R-V V inv_trans_8 code 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: 5AxkjKyRNFKB --- libavcodec/riscv/vc1dsp_rvv.S | 64 +++++++++++++---------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 7e1fb84b0c..b3a1f55ab9 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -165,6 +165,7 @@ func ff_vc1_inv_trans_8_rvv, zve32x vsll.vi v23, v7, 4 vsub.vv v20, v20, v21 vsub.vv v22, v22, v23 + srli t2, t1, 2 vadd.vv v0, v28, v16 vadd.vv v19, v20, v22 # t4 vadd.vv v1, v29, v17 @@ -174,6 +175,14 @@ func ff_vc1_inv_trans_8_rvv, zve32x vsub.vv v5, v30, v18 vsub.vv v6, v29, v17 vsub.vv v7, v28, v16 + beqz t2, 1f # faster than 4x add t2=zero + .irp n,4,5,6,7 + vadd.vi v\n, v\n, 1 + .endr +1: + .irp n,0,1,2,3,4,5,6,7 + vssra.vx v\n, v\n, t1 + .endr jr t0 endfunc @@ -220,35 +229,22 @@ func ff_vc1_inv_trans_8x8_rvv, zve32x addi a7, a0, 7 * 8 * 2 vle16.v v6, (a6) vle16.v v7, (a7) + li t1, 3 jal t0, ff_vc1_inv_trans_8_rvv - .irp n,0,1,2,3,4,5,6,7 - vssra.vi v\n, v\n, 3 - .endr vsseg8e16.v v0, (a0) .irp n,0,1,2,3,4,5,6,7 vle16.v v\n, (a\n) .endr + li t1, 7 jal t0, ff_vc1_inv_trans_8_rvv - vadd.vi v4, v4, 1 - vadd.vi v5, v5, 1 - vssra.vi v4, v4, 7 - vssra.vi v5, v5, 7 - vse16.v v4, (a4) - vadd.vi v6, v6, 1 - vse16.v v5, (a5) - vadd.vi v7, v7, 1 - vssra.vi v6, v6, 7 - vssra.vi v7, v7, 7 - vse16.v v6, (a6) - vssra.vi v0, v0, 7 - vse16.v v7, (a7) - vssra.vi v1, v1, 7 vse16.v v0, (a0) - vssra.vi v2, v2, 7 vse16.v v1, (a1) - vssra.vi v3, v3, 7 vse16.v v2, (a2) vse16.v v3, (a3) + vse16.v v4, (a4) + vse16.v v5, (a5) + vse16.v v6, (a6) + vse16.v v7, (a7) ret endfunc @@ -256,10 +252,8 @@ func ff_vc1_inv_trans_8x4_rvv, zve32x csrwi vxrm, 0 vsetivli zero, 4, e16, mf2, ta, ma vlseg8e16.v v0, (a2) + li t1, 3 jal t0, ff_vc1_inv_trans_8_rvv - .irp n,0,1,2,3,4,5,6,7 - vssra.vi v\n, v\n, 3 - .endr vsseg8e16.v v0, (a2) addi a3, a2, 1 * 8 * 2 vsetivli zero, 8, e16, m1, ta, ma @@ -323,33 +317,21 @@ func ff_vc1_inv_trans_4x8_rvv, zve32x addi t1, a2, 7 * 8 * 2 vle16.v v6, (t6) vle16.v v7, (t1) - + li t1, 7 jal t0, ff_vc1_inv_trans_8_rvv - vadd.vi v4, v4, 1 add t0, a1, a0 - vadd.vi v5, v5, 1 - vadd.vi v6, v6, 1 - add t1, a1, t0 - vadd.vi v7, v7, 1 - vssra.vi v0, v0, 7 - add t2, a1, t1 - vssra.vi v1, v1, 7 - vssra.vi v2, v2, 7 - add t3, a1, t2 - vssra.vi v3, v3, 7 - vssra.vi v4, v4, 7 - add t4, a1, t3 - vssra.vi v5, v5, 7 - vssra.vi v6, v6, 7 - add t5, a1, t4 - vssra.vi v7, v7, 7 vle8.v v8, (a0) - add t6, a1, t5 + add t1, a1, t0 vle8.v v9, (t0) + add t2, a1, t1 vle8.v v10, (t1) + add t3, a1, t2 vle8.v v11, (t2) + add t4, a1, t3 vle8.v v12, (t3) + add t5, a1, t4 vle8.v v13, (t4) + add t6, a1, t5 vle8.v v14, (t5) vle8.v v15, (t6) vsetvli zero, zero, e8, mf4, ta, ma From patchwork Thu Jun 27 19:04:34 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: 50199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2d88:b0:482:c625:d099 with SMTP id jb8csp15769vqb; Thu, 27 Jun 2024 12:05:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsEudLn761Euedt0SvAzIru2uC4YBT4Tq82lCrHAOaPSR7/v/1MXp0k03WxtbKvpn/cwBLHMajKLrx1XawSZu3WQ6fxYpJFJv3wg== X-Google-Smtp-Source: AGHT+IHqVmmRZ4DdL1y7OmErlEWWILhDyVyJN/4BJfNQO0aZRUYyTeiUc9LcdDwnPWVq2cKPIlgg X-Received: by 2002:a05:6402:34ce:b0:586:1517:872c with SMTP id 4fb4d7f45d1cf-58615178745mr52657a12.15.1719515107229; Thu, 27 Jun 2024 12:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719515107; cv=none; d=google.com; s=arc-20160816; b=H0yxQSul/J+sGJljzDG3diM32WUOV9m6A3LjRqYmHCXIsMWAwrh0CxeHE9voykiKFg xECAJH5CivcZDwcaji8FWV+MbUmV0rJboX566DxKPA9mYk9wbaWDBRlsJi8CsqXr2skp TE6cm9Yfce8oSTpPKszsqIkiiJT1/5v21dlewfV2Qfci2zVGT7ll3TQBlYdQvTXW2d/V qNYdHIgXNtHm6mJZtcOoxMXcFmqAwICb7E5Suu2AsagsTPF5SIx83SWM4tIukNqy1ztl TqumnIkOasY/qaxCzGGGcVA6MGLKT5GQzlKXoXZNwwQOdveWdP5Wu/uoq9tB/IE0Mdve ZRIQ== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=NTzKMzxfxDBH9bgbqRcKML0afgBfuoDWlNimyjGbHYk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WTJ2aGZhLzVA3kXMFJmrSpSarRDYQ/VFzUZuCKPWVmThuq19S7BKCEiFsVAJu1Ep9I SWVgKk/QWjqzAjWGCZD87u3AckFzxQTRQrZix87AqvdTQ2+TpycU3xVsWr08XH8CZOYN K6ENUTy6EYvsgyQNb2cEs008aTMqyQv5DiTSSeCfCPffHu/AYm0a0kk0ejrJ+hIyw9CG lUSHe2PfnrT1K8QNDVPWf2smBYJtouEpX55c4f0xVuBAq4TMjd5/9DKP+CjeReTvmouX AzRNjTz3nIH8jZ+51jzVEyyH9Wr7uHg8jTyc49ubHNt6FNBphL/m01R4fPd699egcjVk wJKg==; 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 4fb4d7f45d1cf-58615465cf6si28694a12.574.2024.06.27.12.05.06; Thu, 27 Jun 2024 12:05:07 -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 6C9F068D656; Thu, 27 Jun 2024 22:04:47 +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 952AA68D478 for ; Thu, 27 Jun 2024 22:04:36 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id D49BBC013D for ; Thu, 27 Jun 2024 22:04:35 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2024 22:04:34 +0300 Message-ID: <20240627190435.12159-2-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240627190435.12159-1-remi@remlab.net> References: <20240627190435.12159-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vc1dsp: fix overflow in R-V V inv_trans_8 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: p1xY05vePaix The last set of additions/subtractions can break the 16-bit limit, and require 17 bits of precision. This uses widening adds accordingly to fix the MSS2 FATE tests. --- libavcodec/riscv/vc1dsp_rvv.S | 37 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index b3a1f55ab9..d038981a02 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -145,44 +145,49 @@ func ff_vc1_inv_trans_8_rvv, zve32x vadd.vv v20, v20, v21 vadd.vv v22, v22, v23 vsll.vi v21, v3, 2 - vadd.vv v16, v20, v22 # t1 + vadd.vv v24, v20, v22 # t1 vmul.vx v20, v1, t5 vsll.vi v22, v5, 4 vmul.vx v23, v7, t3 vsub.vv v20, v20, v21 vadd.vv v22, v22, v23 vsll.vi v21, v3, 4 - vsub.vv v17, v20, v22 # t2 + vsub.vv v25, v20, v22 # t2 vmul.vx v20, v1, t3 vsll.vi v22, v5, 2 vmul.vx v23, v7, t5 vsub.vv v20, v20, v21 vadd.vv v22, v22, v23 vmul.vx v21, v3, t3 - vadd.vv v18, v20, v22 # t3 + vadd.vv v26, v20, v22 # t3 vsll.vi v20, v1, 2 vmul.vx v22, v5, t5 vsll.vi v23, v7, 4 vsub.vv v20, v20, v21 vsub.vv v22, v22, v23 + vadd.vv v27, v20, v22 # t4 srli t2, t1, 2 - vadd.vv v0, v28, v16 - vadd.vv v19, v20, v22 # t4 - vadd.vv v1, v29, v17 - vadd.vv v2, v30, v18 - vadd.vv v3, v31, v19 - vsub.vv v4, v31, v19 - vsub.vv v5, v30, v18 - vsub.vv v6, v29, v17 - vsub.vv v7, v28, v16 + vwadd.vv v8, v28, v24 + vwadd.vv v10, v29, v25 + vwadd.vv v12, v30, v26 + vwadd.vv v14, v31, v27 beqz t2, 1f # faster than 4x add t2=zero - .irp n,4,5,6,7 + .irp n,31,30,29,28 vadd.vi v\n, v\n, 1 .endr 1: - .irp n,0,1,2,3,4,5,6,7 - vssra.vx v\n, v\n, t1 - .endr + vwsub.vv v16, v31, v27 + vwsub.vv v18, v30, v26 + vwsub.vv v20, v29, v25 + vwsub.vv v22, v28, v24 + vnclip.wx v0, v8, t1 + vnclip.wx v1, v10, t1 + vnclip.wx v2, v12, t1 + vnclip.wx v3, v14, t1 + vnclip.wx v4, v16, t1 + vnclip.wx v5, v18, t1 + vnclip.wx v6, v20, t1 + vnclip.wx v7, v22, t1 jr t0 endfunc From patchwork Thu Jun 27 19:04:35 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: 50197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2d88:b0:482:c625:d099 with SMTP id jb8csp15579vqb; Thu, 27 Jun 2024 12:04:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzkNmVfgCWQh4NMiUTHU4o6IGNLSLD1vSf42LcE/AdsL1F7BJ+yqS5eWlubLap4IdiiOqxYnjqsKMkXovuaFQFyJfbqB5oEO3syA== X-Google-Smtp-Source: AGHT+IEjnCUx6NHMA9lq19r0VsnPHr/mQ9VEHO6UCSJllqzazZr14bmTuNjUARZi4fdPwj5aZXWc X-Received: by 2002:a05:6402:40c9:b0:584:8feb:c3a1 with SMTP id 4fb4d7f45d1cf-5848febc3f6mr3275294a12.1.1719515087182; Thu, 27 Jun 2024 12:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719515087; cv=none; d=google.com; s=arc-20160816; b=t2jXTXWFK7GM0Mga4iISdRfLSp9WK1HGtUde492g5bDP/NLCA3rz3m1XSN8ZMN6l0t bjwRekr3rPsWTgSQD7XYHkd7ejcHyjPArxadzWpt2Mvtdl84DVLp7xS0WPw3+EOybmeJ EYY48xbCzMc+yWBEvcCMe9SZ+4h7B4n4rkH6YYUaB3z/4HA3iDyMo/mfcRuXJotyWYVf 9ryXE5Qqa71zdizzGdqgHcSyc4DOq1QHzQNK5N10iktaZGA0Zttajv1HAAVEXj2z6C1Q MyTuGIIQ6V6821xUqeTw0Jis3FNTx3D/IxO2m+vnxfKaxNkMWczr77CvWOdnZ0nQ1aPI khWg== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Gm7yLxBrh67SE7aRngtkgmgURrrO2Jbt2p/UDq9l6g0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=y9uJxQtJQsgER4697MRL9PMls88wNPbKYNpQYcn8lAxBF0i3mHY3yHZ1ZkrsJBxicX 1A9loweuKRDD3BTP4Sp+O+32ckIX5Lr1K+GNZLCWl0eCpYJJqOO+M4xcaRpjQF6msYZp R6Xx9nEf4FS0vFNdfkWewMYhzp8zk9tE9xnXlHACtveKTk/myQ4KtG7ua10mVWLEiY79 TxPBwsWtKkBNW5+XoNrLgyFY6mh1pFI2QAlYYK8xzGwtJHsT/qLtq6/mT3h6xS2G8dGy cVPppE4YBwCoFrR2k00DqHDAXMIf5QX75JoFdSR3I/hMSSsE9JYFQyBVN8kPrvaHYUNR Heug==; 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 4fb4d7f45d1cf-58615038266si32216a12.312.2024.06.27.12.04.46; Thu, 27 Jun 2024 12:04:47 -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 5F84C68D5D2; Thu, 27 Jun 2024 22:04:44 +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 93CEC68D3C1 for ; Thu, 27 Jun 2024 22:04:36 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 06C86C02F8 for ; Thu, 27 Jun 2024 22:04:35 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2024 22:04:35 +0300 Message-ID: <20240627190435.12159-3-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240627190435.12159-1-remi@remlab.net> References: <20240627190435.12159-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vc1dsp: fix potential overflow in R-V V inv_trans_4 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: e/Wv8c7QmY9E Judging by the coefficients, the last round of add/sub can overflow to 17 bits with a very small probability just as with the 8-point transform. This is not observed under FATE, but better safe than sorry. --- libavcodec/riscv/vc1dsp_rvv.S | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index d038981a02..e857805ccf 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -206,13 +206,14 @@ func ff_vc1_inv_trans_4_rvv, zve32x vmul.vx v20, v1, t2 vadd.vv v26, v14, v16 # t3 vsub.vv v27, v18, v20 # t4 - vadd.vv v0, v24, v26 - vsub.vv v1, v25, v27 - vadd.vv v2, v25, v27 - vsub.vv v3, v24, v26 - .irp n,0,1,2,3 - vssra.vx v\n, v\n, t1 # + 4 >> 3 or + 64 >> 7 - .endr + vwadd.vv v8, v24, v26 + vwsub.vv v10, v25, v27 + vwadd.vv v12, v25, v27 + vwsub.vv v14, v24, v26 + vnclip.wx v0, v8, t1 + vnclip.wx v1, v10, t1 + vnclip.wx v2, v12, t1 + vnclip.wx v3, v14, t1 jr t0 endfunc