From patchwork Thu Nov 16 16:05:04 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: 44686 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc9c:b0:181:818d:5e7f with SMTP id fx28csp495284pzb; Thu, 16 Nov 2023 08:05:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhXGJbdQlo3TdxE9mn5S7HzvZSLs6a4AELBAEX6poq1dQih7ebT/DF8ikfyTUuJ+x3Smg7 X-Received: by 2002:a05:6402:254c:b0:547:da7:9c10 with SMTP id l12-20020a056402254c00b005470da79c10mr6899672edb.2.1700150730727; Thu, 16 Nov 2023 08:05:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700150730; cv=none; d=google.com; s=arc-20160816; b=NaPZtmGHWZbFCIb402Y/fJeQ+b5p7qMffDKzJHK5i7qwegzlhxz/YvfzVJNPoEPSwc X1BqcdfF2Id6y1z57cgYrGM53Jo+cIbbqAxAmpCxDVseI/VBptM5j6fRnFw3veiu8NiJ Yv69a7K4NeZq+/sfJAWk6HvjYaPtcNiLiz9N1N2WmeePQVTy/MyZyGNbVXpbwMOrE5F6 WqOrW5qA0zKlP9MsNgUIdSi9ZxWS/Wmqq8K1CZMh+SPUG83hk1M6L96gNPxSgcF4LSUH zXg7/o2sbrRilTLDBn5JrW4QuXY5tqChwxD9ObAYmDo65aop6BMEIFjVwrvp0fBmbuyJ eWBA== 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=FbZv0R2DhwcZeMoImVIzVq7enuTYnlLCNIAgTmWP2po=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gQ5yO3orw04nHyb9qgXG5o+DrBVMYcABBLDEkpgj0YokbpkMlFYE8USh7yPXXyfieG hHO10GhhoqXfk4tGv3G0SyPDrdWO1VMECoIIPT1j/kPDM7V1e+hAmHnqlmAXk8Wfgnud V1dOEjcUmKCB/ORgMXqMRmGMcyPyVftE9grFGrMvqen5QGu39Ywxk5ciFBI3a8ohqIEe Zr+cUgeBsiA2YoCJ1BK1TRgbK8wxUcHSNP7i+WxZ855mtKn43HbNsVTYjCvdf3lximec 4BSPsfEnMfRStF8aeDS+P+26fUxZSvXRY4rjRU9M7m/vlW8rxsiTj6UzJ6iRcjUZpLYQ HxGQ== 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 y5-20020aa7d505000000b0054364fcf978si6587713edq.467.2023.11.16.08.05.25; Thu, 16 Nov 2023 08:05:30 -0800 (PST) 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 D506F68CD7E; Thu, 16 Nov 2023 18:05:12 +0200 (EET) 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 76A9B68CD2E for ; Thu, 16 Nov 2023 18:05:05 +0200 (EET) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 137E1C0172 for ; Thu, 16 Nov 2023 18:05:05 +0200 (EET) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Nov 2023 18:05:04 +0200 Message-ID: <20231116160504.37435-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116160504.37435-1-remi@remlab.net> References: <20231116160504.37435-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] checkasm/riscv: report an error upon SIGILL 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: Xw0l40g12zJ/ Terminating the whole checkasm process is not very helpful. This will report if an illegal instruction occurs while executing a tested function. This is a common occurrence whilst developping RISC-V assembler, due to the compatibility between vector configuration and instruction done at run-time. --- tests/checkasm/checkasm.c | 9 +++++++++ tests/checkasm/checkasm.h | 11 +++++++++-- tests/checkasm/riscv/checkasm.S | 12 ++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index c67cf58922..a15e801caf 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -27,6 +27,7 @@ # define _GNU_SOURCE // for syscall (performance monitoring API), strsignal() #endif +#include #include #include #include @@ -734,6 +735,14 @@ int main(int argc, char *argv[]) if (have_vfp(av_get_cpu_flags()) || have_neon(av_get_cpu_flags())) checkasm_checked_call = checkasm_checked_call_vfp; #endif +#if ARCH_RISCV + struct sigaction act = { + .sa_handler = checkasm_handle_signal, + .sa_flags = 0, + }; + + sigaction(SIGILL, &act, NULL); +#endif if (!tests[0].func || !cpus[0].flag) { fprintf(stderr, "checkasm: no tests to perform\n"); diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 8a1df43ab6..61734a8dbb 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -23,6 +23,7 @@ #ifndef TESTS_CHECKASM_CHECKASM_H #define TESTS_CHECKASM_CHECKASM_H +#include #include #include "config.h" @@ -211,14 +212,20 @@ void checkasm_checked_call(void *func, ...); checked_call(func_new, 0, 0, 0, 0, 0, 0, 0, __VA_ARGS__,\ 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0)) #elif ARCH_RISCV -void checkasm_set_function(void *); +void checkasm_set_function(void *, sigjmp_buf); void *checkasm_get_wrapper(void); +void checkasm_handle_signal(int signum); #if (__riscv_xlen == 64) && defined (__riscv_d) #define declare_new(ret, ...) \ + int checked_call_signum = 0; \ + sigjmp_buf checked_call_jb; \ ret (*checked_call)(__VA_ARGS__) = checkasm_get_wrapper(); #define call_new(...) \ - (checkasm_set_function(func_new), checked_call(__VA_ARGS__)) + (checkasm_set_function(func_new, checked_call_jb), \ + (checked_call_signum = sigsetjmp(checked_call_jb, 1)) == 0 \ + ? checked_call(__VA_ARGS__) \ + : (checkasm_fail_signal(checked_call_signum), 0)) #endif #else #define declare_new(ret, ...) diff --git a/tests/checkasm/riscv/checkasm.S b/tests/checkasm/riscv/checkasm.S index b902ab1043..30d3f3d8bb 100644 --- a/tests/checkasm/riscv/checkasm.S +++ b/tests/checkasm/riscv/checkasm.S @@ -41,6 +41,7 @@ endconst checked_func: .quad 0 + .quad 0 saved_regs: /* Space to spill RA, SP, GP, TP, S0-S11 and FS0-FS11 */ @@ -52,6 +53,7 @@ func checkasm_set_function la.tls.ie t0, checked_func add t0, tp, t0 sd a0, (t0) + sd a1, 8(t0) ret endfunc @@ -175,4 +177,14 @@ func checkasm_get_wrapper, v call checkasm_fail_func j 4b endfunc + +func checkasm_handle_signal + mv a1, a0 + la.tls.ie a0, checked_func + add a0, tp, a0 + ld a0, 8(a0) + beqz a0, 8f + tail siglongjmp +8: tail abort /* No jump buffer to go to */ +endfunc #endif