From nobody Thu Apr 30 20:20:42 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751627955; cv=none; d=zohomail.com; s=zohoarc; b=KePqIo0uSv+MJ94315TiuTz9o/S7zmWbDH4ser0eQBmq6lxKvRYcPnKL+ct+3V0VOojviIwdFlwE+x1UBmGkOAzMZFnTOuobj9jciZ5aqgZOEVk0EHfEhoaOTMZgupE74UdU1SPQMrtUok5TInqnt8dHG3jul55uYNMxbWhTneM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751627955; 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=6LeQAAogdZ6utUWU8uZD20yEC9hkJc37e9nimWKPLx0=; b=DqcVSZXetegrVM0p5Woy2LjPxXj9Mmq72mhPg/7l6MEEwp9zu6XbsVHghQKPPumqKXgMjQ7FUVvYurfId3nBUUtl9m7OXLGScT48t8YfN7VJ52Ql3/85p5eFm5RMUsVdhoDBix5SaG5uF5DuU0VWVWatTy9PhpY4aF/8tkExvac= 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 175162795517522.204811387455266; Fri, 4 Jul 2025 04:19:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXeOc-00085F-0J; Fri, 04 Jul 2025 07:16:02 -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 1uXeND-0005M5-UU for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:14:35 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXeNB-0004S3-I2 for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:14:31 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-23c8a5053c2so2285455ad.1 for ; Fri, 04 Jul 2025 04:14:29 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c8431a206sm18002655ad.28.2025.07.04.04.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 04:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751627668; x=1752232468; 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=6LeQAAogdZ6utUWU8uZD20yEC9hkJc37e9nimWKPLx0=; b=kCJfBjNaW7DnUcznVJSlyQ1k7U6JLfuSVxo6vamiPtPybEH/KKKFAu3ZznGW/CtQev kx7agtkEUdH/ip2EV9O9LBEOiywhF8uhtnqDcP6RuHwOYogCHphdDlR6lXeL2taJvTgy M0zW3nuN11C0qvoYx66+FUeuuebCrwKCNnQ5w6+Q2ihreB7LGrxqqUpKePTtu4sD7jzO UfgYPJIYITq1uk6iqL56PRNN8ywVq+Y7YqdUO0JxoH/noojp83yhPB2QM5nTJC9or/Gy UKgpSfemV0tXJwdiFfUQKVaALxgISqQUIW8yznwYrEf6AY2k1m1jRpgv7FYDS820MzJS 8S5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751627668; x=1752232468; 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=6LeQAAogdZ6utUWU8uZD20yEC9hkJc37e9nimWKPLx0=; b=AvwbmgRlTqmOP39ezeVAHnOVStruneEvSELEf8O4s6gUCXULZ5oS4+RWVd80OI2E43 fk+gUIol0E59xmiuBA6spLSkDrqyQDgA6fiK9hRIqKkYR5mryvlIfATkKoDbfuBR7jBk wac/1mJV5xD3Fnt/IKhXyEea6gLbiv2N59LzWmUOVFn2zJXOlIOamOOP5k+lVI+TpEoA YMvdi12egre+n9L/2zuVJNs2opooHjFLCWAFUcZx/S2tR7P1WJ2201J0IRqE7FqPj+xG JiksM50+ICblnSGaAdNAYkgEHzuOyf8kZi1ey45whFmzW9fnhZKTjCukq3MyxM1NdAW7 LmqQ== X-Gm-Message-State: AOJu0YwnItwhCGEfaFhBvmh9fGuWatx2PRJXtcO40XLj8ZlMKUAVZ8bG kE0Q6EyHkVBTawhrpfdNDZAefgXWuQ8S7Qp57sNfjhOzM68W8OERZrThOdwBXw== X-Gm-Gg: ASbGnctY1gJIBRIHzp8xSDwvXKKNkpqtle+Qnf5kyPkNvpKlASlghzNyGd2o/Ne++tb 7VM2oie0cUwgisokZR31M6NAQOiI0MaGuHxzARmUFlzGyukmv3fMXPBJNxC+Er/Lp5/zVNb/hkF /tozxDkCEzHzJZrWJhZCDFB7wSi7HYc2O3ggCQQGflZWgo0stebzfkD/i69Lb9pwEk4zrls7gnh LNN95faUgeRZI31BFSCq2x+/57UZk6q0MiLqVyUzlLaAuVp574TfT5AKVfjMvJKBtjpGEBPLJ0I zneylRjYdG4aMA7akILDtlGqjdXYDdRf/FYRuzI76XdXaWVC6Rbw+k/ArX6Lj2I2qzeybt7IZ4s FzXFuAypUn5o1+j+nSyfDB75vTWBM9nUvkn0YNOyrMDwxgZw2vVaLhKyIrDShs1VBwS4= X-Google-Smtp-Source: AGHT+IHgIhtJkgUSheu5mR9p8B+GF/abC0ifNtVn4z7tskl9K2HaIPavnUbm7fdqKF38JOIL65FrIA== X-Received: by 2002:a17:903:faf:b0:236:9726:7264 with SMTP id d9443c01a7336-23c8609c053mr38721285ad.5.1751627667985; Fri, 04 Jul 2025 04:14:27 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Vasilis Liaskovitis , Daniel Henrique Barboza , Alistair Francis Subject: [PULL 39/40] target/riscv: Add a property to set vill bit on reserved usage of vsetvli instruction Date: Fri, 4 Jul 2025 21:12:06 +1000 Message-ID: <20250704111207.591994-40-alistair.francis@wdc.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704111207.591994-1-alistair.francis@wdc.com> References: <20250704111207.591994-1-alistair.francis@wdc.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::634; envelope-from=alistair23@gmail.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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: 1751627957315116600 Content-Type: text/plain; charset="utf-8" From: Vasilis Liaskovitis Usage of vsetvli instruction is reserved if VLMAX is changed when vsetvli r= s1 and rd arguments are x0. In this case, if the new property is true, only the vill bit will be set. See https://github.com/riscv/riscv-isa-manual/blob/main/src/v-st-ext.adoc#a= vl-encoding According to the spec, the above use cases are reserved, and "Implementations may set vill in either case." Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2422 Signed-off-by: Vasilis Liaskovitis Reviewed-by: Daniel Henrique Barboza Message-ID: <20250618213542.22873-1-vliaskovitis@suse.com> Signed-off-by: Alistair Francis --- target/riscv/helper.h | 2 +- target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/cpu.c | 1 + target/riscv/vector_helper.c | 12 +++++++++++- target/riscv/insn_trans/trans_rvv.c.inc | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index 85d73e492d..f712b1c368 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -159,7 +159,7 @@ DEF_HELPER_FLAGS_3(hyp_hsv_d, TCG_CALL_NO_WG, void, env= , tl, tl) #endif =20 /* Vector functions */ -DEF_HELPER_3(vsetvl, tl, env, tl, tl) +DEF_HELPER_4(vsetvl, tl, env, tl, tl, tl) DEF_HELPER_5(vle8_v, void, ptr, ptr, tl, env, i32) DEF_HELPER_5(vle16_v, void, ptr, ptr, tl, env, i32) DEF_HELPER_5(vle32_v, void, ptr, ptr, tl, env, i32) diff --git a/target/riscv/cpu_cfg_fields.h.inc b/target/riscv/cpu_cfg_field= s.h.inc index 33c4f9bac8..98ceb7b340 100644 --- a/target/riscv/cpu_cfg_fields.h.inc +++ b/target/riscv/cpu_cfg_fields.h.inc @@ -114,6 +114,7 @@ BOOL_FIELD(ext_supm) BOOL_FIELD(rvv_ta_all_1s) BOOL_FIELD(rvv_ma_all_1s) BOOL_FIELD(rvv_vl_half_avl) +BOOL_FIELD(rvv_vsetvl_x0_vill) /* Named features */ BOOL_FIELD(ext_svade) BOOL_FIELD(ext_zic64b) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index e3f8ecef68..6f1d0618f1 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2632,6 +2632,7 @@ static const Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("rvv_ta_all_1s", RISCVCPU, cfg.rvv_ta_all_1s, false), DEFINE_PROP_BOOL("rvv_ma_all_1s", RISCVCPU, cfg.rvv_ma_all_1s, false), DEFINE_PROP_BOOL("rvv_vl_half_avl", RISCVCPU, cfg.rvv_vl_half_avl, fal= se), + DEFINE_PROP_BOOL("rvv_vsetvl_x0_vill", RISCVCPU, cfg.rvv_vsetvl_x0_vil= l, false), =20 /* * write_misa() is marked as experimental for now so mark diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 5dc1c10012..b41c29da0b 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -35,7 +35,7 @@ #include =20 target_ulong HELPER(vsetvl)(CPURISCVState *env, target_ulong s1, - target_ulong s2) + target_ulong s2, target_ulong x0) { int vlmax, vl; RISCVCPU *cpu =3D env_archcpu(env); @@ -83,6 +83,16 @@ target_ulong HELPER(vsetvl)(CPURISCVState *env, target_u= long s1, } else { vl =3D vlmax; } + + if (cpu->cfg.rvv_vsetvl_x0_vill && x0 && (env->vl !=3D vl)) { + /* only set vill bit. */ + env->vill =3D 1; + env->vtype =3D 0; + env->vl =3D 0; + env->vstart =3D 0; + return 0; + } + env->vl =3D vl; env->vtype =3D s2; env->vstart =3D 0; diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_tr= ans/trans_rvv.c.inc index 4cd030c7eb..610bf9ff30 100644 --- a/target/riscv/insn_trans/trans_rvv.c.inc +++ b/target/riscv/insn_trans/trans_rvv.c.inc @@ -202,7 +202,7 @@ static bool do_vsetvl(DisasContext *s, int rd, int rs1,= TCGv s2) s1 =3D get_gpr(s, rs1, EXT_ZERO); } =20 - gen_helper_vsetvl(dst, tcg_env, s1, s2); + gen_helper_vsetvl(dst, tcg_env, s1, s2, tcg_constant_tl((int) (rd =3D= =3D 0 && rs1 =3D=3D 0))); gen_set_gpr(s, rd, dst); finalize_rvv_inst(s); =20 @@ -222,7 +222,7 @@ static bool do_vsetivli(DisasContext *s, int rd, TCGv s= 1, TCGv s2) =20 dst =3D dest_gpr(s, rd); =20 - gen_helper_vsetvl(dst, tcg_env, s1, s2); + gen_helper_vsetvl(dst, tcg_env, s1, s2, tcg_constant_tl(0)); gen_set_gpr(s, rd, dst); finalize_rvv_inst(s); gen_update_pc(s, s->cur_insn_len); --=20 2.50.0