From nobody Wed Nov 27 13:45:00 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=1698871530; cv=none; d=zohomail.com; s=zohoarc; b=VROPkoOkOzBSagYoYC6KS9FZg4NVew6LP4s5kybSnIZPRM7OHqT8EX1oY1mdpYWlqpic5/7VyyfDPBwnm8vAeqq3FMc5OZ8AnPCGD+8Yr/t9k57aphQMGS4urjcthFtdTRojYI1VYxeLSYUb/FnjAfkKreRNmWO69Gz8xgqZCOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698871530; 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=OMuHLdrzcJQqp5mm/d7oE5DlJvLRfjtu2KHzBTuStOg=; b=TpsiQB8dsusadQMiOu05OurVoH9rtktB2AuBUld++2vZgmMWHrUozrVHfrFsH47nuGgYyzhA3JXJoh8ROjzcsAt0P9B/ZDaviVa/FT2paSRSVpqnSbcToKITw9QJ5kmuTumuhOSbqA/6gQ2QATrnLlMKYFv/B+1IvCyhwNb+qLs= 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 1698871530693195.42467525965185; Wed, 1 Nov 2023 13:45:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyI2g-0002Vd-G4; Wed, 01 Nov 2023 16:42:22 -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 1qyI2e-0002V9-ME for qemu-devel@nongnu.org; Wed, 01 Nov 2023 16:42:20 -0400 Received: from mail-yb1-xb2a.google.com ([2607:f8b0:4864:20::b2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyI2d-0000cd-5T for qemu-devel@nongnu.org; Wed, 01 Nov 2023 16:42:20 -0400 Received: by mail-yb1-xb2a.google.com with SMTP id 3f1490d57ef6-d9ac31cb051so189732276.3 for ; Wed, 01 Nov 2023 13:42:18 -0700 (PDT) Received: from grind.. ([179.193.10.161]) by smtp.gmail.com with ESMTPSA id z187-20020a2533c4000000b00d9cc49edae9sm329724ybz.63.2023.11.01.13.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 13:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1698871337; x=1699476137; 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=OMuHLdrzcJQqp5mm/d7oE5DlJvLRfjtu2KHzBTuStOg=; b=MzCWMQRFsCpabOB5w/mXqNyKkK8BiDncAA3OmC9OrlFgJMY/uXM3B1Oj8VwpIts7PC py+gw1mwyWGyiIbC3TUP0YZGKA7btG/KJS2+q1ZUWWJ72L3de+NDjsA2tyI14L4Givw5 MBOUnNO3+wW5je7Vxrzeu43YAvuEg7d2LysHy8YFlyey9mwFJhhFTrV9tBh/YJecDl5Q O4Qjzl2RiQ9EOeI++yIrEj716Vsm9v9iRnpLqbUZH0gqvfJBDF13wbm8ZbRYxDz62DYg mtGyKeri/WfbAlnWBevVLNjOe25YSx17oHYC/j/gglzOlJ1Rc4P87iRp5rvN37sLYZA+ SsXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698871337; x=1699476137; 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=OMuHLdrzcJQqp5mm/d7oE5DlJvLRfjtu2KHzBTuStOg=; b=Bk/fdF72F94LvpIXYBP8xbjvAczncvVJ48pQK8jVXG47H4yfadKiLYqJJQ0ynYLhkh qdkEV2R2E5cjLU+DlTb1rxcRNZ+Nhi5T2owq4Pl/92jnF2i22NVr+IlNVypyO01tgbX1 bHrQMwm85q0CT+RcqS6t1dPPhlBWdPlj0WQwX7GkTAKNsz62xkPmGyPex4XQy9h571HA MI3MbBfZ1Z/hDBYGrwyCqz8Uch+gKSEE9miXCeUYIiaw8UXmfTnJ95JqO/bZ/pYJ61br PUasT4fr81VJlmKNUr2iekJRUsgh3NdVtWdr5DvwUDKSOmrf5upTVZQ8l5eOMINGO4s+ WSWQ== X-Gm-Message-State: AOJu0YzxzIQtWrpRCFJRBIIWgn4DLCf7wvhqn5MOPKiAbGCXEJdAoZZd IjJ75Ff//caxFae6oqH8oxHM/SxnZEG/d9ZCUZg= X-Google-Smtp-Source: AGHT+IHEFpL6Maqdx2qW+4ZPVO42RQXJj8TvMVKp1yyI2ZBB9UgDuSfGZS5/GqfxH8WUmkTBXEP0NQ== X-Received: by 2002:a25:824e:0:b0:da0:6179:95ac with SMTP id d14-20020a25824e000000b00da0617995acmr14409125ybn.48.1698871336813; Wed, 01 Nov 2023 13:42:16 -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, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v8 02/19] target/riscv/tcg: do not use "!generic" CPU checks Date: Wed, 1 Nov 2023 17:41:47 -0300 Message-ID: <20231101204204.345470-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231101204204.345470-1-dbarboza@ventanamicro.com> References: <20231101204204.345470-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::b2a; envelope-from=dbarboza@ventanamicro.com; helo=mail-yb1-xb2a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1698871532030100015 Content-Type: text/plain; charset="utf-8" Our current logic in get/setters of MISA and multi-letter extensions works because we have only 2 CPU types, generic and vendor, and by using "!generic" we're implying that we're talking about vendor CPUs. When adding a third CPU type this logic will break so let's handle it beforehand. In set_misa_ext_cfg() and set_multi_ext_cfg(), check for "vendor" cpu inste= ad of "not generic". The "generic CPU" checks remaining are from riscv_cpu_add_misa_properties() and cpu_add_multi_ext_prop() before applying default values for the extensions. This leaves us with: - vendor CPUs will not allow extension enablement, all other CPUs will; - generic CPUs will inherit default values for extensions, all others won't. And now we can add a new, third CPU type, that will allow extensions to be enabled and will not inherit defaults, without changing the existing logic. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis --- target/riscv/tcg/tcg-cpu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 093bda2e75..f54069d06f 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -612,6 +612,11 @@ static bool riscv_cpu_is_generic(Object *cpu_obj) return object_dynamic_cast(cpu_obj, TYPE_RISCV_DYNAMIC_CPU) !=3D NULL; } =20 +static bool riscv_cpu_is_vendor(Object *cpu_obj) +{ + return object_dynamic_cast(cpu_obj, TYPE_RISCV_VENDOR_CPU) !=3D NULL; +} + /* * We'll get here via the following path: * @@ -674,7 +679,7 @@ static void cpu_set_misa_ext_cfg(Object *obj, Visitor *= v, const char *name, target_ulong misa_bit =3D misa_ext_cfg->misa_bit; RISCVCPU *cpu =3D RISCV_CPU(obj); CPURISCVState *env =3D &cpu->env; - bool generic_cpu =3D riscv_cpu_is_generic(obj); + bool vendor_cpu =3D riscv_cpu_is_vendor(obj); bool prev_val, value; =20 if (!visit_type_bool(v, name, &value, errp)) { @@ -688,7 +693,7 @@ static void cpu_set_misa_ext_cfg(Object *obj, Visitor *= v, const char *name, } =20 if (value) { - if (!generic_cpu) { + if (vendor_cpu) { g_autofree char *cpuname =3D riscv_cpu_get_name(cpu); error_setg(errp, "'%s' CPU does not allow enabling extensions", cpuname); @@ -793,7 +798,7 @@ static void cpu_set_multi_ext_cfg(Object *obj, Visitor = *v, const char *name, { const RISCVCPUMultiExtConfig *multi_ext_cfg =3D opaque; RISCVCPU *cpu =3D RISCV_CPU(obj); - bool generic_cpu =3D riscv_cpu_is_generic(obj); + bool vendor_cpu =3D riscv_cpu_is_vendor(obj); bool prev_val, value; =20 if (!visit_type_bool(v, name, &value, errp)) { @@ -817,7 +822,7 @@ static void cpu_set_multi_ext_cfg(Object *obj, Visitor = *v, const char *name, return; } =20 - if (value && !generic_cpu) { + if (value && vendor_cpu) { g_autofree char *cpuname =3D riscv_cpu_get_name(cpu); error_setg(errp, "'%s' CPU does not allow enabling extensions", cpuname); --=20 2.41.0