From nobody Fri May 17 05:00:04 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1681136075; cv=none; d=zohomail.com; s=zohoarc; b=jgVmup6sUlDtQ22me7sdKk+huPnho25tsA7lQzsybSwAxymSndQFfgzSCM91MXD4wP1lUXDSk1tLM0CjRPiU9+mCpTonuA4s/zeQ9D4DqADOIuZYXHbSIQDvuzFL0d1a/NnRVVZv9/nTCUa3yeM+y+W4tttpCx0jd+rEnH2WA2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681136075; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YhUJzlv6L2SG01QXHZ5Rm122+jHRIvLzIcJjNiuBws0=; b=U3Qyf/J5VIL01VUQuYChNK2V9gerRqYylBfuwNJ5YVhVLLB2gpCHi1QRekhZuzuGbkbE3n24gfUMA+m0P98AF7PXzFprHF+F3AvrxcFGi1DqmgfxJ/unbWH9Jk+MRdPF5dFooGLDfxPCRJ/sXrNgz8NIZHHNQfvi5khF0yox5TE= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681136075689797.8971003861351; Mon, 10 Apr 2023 07:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plsH1-0000yf-Nr; Mon, 10 Apr 2023 10:13:35 -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 1plsH0-0000yJ-5N for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:34 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plsGy-0000OB-Bp for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:33 -0400 Received: by mail-pj1-x102b.google.com with SMTP id nh20-20020a17090b365400b0024496d637e1so9966596pjb.5 for ; Mon, 10 Apr 2023 07:13:32 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id b22-20020aa78716000000b0063486255a87sm3783526pfo.142.2023.04.10.07.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 07:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1681136011; x=1683728011; 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=YhUJzlv6L2SG01QXHZ5Rm122+jHRIvLzIcJjNiuBws0=; b=mvIMREe7duJ/AcLuo9USNYSkiyo5iiMCrnh9dw4YhzBgf1NU2jSiSe+igWXSEJlptj lQPpZ+NxnaoddrxTmQ7huL6zNsBpD3D1HjZMShGdzcCjFfYF4xHlXo7ZH6fkJBNGCyft gMNEnKo/cyfjXvS0LzkLoqxLKtL1djwZn6+N8WlTBFrvtNP9MXEn5mEcFC0dscmNTkmt Wsj8wc6HwIdQ1hFBUiqGq7i4OWN0gXb6D2E714Xeu9bsjcDDEaS6zgzyogp/OcpyDGgy YQn9dT3tlxK7fH3obKtTIgujywgBSR4SnyqBresA2KzLyX4TNT01BYgb0fDO2aGOpzk9 7uew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681136011; x=1683728011; 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=YhUJzlv6L2SG01QXHZ5Rm122+jHRIvLzIcJjNiuBws0=; b=cqOJOhLNcD3eHJl52n/Az1GLsyU8TllRm8cZdQlZC+QP4AwQp/tbe+LjOalxx31sd+ rZXb6tz+F2slqfVeBNp6bjm8SCIVr+AJAhHZpTXqJQIqcrfu9wHFLiLzu7gs1cUVAyj6 IhjRl+hRsnV8BiT6pFqc24eV3Hi7nzHDvXGMGT38PiFqiv/os0BP8CAq/7FEBcmTdBiu Mdakq2g+ekUPFlw4w7Oe4zvwqCrgGvDJ9FuyyOzMMNnTkqtsiqpGVQj44hl0Hm/bpoUJ hidl+xpLb/2JWWUE7TjiM4B/yA0lEcn8bYVu3lcg5JyHh/vvimYC1SGCYXoZmY41f5Fa /W7Q== X-Gm-Message-State: AAQBX9eK3Myiw9w7/u0RHkg8Sz11XDtYS+TT8OhDoxDnkUoO5g1/vxug KINr1HHmmWS5Bxc1DiyIILNYEcnB1s89vcKsDgPQ+g== X-Google-Smtp-Source: AKy350bqp85WsMpDYj1LLncH0t4juVEGb+r5uD3RkwIkGqX6XhSBT5Ez1E8ghd8QhX02mu9/YkE95Q== X-Received: by 2002:a05:6a20:6d07:b0:d7:87ce:671e with SMTP id fv7-20020a056a206d0700b000d787ce671emr7513421pzb.52.1681136010835; Mon, 10 Apr 2023 07:13:30 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [RFC PATCH 1/4] target/riscv: smstateen check for fcsr Date: Mon, 10 Apr 2023 19:43:13 +0530 Message-Id: <20230410141316.3317474-2-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410141316.3317474-1-mchitale@ventanamicro.com> References: <20230410141316.3317474-1-mchitale@ventanamicro.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::102b; envelope-from=mchitale@ventanamicro.com; helo=mail-pj1-x102b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @ventanamicro.com) X-ZM-MESSAGEID: 1681136077989100003 Content-Type: text/plain; charset="utf-8" If smstateen is implemented and sstateen0.fcsr is clear then the floating point operations must return illegal instruction exception or virtual instruction trap, if relevant. Signed-off-by: Mayuresh Chitale --- target/riscv/cpu.h | 3 +++ target/riscv/csr.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 638e47c75a..132cf06ff2 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -613,6 +613,9 @@ void riscv_cpu_set_aia_ireg_rmw_fn(CPURISCVState *env, = uint32_t priv, target_ulong new_val, target_ulong write_mask), void *rmw_fn_arg); +RISCVException smstateen_acc_ok(CPURISCVState *env, int index, uint64_t bi= t); +#else +#define smstateen_acc_ok(env, index, bit) RISCV_EXCP_NONE #endif void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv); =20 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d522efc0b6..4979058434 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -43,7 +43,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *o= ps) =20 /* Predicates */ #if !defined(CONFIG_USER_ONLY) -static RISCVException smstateen_acc_ok(CPURISCVState *env, int index, +RISCVException smstateen_acc_ok(CPURISCVState *env, int index, uint64_t bit) { bool virt =3D riscv_cpu_virt_enabled(env); @@ -83,6 +83,10 @@ static RISCVException fs(CPURISCVState *env, int csrno) !riscv_cpu_cfg(env)->ext_zfinx) { return RISCV_EXCP_ILLEGAL_INST; } + + if (!env->debugger && !riscv_cpu_fp_enabled(env)) { + return smstateen_acc_ok(env, 0, SMSTATEEN0_FCSR); + } #endif return RISCV_EXCP_NONE; } @@ -2056,6 +2060,9 @@ static RISCVException write_mstateen0(CPURISCVState *= env, int csrno, target_ulong new_val) { uint64_t wr_mask =3D SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; + if (!riscv_has_ext(env, RVF)) { + wr_mask |=3D SMSTATEEN0_FCSR; + } =20 return write_mstateen(env, csrno, wr_mask, new_val); } @@ -2092,6 +2099,10 @@ static RISCVException write_mstateen0h(CPURISCVState= *env, int csrno, { uint64_t wr_mask =3D SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; =20 + if (!riscv_has_ext(env, RVF)) { + wr_mask |=3D SMSTATEEN0_FCSR; + } + return write_mstateenh(env, csrno, wr_mask, new_val); } =20 @@ -2129,6 +2140,10 @@ static RISCVException write_hstateen0(CPURISCVState = *env, int csrno, { uint64_t wr_mask =3D SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; =20 + if (!riscv_has_ext(env, RVF)) { + wr_mask |=3D SMSTATEEN0_FCSR; + } + return write_hstateen(env, csrno, wr_mask, new_val); } =20 @@ -2168,6 +2183,10 @@ static RISCVException write_hstateen0h(CPURISCVState= *env, int csrno, { uint64_t wr_mask =3D SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; =20 + if (!riscv_has_ext(env, RVF)) { + wr_mask |=3D SMSTATEEN0_FCSR; + } + return write_hstateenh(env, csrno, wr_mask, new_val); } =20 @@ -2215,6 +2234,10 @@ static RISCVException write_sstateen0(CPURISCVState = *env, int csrno, { uint64_t wr_mask =3D SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; =20 + if (!riscv_has_ext(env, RVF)) { + wr_mask |=3D SMSTATEEN0_FCSR; + } + return write_sstateen(env, csrno, wr_mask, new_val); } =20 --=20 2.34.1 From nobody Fri May 17 05:00:04 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1681136169; cv=none; d=zohomail.com; s=zohoarc; b=Y1jBVRH6cTgBFPY6q/Eph/s2kQWofxyYolGAXDc1aBQh8/lwWxSxjepCQYpR8u4PNTtGosOzXCQ5VRSn6WWyIxTc/d6pGfZIV/FTqtzsm1uQz2SHM3/8b+jyA8PtPRRmHcZdJriWjDTmhhjKlc1+Y2ZU0bjo5nqYLJKgSiaE6ck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681136169; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5MqvM9/VuHqyom9sctVAsCf+d6Lm30FMiMWZkKOlSFc=; b=VuZDY6StnJubUX1QjGHavAxyhEZuopZxDoBDPltPQWQ1pPSQeSb7iwXHAXPxDmvp03M69TiRZACLuFllJccfg8CExFetYCuZbRRVaudCIDw3uOKppuZsqzk6n4sCfoGJPxA78Y2v5Lr1NF0/WzU+yw2CGqXy1+TQ84UcB2rjr4Q= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681136168993172.56910059472705; Mon, 10 Apr 2023 07:16:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plsH7-00010B-DM; Mon, 10 Apr 2023 10:13:41 -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 1plsH5-0000zL-F3 for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:39 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plsH3-0000Oe-Ug for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:39 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-632cf80575fso662449b3a.2 for ; Mon, 10 Apr 2023 07:13:37 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id b22-20020aa78716000000b0063486255a87sm3783526pfo.142.2023.04.10.07.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 07:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1681136016; x=1683728016; 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=5MqvM9/VuHqyom9sctVAsCf+d6Lm30FMiMWZkKOlSFc=; b=R4sE6fwSc08VabBZRDn6Xm6J2por/S+BwvqSCByKMjVzjk9+4kpLye8nrM33s7cfvU v2ExlIph9nwyXwNxor8hzuHLM3ED7xjV1iLG6NkMmBTaB51+59t9x8gFGKaCUA0aEzfa hRf9CS9wELZTYATL+4bS6cR5wxAPUS3UTyDSwKyppar+LkTFgCU1ePedlNaFLuAr9x15 uOTXWCSfHQwBfOMtATtbKMKc686GupuwHwIwb0YaZHBGgplS9blzqaRsH5rpbFLuPnpq ojEMB9Yf/+hZZugwzDPgf2zlmwg4P8lQSKCFq8cXkO0Prd+c4z2I50brOkwYq+vk9vhw xi2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681136016; x=1683728016; 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=5MqvM9/VuHqyom9sctVAsCf+d6Lm30FMiMWZkKOlSFc=; b=c8d3gvlqqctXMKLqfNEQYNDHCeJNEEUGsNmtJtapjkWHD2N+6c4+E5pY7Mrdsj0tjO pAFYClhhDRP5gP3SHckxMlrROO0R/L9Eu9z1O1/YgpWuk+wSZdYqFcVE9DZnZhPk5egd Y6lUF5VhMbQ/8BtRczt0M+ciKtG9rPIPWqbVPIvJ38iJQ6vbVAZLlJCmIl/ICFpPd57L t1BQQCiDJ+RPBASNqxPr2zAJPVa/egarxqQoZwnIiy2WSZfM1kPT7LSIhCGy6NTiLlm0 UAiKXyCIfIfNnoGnysdGMHIJNp47wnb4zshKllTRwyk/jqwr39uh+1PH7wsZGj/5kq4R wa2g== X-Gm-Message-State: AAQBX9e4ISvfes32jRFrfuATdxzGPh1e7AasDzwsML7VwAEf2WtC82eY 7twmwqNR9W5XJPoi9sA+WbXl7fixzSG6GPAYC/O2Lg== X-Google-Smtp-Source: AKy350bjgRafbqVKZuPHbsurAy7wKhqYPymXNxvKe3m7+Tt3RD8SZx+NpBXyrqTDR3ERuYtEcN+Jtw== X-Received: by 2002:a62:840b:0:b0:626:41b:2598 with SMTP id k11-20020a62840b000000b00626041b2598mr11191431pfd.26.1681136016454; Mon, 10 Apr 2023 07:13:36 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [RFC PATCH 2/4] target/riscv: Add fcsr field in tb->flags Date: Mon, 10 Apr 2023 19:43:14 +0530 Message-Id: <20230410141316.3317474-3-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410141316.3317474-1-mchitale@ventanamicro.com> References: <20230410141316.3317474-1-mchitale@ventanamicro.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::431; envelope-from=mchitale@ventanamicro.com; helo=mail-pf1-x431.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @ventanamicro.com) X-ZM-MESSAGEID: 1681136169761100001 Content-Type: text/plain; charset="utf-8" The state of smstateen0.FCSR bit impacts the execution of floating point instructions when misa.F=3D=3D0. Add a field in the tb->flags which stores the current state of smstateen0.fcsr and will be used by floating point translation routines. Signed-off-by: Mayuresh Chitale --- target/riscv/cpu.h | 1 + target/riscv/cpu_helper.c | 5 +++++ target/riscv/translate.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 132cf06ff2..9c6b10d29a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -653,6 +653,7 @@ FIELD(TB_FLAGS, VTA, 24, 1) FIELD(TB_FLAGS, VMA, 25, 1) /* Native debug itrigger */ FIELD(TB_FLAGS, ITRIGGER, 26, 1) +FIELD(TB_FLAGS, FCSR, 27, 1) =20 #ifdef TARGET_RISCV32 #define riscv_cpu_mxl(env) ((void)(env), MXL_RV32) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index f88c503cf4..1590e6e480 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -117,6 +117,11 @@ void cpu_get_tb_cpu_state(CPURISCVState *env, target_u= long *pc, if (env->cur_pmbase !=3D 0) { flags =3D FIELD_DP32(flags, TB_FLAGS, PM_BASE_ENABLED, 1); } + if (smstateen_acc_ok(env, 0, SMSTATEEN0_FCSR) =3D=3D RISCV_EXCP_NONE) { + flags =3D FIELD_DP32(flags, TB_FLAGS, FCSR, 1); + } else { + flags =3D FIELD_DP32(flags, TB_FLAGS, FCSR, 0); + } =20 *pflags =3D flags; } diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 0ee8ee147d..4880eaeb89 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -77,6 +77,7 @@ typedef struct DisasContext { int frm; RISCVMXL ol; bool virt_inst_excp; + bool smstateen_fcsr_ok; bool virt_enabled; const RISCVCPUConfig *cfg_ptr; bool hlsx; @@ -1187,6 +1188,7 @@ static void riscv_tr_init_disas_context(DisasContextB= ase *dcbase, CPUState *cs) ctx->itrigger =3D FIELD_EX32(tb_flags, TB_FLAGS, ITRIGGER); ctx->zero =3D tcg_constant_tl(0); ctx->virt_inst_excp =3D false; + ctx->smstateen_fcsr_ok =3D FIELD_EX32(tb_flags, TB_FLAGS, FCSR); } =20 static void riscv_tr_tb_start(DisasContextBase *db, CPUState *cpu) --=20 2.34.1 From nobody Fri May 17 05:00:04 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1681136104; cv=none; d=zohomail.com; s=zohoarc; b=DFsq2K7XWwflBhy+/vrKflZxblvXbhEA3lSM0hvrgYV2MPJozuyRrjqLU91VR3CdeVJ11yemom52cxZUMCTYspGMWF2+XhWWN1Dgw0LL2s6lEBrkTcT5QNiWIlHkLMI8Sy7CqtRWAfGEAQ+L6jAr94idm6dSQ3pwl2OETOUBXCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681136104; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GH0AYtZChXLjtc/B2h6+ykXauiAegX1zwBOxtyoSOKs=; b=JKUhCjDHSebnt18eASwDBc1mYxymLeKj/lf08vx06Q7V6URydGG3u9SrG6IN7BVzD3IgdGNp12w2UIeT8EEqLjWG7DEQ7WiTDZjkU4UmbTXEMgL1rB92icL58FgndoKVTeMJq9BQ55n4EysxYS+nkFF5AoBMyUS7WE7amVFFKMk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681136104550436.2789141909295; Mon, 10 Apr 2023 07:15:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plsHB-00010z-8X; Mon, 10 Apr 2023 10:13:45 -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 1plsHA-00010k-LK for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:44 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plsH9-0000PA-1y for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:44 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1a645fd0c6dso706495ad.1 for ; Mon, 10 Apr 2023 07:13:42 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id b22-20020aa78716000000b0063486255a87sm3783526pfo.142.2023.04.10.07.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 07:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1681136021; x=1683728021; 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=GH0AYtZChXLjtc/B2h6+ykXauiAegX1zwBOxtyoSOKs=; b=nlz3SDbWLZ/KQtmzM1lIcBW5QjWXuXxOvGzuBMHWX0B3tJxDT9wQweYcwylCoIED/d ZPVgMcrmFx96kGAnKo8OQ18HJX4sLM3Fg+fxzfn54TjkjAuUM/73YfQY9AUxFzKdNRc+ aZhEcBGuQiXrJf22qXLIYZRhrOGRw85tCvnGvGEJV+R56vCBr6b3XXh0SYvs4ufIoSyR 3kSvZFl67X/sn5HoBEUgzVzue02gfloPf5d70Rfx2iOvS3QmT+j+upU4VO9IZeKQWbMo 4F3aQtvpDP8avBud2keG6wTj1tOavoYV5FopIImxU7+ditw//D98h9ZuPsXnSpHxpaaY 7nOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681136021; x=1683728021; 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=GH0AYtZChXLjtc/B2h6+ykXauiAegX1zwBOxtyoSOKs=; b=UCgdGn2KrKOCqNO8c76tyiDnbBAwCyFdRtedgcSOXcdIHgsXzFJicmaPLKtdZsBWDr Je2v/V54IrfyDvV3aQz/5x8lThdzrZat+UZksg0qjhLR/Seg2vvKnGtJ5tatMpebk1yz H0+pkoBZIF60X7p+DGeXDx1vGsUfGMyVWxFbb6375ON6yP5oQkXL7eXkS5MUbt+LVT9z qePYllXVjPDg9Ez8gKMPZ6AUQzwNdVipBwbM/NE47gSspTip7m1Bvjn2oGrebIy2e0q5 z+Pcey8szc+Pmn8rqFwtqQOa5preR4G+4KTKNNOOqKvNBA13daTdyddGtG2WfPqFfQs0 fSJg== X-Gm-Message-State: AAQBX9fBzi95htZiIAQlRhG1tXvomY0aS+P3TrT1J4s0RDWZEyo1IGd9 qAJDYfhIeLFqmWv3y2mClZwHKYScz8K3fpeG25Zvcw== X-Google-Smtp-Source: AKy350bSdGbiJCz+ly3EiCJWIAWpLT54F3GafVW0efcX09LkhvYnj5roOnY7LrX8PPtK24FgvVOJfw== X-Received: by 2002:a62:384c:0:b0:636:a399:e81a with SMTP id f73-20020a62384c000000b00636a399e81amr4210261pfa.6.1681136021424; Mon, 10 Apr 2023 07:13:41 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [RFC PATCH 3/4] target/riscv: check smstateen fcsr flag Date: Mon, 10 Apr 2023 19:43:15 +0530 Message-Id: <20230410141316.3317474-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410141316.3317474-1-mchitale@ventanamicro.com> References: <20230410141316.3317474-1-mchitale@ventanamicro.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::62c; envelope-from=mchitale@ventanamicro.com; helo=mail-pl1-x62c.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, 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 @ventanamicro.com) X-ZM-MESSAGEID: 1681136106022100001 Content-Type: text/plain; charset="utf-8" If misa.F and smstateen_fcsr_ok flag are clear then all the floating point instructions must generate an appropriate exception. Signed-off-by: Mayuresh Chitale --- target/riscv/insn_trans/trans_rvf.c.inc | 24 ++++++++++++++++++++--- target/riscv/insn_trans/trans_rvzfh.c.inc | 4 ++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvf.c.inc b/target/riscv/insn_tr= ans/trans_rvf.c.inc index 052408f45c..6173dace46 100644 --- a/target/riscv/insn_trans/trans_rvf.c.inc +++ b/target/riscv/insn_trans/trans_rvf.c.inc @@ -24,9 +24,27 @@ return false; \ } while (0) =20 -#define REQUIRE_ZFINX_OR_F(ctx) do {\ - if (!ctx->cfg_ptr->ext_zfinx) { \ - REQUIRE_EXT(ctx, RVF); \ +#ifndef CONFIG_USER_ONLY +#define smstateen_fcsr_check(ctx) do { \ + if (!ctx->smstateen_fcsr_ok) { \ + if (ctx->virt_enabled) { \ + generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); \ + } else { \ + generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); \ + } \ + return true; \ + } \ +} while (0) +#else +#define smstateen_fcsr_check(ctx) +#endif + +#define REQUIRE_ZFINX_OR_F(ctx) do { \ + if (!has_ext(ctx, RVF)) { \ + if (!ctx->cfg_ptr->ext_zfinx) { \ + return false; \ + } \ + smstateen_fcsr_check(ctx); \ } \ } while (0) =20 diff --git a/target/riscv/insn_trans/trans_rvzfh.c.inc b/target/riscv/insn_= trans/trans_rvzfh.c.inc index 74dde37ff7..304bee1002 100644 --- a/target/riscv/insn_trans/trans_rvzfh.c.inc +++ b/target/riscv/insn_trans/trans_rvzfh.c.inc @@ -20,24 +20,28 @@ if (!ctx->cfg_ptr->ext_zfh) { \ return false; \ } \ + smstateen_fcsr_check(ctx); \ } while (0) =20 #define REQUIRE_ZHINX_OR_ZFH(ctx) do { \ if (!ctx->cfg_ptr->ext_zhinx && !ctx->cfg_ptr->ext_zfh) { \ return false; \ } \ + smstateen_fcsr_check(ctx); \ } while (0) =20 #define REQUIRE_ZFHMIN(ctx) do { \ if (!ctx->cfg_ptr->ext_zfhmin) { \ return false; \ } \ + smstateen_fcsr_check(ctx); \ } while (0) =20 #define REQUIRE_ZFHMIN_OR_ZHINXMIN(ctx) do { \ if (!(ctx->cfg_ptr->ext_zfhmin || ctx->cfg_ptr->ext_zhinxmin)) { \ return false; \ } \ + smstateen_fcsr_check(ctx); \ } while (0) =20 static bool trans_flh(DisasContext *ctx, arg_flh *a) --=20 2.34.1 From nobody Fri May 17 05:00:04 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1681136102; cv=none; d=zohomail.com; s=zohoarc; b=RI9cb0cBLg+kaNMkCM5LaPmtEUBCvCsLGqEwDysyHdNYLuuH3LPjFN6P9NK0KWQrDwL6UIgQiyOzK1OlhIJ8x/7fuiT+1+e4ZzqxvnTSjhtzIPLHE1cLH2UAEKNnAhUUfrmWOk8ClYJeYRe8zFO0NKZiNiSopfSk5H+T5YN/2B0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681136102; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OcH4w6tRPn9WyarG+LzAEbQ8PKEmCZEgzDYRD1X2f0s=; b=fdsOSMd7Zjomni1o+5uB5kM+TTIq39UvoWx7Pj+bcvT/Bv271B05NLaE8J3NeUHZHQR5Cf7/4dBFe/jCO+oefy6Wm0hMbNsi+Hw3n4Ir6Ky4phAO2inF5D99s50kSrYQFwHB0RTVNkxXRPTYwpVgOf7FSEcrfneLScbn1QVVMQk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681136102755833.2091162198669; Mon, 10 Apr 2023 07:15:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plsHH-00012O-1d; Mon, 10 Apr 2023 10:13:51 -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 1plsHF-00011i-Ba for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:49 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plsHE-0000Pt-0R for qemu-devel@nongnu.org; Mon, 10 Apr 2023 10:13:49 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-63266bbff53so531695b3a.3 for ; Mon, 10 Apr 2023 07:13:47 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id b22-20020aa78716000000b0063486255a87sm3783526pfo.142.2023.04.10.07.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 07:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1681136026; x=1683728026; 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=OcH4w6tRPn9WyarG+LzAEbQ8PKEmCZEgzDYRD1X2f0s=; b=WdAeWmWs4AEobpIJcf9xEinJEzl0oQNoqp6xEFW/g2+mx4mfKCedj0gvu1GjFUE5KT s4Zk4eEvIN5K3vXxZZ3oi0E4wewk8b0ACH/HLo4xfsdEoCUVZi+ketL0GwsvRZpSMCE0 MP7xcvZDZ8G1EPpXmq/0FjB5Nb82+sCGPjFUPlwWgADxYThOUqi9P/8FL9roxmbgHNUZ Ac50YeYfXb83YOu6v1lWP56NnBNW8M1PQgcxr2er8MuEh2TTodtgQgsBCg92F4epSiMx JyJ0hBP2TwGg6UTWT5sbIX+ftmvBM84YaO4FOfSMKr3D+j2HgEzFaQ1bo0Ri+9gvnYxF gHvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681136026; x=1683728026; 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=OcH4w6tRPn9WyarG+LzAEbQ8PKEmCZEgzDYRD1X2f0s=; b=dYgVf+4LkyZcWC+c0K9yUW+wdIIrGxyLMdGGeHFodZR4PL7YPxBYOcvhmfJTvQIgjV 34QBM867LtAbKpVjVINGJGcSgldkTSo/42uVzsTPUz7aXnzNcSKPinyppxM9r/4ZsyHP 4TXQSuQzaOT/Gbj29sE0dhozfBB+RGe88s1D54PbutRfExvVEeNxFLkBiBHeKvnDtdxb kjIG3rTlFLbM0P7ty0gCHdnxQbqNltaNpgyTeMRRev3MW5sWPfDMulfQhGHBRPN7Io/Q ZbPvSBIkLvUb8TOMs7BjoNNTWZlsVb884VdJ39J/sdY2DezxnURbHYakdiTGTEnA8Rer ExKA== X-Gm-Message-State: AAQBX9dLmPG/7JwbHniPbKTd9x8o3jTrqg7gDqO+bg4+QBUm6YGzURz6 eDLyQkqUp7bMEMpIcqRYd3goSpF6DW39j9rX0GBSkg== X-Google-Smtp-Source: AKy350ZnzifSjf0nEQ8oBZMBe+7i7bIzUfTWtdzWU7r2NC4yoU+xKjLnxxf6Lp3d2jITMg8F6xgazg== X-Received: by 2002:aa7:960f:0:b0:5a8:4861:af7d with SMTP id q15-20020aa7960f000000b005a84861af7dmr11954953pfg.20.1681136026590; Mon, 10 Apr 2023 07:13:46 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [RFC PATCH 4/4] target/riscv: smstateen knobs Date: Mon, 10 Apr 2023 19:43:16 +0530 Message-Id: <20230410141316.3317474-5-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410141316.3317474-1-mchitale@ventanamicro.com> References: <20230410141316.3317474-1-mchitale@ventanamicro.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::42e; envelope-from=mchitale@ventanamicro.com; helo=mail-pf1-x42e.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @ventanamicro.com) X-ZM-MESSAGEID: 1681136103476100001 Content-Type: text/plain; charset="utf-8" Add knobs to allow users to enable smstateen and also export it via the ISA extension string. Signed-off-by: Mayuresh Chitale Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1e97473af2..4e926b0143 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -112,6 +112,7 @@ static const struct isa_ext_data isa_edata_arr[] =3D { ISA_EXT_DATA_ENTRY(zhinx, true, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, true, PRIV_VERSION_1_12_0, ext_zhinxmin), ISA_EXT_DATA_ENTRY(smaia, true, PRIV_VERSION_1_12_0, ext_smaia), + ISA_EXT_DATA_ENTRY(smstateen, true, PRIV_VERSION_1_12_0, ext_smstateen= ), ISA_EXT_DATA_ENTRY(ssaia, true, PRIV_VERSION_1_12_0, ext_ssaia), ISA_EXT_DATA_ENTRY(sscofpmf, true, PRIV_VERSION_1_12_0, ext_sscofpmf), ISA_EXT_DATA_ENTRY(sstc, true, PRIV_VERSION_1_12_0, ext_sstc), @@ -1395,8 +1396,8 @@ static Property riscv_cpu_extensions[] =3D { DEFINE_PROP_UINT16("vlen", RISCVCPU, cfg.vlen, 128), DEFINE_PROP_UINT16("elen", RISCVCPU, cfg.elen, 64), =20 + DEFINE_PROP_BOOL("smstateen", RISCVCPU, cfg.ext_smstateen, false), DEFINE_PROP_BOOL("svadu", RISCVCPU, cfg.ext_svadu, true), - DEFINE_PROP_BOOL("svinval", RISCVCPU, cfg.ext_svinval, false), DEFINE_PROP_BOOL("svnapot", RISCVCPU, cfg.ext_svnapot, false), DEFINE_PROP_BOOL("svpbmt", RISCVCPU, cfg.ext_svpbmt, false), --=20 2.34.1