From patchwork Sun May 26 12:19:16 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: 49272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2718907vqf; Sun, 26 May 2024 05:19:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrBEFjvGAKWSm1WM9dNrVjupBQjlZrGuYrrzEWSmo7wprY/fBLojyDWakzpMArCwfQFmyRXJIt9wYFcl9goqmOCrKYYbO18EKipA== X-Google-Smtp-Source: AGHT+IHWM1+6AABKJsqbF6gKvBsQ8PhBBpJyoo3Weaam13a/FAZQthfWpkbhU29p2tcuOp9Byt0w X-Received: by 2002:ac2:4c4d:0:b0:523:96ad:51a8 with SMTP id 2adb3069b0e04-5296410992cmr6360923e87.7.1716725967065; Sun, 26 May 2024 05:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716725967; cv=none; d=google.com; s=arc-20160816; b=p9HOQhLwwHAKcgDP+k0VdOJBp28lBtX79uWtM3Ispc4pCmzVu6Km+Z7raPYINvI37+ tgci7FJmBh37HGdTiSdDKrZ1KL/jH8Hc2pbO2zYOXr3GwIk77MVrzwbrqpvkmH+cGZVa NcyODiyMsX7b9isob8eQsWOSWCF27nDTkDhoCDIc/DR74XDmb7NWxAbtREr3cwPCanUU q7rholEMLmr1XYJB4PPF0OnU/I+AcpkdcYb68MPklAXqxUSs7FtXAWTxxbHiORsOxVft QFWUD5ahAyz8elRT+xdQyv/JVhhkNNHH9vA7zvXD+Sr/sVk3x8Lpi7GcZzRp8LnUtNaG xTzQ== 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=nejq1hDmIUUkvVepNoPs1aTdcO97kxFaawYpJUJ5k9c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CIOM7iP0QM/hCDRCJswUzuvpLwss/8n5ZT+Euc7h09fU5iQG3/zT2MPY81xkD6W7op s01PEYyjw8702TxLiHbBU36XFA9AP29NyqI4sFdYoEz4MQw6ioMxJRq3gw5p1JyGyo8P NzaPIPSq03wjOalqsuhFywShVsULF2vwMON1XRC8M+hgfEwwtEQN6yWNOEQwxTNa4lWc BuiDVUIdjPGkQYGTRpdkNV+mfUeRy10kd0LT1E3JgZU6Jz5tTVBvg/Rv3NwVy36zskA0 t77Ha+p5pPZ7OkkMS4jVXN5ORg3ie+7QnsOlq3RC9px2RSklzoZRv95kvYsBqM195UPv IvNQ==; 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-5785246166csi2857531a12.305.2024.05.26.05.19.26; Sun, 26 May 2024 05:19:27 -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 6FE9368D536; Sun, 26 May 2024 15:19:23 +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 45DCF68D271 for ; Sun, 26 May 2024 15:19:17 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 9AD8DC006F for ; Sun, 26 May 2024 15:19:16 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 15:19:16 +0300 Message-ID: <20240526121916.31735-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vp8dsp: disable EPEL HV on RV128 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: dNTQnOOJY8F7 RV128 is mostly scifi at this point, so we can just disable it here (the EPEL HV prologue/epilogue do not save 128-bit registers). --- libavcodec/riscv/vp8dsp_init.c | 3 ++- libavcodec/riscv/vp8dsp_rvv.S | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 86927907e0..92e3366290 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -97,7 +97,7 @@ av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) c->put_vp8_epel_pixels_tab[0][1][0] = ff_put_vp8_epel16_v4_rvv; c->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_rvv; c->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_rvv; - +#if __riscv_xlen <= 64 c->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_rvv; c->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_rvv; c->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_rvv; @@ -110,6 +110,7 @@ av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) c->put_vp8_epel_pixels_tab[0][1][2] = ff_put_vp8_epel16_h6v4_rvv; c->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_rvv; c->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_rvv; +#endif } #endif #endif diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index c79a8afacf..292e5951e9 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -321,8 +321,10 @@ epel \len 6 h epel \len 4 h epel \len 6 v epel \len 4 v +#if __riscv_xlen <= 64 epel_hv \len 6 6 epel_hv \len 4 4 epel_hv \len 6 4 epel_hv \len 4 6 +#endif .endr