From nobody Mon Feb 9 00:01:39 2026 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=1679957550; cv=none; d=zohomail.com; s=zohoarc; b=drAEjX0A/SumKm44JVlDBmkO7Y7FbuS+KF4Z/aN6ciTWqs9lwymyiTg/3uii+e8w1ZexTm+UUZ8pNDfYzfZpg4syQ4Oz2sSxPmLkwwOKrtWjcDs2dGBXl+5smG7R86r+WAkkCVBwyliTUX6LZ/9cNnGsDZWNUuiCaUCBeZdsyS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679957550; 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=h0ARKpciyvlJkpzF/9XoqQBhluoMcoyy701jOPuzAdA=; b=ANIh/xAAXLNahDoegRrdhYJnRoq9aDygayrms2CrMoJ7TDAMWRHaoQXx8YoHKnwIgWCoVHwOzoWvaRR7mDKDDwMkSOo3gM7qxiRC+BPxEy0t0ZemCg2n6R9bnf70KUJ/uj/UBVbsvNwId7ZRnH+8RyCKy4kuAGqw876ktCd0kys= 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 1679957550328266.6860073675557; Mon, 27 Mar 2023 15:52:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgvf1-0005Nq-5H; Mon, 27 Mar 2023 18:49:55 -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 1pgvez-0005NY-91 for qemu-devel@nongnu.org; Mon, 27 Mar 2023 18:49:53 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgvex-0007LM-Fa for qemu-devel@nongnu.org; Mon, 27 Mar 2023 18:49:53 -0400 Received: by mail-oi1-x236.google.com with SMTP id q27so6888271oiw.0 for ; Mon, 27 Mar 2023 15:49:51 -0700 (PDT) Received: from grind.. ([177.95.89.231]) by smtp.gmail.com with ESMTPSA id s9-20020a4a9689000000b005255e556399sm11985361ooi.43.2023.03.27.15.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 15:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1679957390; 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=h0ARKpciyvlJkpzF/9XoqQBhluoMcoyy701jOPuzAdA=; b=FDacxwFeXsCtFKdjs5n3BCVXVBQHYndhhnOYKbSuMa+zQMyc0TAATTlWmM83Xry4Bx hSgrPpu3LTSlNZrA8wGp6NkDZR8wxzGe9j/qwMHbBCKbeMUfwlLRpKHhbObYnijvPeOQ v+CLHSD5bN6ADWQIwKyrWk/2qokBFwp1blynVTa4pWlmJSlzuxHucF6xzMepeNFJKB/B Eh95Lh+qKdFDyqSXC8aU4+BKJ9GsEbPIHBy2aapOQIEyShWXvVHi5JdlKuqefrUv5+Wh ed5/SkkNVsNxjbnbuVgTszH6QUDBlKZoO2p2HqurbwFPxixzglZaF8NHELyGpMTAZYcT Iumw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679957390; 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=h0ARKpciyvlJkpzF/9XoqQBhluoMcoyy701jOPuzAdA=; b=p3gOrFiZV+J9JP8xw/o9Zi6yke+i6MsGVuUTXGKAtXwn/k27RzB1rGutnse5gRI6pM E7DTj5xAZ1wxl6Wjr1iovK5ftj7FsmUHKp0ZlEbMhBspIzBz0VSf7rq//Yh9dB36TV5y jp2U0j0T8LE+zRR9VdjKKDpD/w2bO0qtRQGS3ZoCt2LCCEhCI/lHr1WYeII7hb9YrIik wgn15EfNF9xZTlZys1U2SEw+VNfkAkBgfQBoposemCqnVs+0f68rNmZkexWj+Oi3Arpm b8NnbYg4qzew4iz8XU+lDR+Og6RkPU91T5x0ALcvo3fRz7+YJaVlARP7qDndLHEyFhn5 BZcA== X-Gm-Message-State: AO0yUKUVaBjV3BcoACztZ1AVIR1UFjuQYAT5ZKPVAyLwfAPzpCdtFTMW eEXnW/gojMP4ijfuFXwRaRXZYfqkbLuoGldd+ZU= X-Google-Smtp-Source: AK7set97ZKaqGRhK05PsZLyXFHsHpB/oJskqm3VF4j3Q2rI8ocdYo0CBBdMqXkf4yKyOUtL1RLKWFg== X-Received: by 2002:a05:6808:58:b0:386:f58a:2262 with SMTP id v24-20020a056808005800b00386f58a2262mr5524409oic.57.1679957390065; Mon, 27 Mar 2023 15:49:50 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, richard.henderson@linaro.org, Daniel Henrique Barboza Subject: [PATCH v2 01/19] target/riscv: sync env->misa_ext* with cpu->cfg in realize() Date: Mon, 27 Mar 2023 19:49:16 -0300 Message-Id: <20230327224934.363314-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230327224934.363314-1-dbarboza@ventanamicro.com> References: <20230327224934.363314-1-dbarboza@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::236; envelope-from=dbarboza@ventanamicro.com; helo=mail-oi1-x236.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: 1679957550603100003 Content-Type: text/plain; charset="utf-8" When riscv_cpu_realize() starts we're guaranteed to have cpu->cfg.ext_N properties updated. The same can't be said about env->misa_ext*, since the user might enable/disable MISA extensions in the command line, and env->misa_ext* won't caught these changes. The current solution is to sync everything at the end of validate_set_extensions(), checking every cpu->cfg.ext_N value to do a set_misa() in the end. The last change we're making in the MISA cfg flags are in the G extension logic, enabling IMAFG if cpu->cfg_ext.g is enabled. Otherwise we're not making any changes in MISA bits ever since realize() starts. There's no reason to postpone misa_ext updates until the end of the validation. Let's do it earlier, during realize(), in a new helper called riscv_cpu_sync_misa_cfg(). If cpu->cfg.ext_g is enabled, do it again by updating env->misa_ext* directly. This is a pre-requisite to allow riscv_cpu_validate_set_extensions() to use riscv_has_ext() instead of cpu->cfg.ext_N to validate the MISA extensions, which is our end goal here. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 94 +++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1e97473af2..2711d80e16 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -804,12 +804,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, dis= assemble_info *info) =20 /* * Check consistency between chosen extensions while setting - * cpu->cfg accordingly, doing a set_misa() in the end. + * cpu->cfg accordingly. */ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) { CPURISCVState *env =3D &cpu->env; - uint32_t ext =3D 0; =20 /* Do some ISA extension error checking */ if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m && @@ -824,6 +823,9 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU = *cpu, Error **errp) cpu->cfg.ext_d =3D true; cpu->cfg.ext_icsr =3D true; cpu->cfg.ext_ifencei =3D true; + + env->misa_ext |=3D RVI | RVM | RVA | RVF | RVD; + env->misa_ext_mask =3D env->misa_ext; } =20 if (cpu->cfg.ext_i && cpu->cfg.ext_e) { @@ -962,39 +964,8 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU= *cpu, Error **errp) cpu->cfg.ext_zksh =3D true; } =20 - if (cpu->cfg.ext_i) { - ext |=3D RVI; - } - if (cpu->cfg.ext_e) { - ext |=3D RVE; - } - if (cpu->cfg.ext_m) { - ext |=3D RVM; - } - if (cpu->cfg.ext_a) { - ext |=3D RVA; - } - if (cpu->cfg.ext_f) { - ext |=3D RVF; - } - if (cpu->cfg.ext_d) { - ext |=3D RVD; - } - if (cpu->cfg.ext_c) { - ext |=3D RVC; - } - if (cpu->cfg.ext_s) { - ext |=3D RVS; - } - if (cpu->cfg.ext_u) { - ext |=3D RVU; - } - if (cpu->cfg.ext_h) { - ext |=3D RVH; - } if (cpu->cfg.ext_v) { int vext_version =3D VEXT_VERSION_1_00_0; - ext |=3D RVV; if (!is_power_of_2(cpu->cfg.vlen)) { error_setg(errp, "Vector extension VLEN must be power of 2"); @@ -1032,11 +1003,6 @@ static void riscv_cpu_validate_set_extensions(RISCVC= PU *cpu, Error **errp) } set_vext_version(env, vext_version); } - if (cpu->cfg.ext_j) { - ext |=3D RVJ; - } - - set_misa(env, env->misa_mxl, ext); } =20 #ifndef CONFIG_USER_ONLY @@ -1121,6 +1087,50 @@ static void riscv_cpu_finalize_features(RISCVCPU *cp= u, Error **errp) #endif } =20 +static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) +{ + uint32_t ext =3D 0; + + if (riscv_cpu_cfg(env)->ext_i) { + ext |=3D RVI; + } + if (riscv_cpu_cfg(env)->ext_e) { + ext |=3D RVE; + } + if (riscv_cpu_cfg(env)->ext_m) { + ext |=3D RVM; + } + if (riscv_cpu_cfg(env)->ext_a) { + ext |=3D RVA; + } + if (riscv_cpu_cfg(env)->ext_f) { + ext |=3D RVF; + } + if (riscv_cpu_cfg(env)->ext_d) { + ext |=3D RVD; + } + if (riscv_cpu_cfg(env)->ext_c) { + ext |=3D RVC; + } + if (riscv_cpu_cfg(env)->ext_s) { + ext |=3D RVS; + } + if (riscv_cpu_cfg(env)->ext_u) { + ext |=3D RVU; + } + if (riscv_cpu_cfg(env)->ext_h) { + ext |=3D RVH; + } + if (riscv_cpu_cfg(env)->ext_v) { + ext |=3D RVV; + } + if (riscv_cpu_cfg(env)->ext_j) { + ext |=3D RVJ; + } + + env->misa_ext =3D env->misa_ext_mask =3D ext; +} + static void riscv_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); @@ -1156,6 +1166,14 @@ static void riscv_cpu_realize(DeviceState *dev, Erro= r **errp) set_priv_version(env, priv_version); } =20 + /* + * We can't be sure of whether we set defaults during cpu_init() + * or whether the user enabled/disabled some bits via cpu->cfg + * flags. Sync env->misa_ext with cpu->cfg now to allow us to + * use just env->misa_ext later. + */ + riscv_cpu_sync_misa_cfg(env); + /* Force disable extensions if priv spec version does not match */ for (i =3D 0; i < ARRAY_SIZE(isa_edata_arr); i++) { if (isa_ext_is_enabled(cpu, &isa_edata_arr[i]) && --=20 2.39.2