From patchwork Sat Oct 12 05:31:41 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: 52232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:998b:0:b0:48e:c0f8:d0de with SMTP id g11csp953302vqn; Fri, 11 Oct 2024 22:31:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXecwioyLZcHj7Yjdo1G2e7eRsXWgO32hmfqx7XeCy/I2v70nZnVJ5ANBWGTjWwT7ctKzyWlufviFou4Ae45hwk@gmail.com X-Google-Smtp-Source: AGHT+IHjxk95TN8HVoNQ2MXhh+j0mRy4pDiA6xf5ZYrf2vA7ciQomGdQ/4+E69corYv87+Uo1h2T X-Received: by 2002:a05:651c:512:b0:2fa:c5e5:629d with SMTP id 38308e7fff4ca-2fb326f7418mr29020961fa.3.1728711112981; Fri, 11 Oct 2024 22:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728711112; cv=none; d=google.com; s=arc-20240605; b=KIIeYLbCRtPz4vwmkNGIjPIBScVknYJ/peEiq+dh1J5zspjH4snfwg8KmneIeWsoRd TdU0nwIWRxUG07VWbNvINrnm2itU6DvJvXUPWID1rlUnetdYPDueWjr7DJ/JOtElaohw 7jJJShIlPZdjhQxzEsxzXjp6hddB3e68p9DdW3zlalzdHweG3Yb1eqKiu3pnhOisGMuW iEb2qZPKvAktfy2Bmv6Vkl6t3MisazivmNPKTzs9e7hcY4CpaOPzcPYQKBcitXo1Ec2W odpv8EB+gqsVGK8SGk6E4tmAzC3jfD01zSuHeg+IsFIteCY9mJpxbJF09+TIVdRFsm5r 1hQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=app3GhN8AOnNNr6m5u1eGtboaLm5EatCF1ipZhW/Xvc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=f6IYcT8mdU+awsZjNrHalLWmUHmgiCgQltClLIGSBHgN0O/4FPqG31yjQ6g2jTvkTY +JMrM+ecT4BEVnqS/N1LsgMVltbou6YwAQa+lYV9060KprVksxtYbqggDxwudyKCcqXi mooS4ffTKRfsFwqLcIxyRNo55B5DxW/6jOOo/73S3ZiXJIUmYeOWLDwl1kM47HcD6baW i6/uq6iEEm7BphY34G3rt3Pc7hNg8JXG7wGvdgCJNkscd/Kt7ArkGZIeUbT5hD7GD1ZK KRhum9WhKmcklueLAVesOiSDGJ+AtgNaVhXBtMFB8J0dOIUWoTVVQFoOdzctLoEz4sM1 Y7TQ==; 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 38308e7fff4ca-2fb40a07de3si2479031fa.484.2024.10.11.22.31.52; Fri, 11 Oct 2024 22:31:52 -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 13F5068DF79; Sat, 12 Oct 2024 08:31:49 +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 2C6FC68DE9B for ; Sat, 12 Oct 2024 08:31:42 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 4F29EC006B for ; Sat, 12 Oct 2024 08:31:41 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Oct 2024 08:31:41 +0300 Message-ID: <20241012053141.37327-1-remi@remlab.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] riscv/vvc: fix UNDEF whilst initialising DSP 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: LZXwz0j0rc5q The current triggers an illegal instruction if the CPU does not support vectors. --- libavcodec/riscv/vvc/vvcdsp_init.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/riscv/vvc/vvcdsp_init.c b/libavcodec/riscv/vvc/vvcdsp_init.c index 0a9f393259..30e8f59a58 100644 --- a/libavcodec/riscv/vvc/vvcdsp_init.c +++ b/libavcodec/riscv/vvc/vvcdsp_init.c @@ -41,10 +41,13 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) { #if HAVE_RVV const int flags = av_get_cpu_flags(); - int vlenb = ff_get_rv_vlenb(); + int vlenb; - if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB) && - vlenb >= 32) { + if (!(flags & AV_CPU_FLAG_RVV_I32) || !(flags & AV_CPU_FLAG_RVB)) + return; + + vlenb = ff_get_rv_vlenb(); + if (vlenb >= 32) { switch (bd) { case 8: c->inter.avg = ff_vvc_avg_8_rvv_256; @@ -55,8 +58,7 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) default: break; } - } else if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB) && - vlenb >= 16) { + } else if (vlenb >= 16) { switch (bd) { case 8: c->inter.avg = ff_vvc_avg_8_rvv_128;