From nobody Tue Sep 9 01:17:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1756868585; cv=none; d=zohomail.com; s=zohoarc; b=P4yaBRfN6NKWpyEaAmYFx6NN7AquYSWlklExSFAXjwfNv3JuHkJ1roYoFJ9EVLLOLH7kReks+38XFkMxCm288zzpqBd7pT+mGcInQjqyweBf2PWIwtuS3oai4YTOFxrsxK8uSEIYyG5WaVnHR+GGZiD6ub1iBYDU1QJyKdEbI4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756868585; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=X1j899pl22JtW9r5ApQKmblG74uGWH6HLNrTnd5Uu8o=; b=E8u+pzaw80fwyF0jCM1govjxqMXfTwm2uHhZtpfbh4AvQtBbJauEeQEpNjbumzYKJA+UsWu8C7He/KFkqWzFgshWOlcF65hqiEqSOr3e0/DS15P/qw2PBOBcYz7+NOMoM2fCR0XO2ArJ97VwsEcVsFiTUeNh0edbW7GYfQ52L0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175686858509518.652665708938684; Tue, 2 Sep 2025 20:03:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utdlJ-0000Hd-Nt; Tue, 02 Sep 2025 23:02:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utdky-0008QF-Tq; Tue, 02 Sep 2025 23:01:56 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utdku-00077R-0e; Tue, 02 Sep 2025 23:01:56 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-772301f8ae2so3600729b3a.0; Tue, 02 Sep 2025 20:01:51 -0700 (PDT) Received: from lima-default (123.253.189.97.qld.leaptel.network. [123.253.189.97]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7725e419913sm6971760b3a.55.2025.09.02.20.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 20:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756868510; x=1757473310; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X1j899pl22JtW9r5ApQKmblG74uGWH6HLNrTnd5Uu8o=; b=QS/H3wcWVQn9lEpW5pF+K7B5DHNNlb1yYhZ1KykJYJLayAgJN1E9ngHM0xC8v/Qw44 94I7qJT0JH9GIrf6YJulLIs9lTkcnXYzsh/krnFGC3SA5KIAwOxFEqXmepMxLGozL3ce UXnO+HHQYbZZ0Tsb6WGBgoopdB5HOwPKAYdddI+4VuBIWgsgg04U+I0ASRxEXN1SWrz6 dlAUXZpMpfdOCm5Otxvriu8NVjzJDAHExjOms7kX5sOK1RPAWFw1AP24WpLrSX2Ug0lJ lL5rGmDTC0q2E/LVpGyYfE+tbPQddRVNqrntcRZTGIM/I5NkcAVWDy4SKkctd3YIjwN7 5cRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756868510; x=1757473310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X1j899pl22JtW9r5ApQKmblG74uGWH6HLNrTnd5Uu8o=; b=KUOkQHeK+SLTZ3jheWkjgioZY4ERHoo9YgKx5G6H1HcI543xms6HuDPGLbVEkfsvIT Vp7At1I2o9boYGbnDWP+FVmk57uNIchaOyldgjVkkNljkKH0v95G+eeDfHSi6H03H4xg BeLIdDNSHYOCrWdGQ4lg8hlF7gISVTEMuWaqGdzHmy1q1nlyh5A7yenHX4uB+ySzHQ5z J5V1Z/QhWKuQnAePhZPJbUyR+umAH94+vrDwlieE/+OWEa1TUCCHdzpuMplKUDJcpJPH 30dbDa6rzZ1LFynebjghUjlReDNBVxcFcYt94YefmuKtZtkO7h6pdvoD5oinafIka3qL VyTQ== X-Forwarded-Encrypted: i=1; AJvYcCVaCXDUihOY8MXqaFzjA1+u3PIAA0ge+z+P0SEI+VGcKF1x1pUfOU/KN+7wRM4OK93FVlwQH9QReSp7@nongnu.org X-Gm-Message-State: AOJu0YyGqXh89/DklCeO57e9ewobaWTqxDTofN4egXv5cnqTPPmZvbHm 7HSx4VnpBxKHOIGkkmOnorL9DW4gkO4Kv6BUGsGNm+TuoroJzrwKhuIJAhf1MQ== X-Gm-Gg: ASbGnctyiD0v9kVCSENbyVqTe5Ddix6QJiixLLyNdIfmzxaEJ4LTuB4RhfS/Nohg0ht YGdfaQOC5+MZsRh1+5J6lX+fiGCPhWoJVZnO23s/ziw4VEUeUs/YTRnpMcvOHm8WFAJUN0QxDaW azt31KV20JKMqnL1livgJq0oTOYDks/VlrGg4jc/8jJ8CYQWWS/DhLdKdNxa6yso7BSlszTScCZ gY9MCqdAyobtAsAGOEhYJT0xKVh0E0sUyDtjmNxUXRVBkjlGBjBrrsh+8BUiHp982iLeh5alBfQ NYG7kzzqBjE7ArL2dRIZKW80uffMIRfc/erTbEyqvoZjBHIBj48jm+jY+BxDZm2gelLekgaHTUd yI+7O0vew2jGJuzNd2TQqqTBuJa2txFsZ7YwOr0WiZok7Mk6lM2weoQ1kFhSwMKM2Tl3nO9OfPg == X-Google-Smtp-Source: AGHT+IE5kv3s6SQvz3CK8rx/1SR4RFv554LJjw8epiQEhdcAh3WDdcJuS/jccu1rTdQV6tkSA/BJXw== X-Received: by 2002:a05:6a00:2306:b0:76e:885a:c32c with SMTP id d2e1a72fcca58-7723e349ebamr14672297b3a.26.1756868509798; Tue, 02 Sep 2025 20:01:49 -0700 (PDT) From: Nicholas Piggin To: qemu-riscv@nongnu.org Cc: Nicholas Piggin , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-devel@nongnu.org, Chao Liu Subject: [PATCH 3/3] tests/tcg: Add riscv test for interrupted vector ops Date: Wed, 3 Sep 2025 13:01:13 +1000 Message-ID: <20250903030114.274535-4-npiggin@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903030114.274535-1-npiggin@gmail.com> References: <20250903030114.274535-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=npiggin@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1756868586199116600 Content-Type: text/plain; charset="utf-8" riscv vector instructions can be interrupted with a trap, and partial completion is recorded in the vstart register. Some causes are implementation dependent, for example an asynchronous interrupt (which I don't think TCG allows). Others are architectural, typically memory access faults on vector load/store instructions. Add some TCG tests for interrupting vector load instructions and resuming partially completed ones. This would have caught a recent (now reverted) regression in vector stride load implementation, commit 28c12c1f2f50d ("Generate strided vector loads/stores with tcg nodes.") Signed-off-by: Nicholas Piggin --- tests/tcg/riscv64/Makefile.target | 5 + tests/tcg/riscv64/test-interrupted-v.c | 208 +++++++++++++++++++++++++ 2 files changed, 213 insertions(+) create mode 100644 tests/tcg/riscv64/test-interrupted-v.c diff --git a/tests/tcg/riscv64/Makefile.target b/tests/tcg/riscv64/Makefile= .target index 19a49b6467..8f4690ac57 100644 --- a/tests/tcg/riscv64/Makefile.target +++ b/tests/tcg/riscv64/Makefile.target @@ -23,3 +23,8 @@ run-test-fcvtmod: QEMU_OPTS +=3D -cpu rv64,d=3Dtrue,zfa= =3Dtrue TESTS +=3D test-vstart-overflow test-vstart-overflow: CFLAGS +=3D -march=3Drv64gcv run-test-vstart-overflow: QEMU_OPTS +=3D -cpu rv64,v=3Don + +# Test for interrupted vector instructions +TESTS +=3D test-interrupted-v +test-interrupted-v: CFLAGS +=3D -march=3Drv64gcv +run-test-interrupted-v: QEMU_OPTS +=3D -cpu rv64,v=3Don diff --git a/tests/tcg/riscv64/test-interrupted-v.c b/tests/tcg/riscv64/tes= t-interrupted-v.c new file mode 100644 index 0000000000..db4fb6092f --- /dev/null +++ b/tests/tcg/riscv64/test-interrupted-v.c @@ -0,0 +1,208 @@ +/* + * Test for interrupted vector operations. + * + * Some vector instructions can be interrupted partially complete, vstart = will + * be set to where the operation has progressed to, and the instruction ca= n be + * re-executed with vstart !=3D 0. It is implementation dependent as to wh= at + * instructions can be interrupted and what vstart values are permitted wh= en + * executing them. Vector memory operations can typically be interrupted + * (as they can take page faults), so these are easy to test. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static unsigned long page_size; + +static volatile int nr_segv; +static volatile unsigned long fault_start, fault_end; + +/* + * Careful: qemu-user does not save/restore vector state in + * signals yet, so any library or compiler autovec code will + * corrupt our test. + * + * Do only minimal work in the signal handler. + */ +static void SEGV_handler(int signo, siginfo_t *info, void *context) +{ + unsigned long page =3D (unsigned long)info->si_addr & + ~(unsigned long)(page_size - 1); + + assert((unsigned long)info->si_addr >=3D fault_start); + assert((unsigned long)info->si_addr < fault_end); + mprotect((void *)page, page_size, PROT_READ); + nr_segv++; +} + +/* Use noinline to make generated code easier to inspect */ +static __attribute__((noinline)) +uint8_t unit_load(uint8_t *mem, size_t nr, bool ff) +{ + size_t vl; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + if (ff) { + vec =3D __riscv_vle8ff_v_u8m1(mem, &vl, vl); + } else { + vec =3D __riscv_vle8_v_u8m1(mem, vl); + } + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t seg2_load(uint8_t *mem, size_t nr, bool ff) +{ + size_t vl; + vuint8m1x2_t segvec; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + if (ff) { + segvec =3D __riscv_vlseg2e8ff_v_u8m1x2(mem, &vl, vl); + } else { + segvec =3D __riscv_vlseg2e8_v_u8m1x2(mem, vl); + } + vec =3D __riscv_vadd_vv_u8m1(__riscv_vget_v_u8m1x2_u8m1(segvec, 0), + __riscv_vget_v_u8m1x2_u8m1(segvec, 1), vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t strided_load(uint8_t *mem, size_t nr, size_t stride) +{ + size_t vl; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + vec =3D __riscv_vlse8_v_u8m1(mem, stride, vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t indexed_load(uint8_t *mem, size_t nr, uint32_t *indices) +{ + size_t vl; + vuint32m4_t idx; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + idx =3D __riscv_vle32_v_u32m4(indices, vl); + vec =3D __riscv_vloxei32_v_u8m1(mem, idx, vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +/* Use e8 elements, 128-bit vectors */ +#define NR_ELEMS 16 + +static int run_interrupted_v_tests(void) +{ + struct sigaction act =3D { 0 }; + uint8_t *mem; + uint32_t indices[NR_ELEMS]; + int i; + + page_size =3D sysconf(_SC_PAGESIZE); + + act.sa_flags =3D SA_SIGINFO; + act.sa_sigaction =3D &SEGV_handler; + if (sigaction(SIGSEGV, &act, NULL) =3D=3D -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } + + mem =3D mmap(NULL, NR_ELEMS * page_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + assert(mem !=3D MAP_FAILED); + madvise(mem, NR_ELEMS * page_size, MADV_NOHUGEPAGE); + + /* Unit-stride tests load memory crossing a page boundary */ + memset(mem, 0, NR_ELEMS * page_size); + for (i =3D 0; i < NR_ELEMS; i++) { + mem[page_size - NR_ELEMS + i] =3D 3; + } + for (i =3D 0; i < NR_ELEMS; i++) { + mem[page_size + i] =3D 5; + } + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - (NR_ELEMS / 2)]; + fault_end =3D fault_start + NR_ELEMS; + mprotect(mem, page_size * 2, PROT_NONE); + assert(unit_load(&mem[page_size - (NR_ELEMS / 2)], NR_ELEMS, false) + =3D=3D 8 * NR_ELEMS / 2); + assert(nr_segv =3D=3D 2); + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - NR_ELEMS]; + fault_end =3D fault_start + NR_ELEMS * 2; + mprotect(mem, page_size * 2, PROT_NONE); + assert(seg2_load(&mem[page_size - NR_ELEMS], NR_ELEMS, false) + =3D=3D 8 * NR_ELEMS); + assert(nr_segv =3D=3D 2); + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - (NR_ELEMS / 2)]; + fault_end =3D fault_start + (NR_ELEMS / 2); + mprotect(mem, page_size * 2, PROT_NONE); + assert(unit_load(&mem[page_size - (NR_ELEMS / 2)], NR_ELEMS, true) + =3D=3D 3 * NR_ELEMS / 2); + assert(nr_segv =3D=3D 1); /* fault-first does not fault the second pag= e */ + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - NR_ELEMS]; + fault_end =3D fault_start + NR_ELEMS; + mprotect(mem, page_size * 2, PROT_NONE); + assert(seg2_load(&mem[page_size - NR_ELEMS], NR_ELEMS * 2, true) + =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D 1); /* fault-first does not fault the second pag= e */ + + /* Following tests load one element from first byte of each page */ + mprotect(mem, page_size * 2, PROT_READ | PROT_WRITE); + memset(mem, 0, NR_ELEMS * page_size); + for (i =3D 0; i < NR_ELEMS; i++) { + mem[i * page_size] =3D 3; + indices[i] =3D i * page_size; + } + + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + assert(strided_load(mem, NR_ELEMS, page_size) =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D NR_ELEMS); + + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + assert(indexed_load(mem, NR_ELEMS, indices) =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D NR_ELEMS); + + munmap(mem, NR_ELEMS * page_size); + + return 0; +} + +int main(void) +{ + return run_interrupted_v_tests(); +} --=20 2.51.0