From nobody Tue Feb 10 08:26:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 1635503298090127.85341081689307; Fri, 29 Oct 2021 03:28:18 -0700 (PDT) Received: from localhost ([::1]:50902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgP7P-0001ma-RM for importer@patchew.org; Fri, 29 Oct 2021 06:28:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgNnr-0001DL-4m for qemu-devel@nongnu.org; Fri, 29 Oct 2021 05:03:59 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:37512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgNnp-0006m9-A6 for qemu-devel@nongnu.org; Fri, 29 Oct 2021 05:03:58 -0400 Received: by mail-pg1-x52b.google.com with SMTP id s136so9309183pgs.4 for ; Fri, 29 Oct 2021 02:03:56 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:46b:ce55:983b:6962:38ac:e1b9]) by smtp.gmail.com with ESMTPSA id t13sm5081477pgn.94.2021.10.29.02.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 02:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xqn22C3m0jli2n6uu5yKQIyaAPKWQbXYU3N5QNZntjI=; b=lR1/PJ3QmSQZu6QMhvE3YRhE3JE3AB6baY/l45ziFz6MBI7gXMx62irO+cGloDk8H/ gu+1UCMSCDzwE9ogzODqOhestl8FyZxdL0lEjpI/63Wpt0waqwZf+Ik/wJY8ksm7k2KI mQxlclIXhH4lJlqyordrqkTSk8OuN5J65QeB3u4TWIjcMWaj6iIVbnX7uPSZg16ghHWW 5CdrpFQLAQFoaJYwYGRFxlPpI9hcY2Ll8oVMIlXzVLmUImtWQn8j5hN3GqZVbOrdAe4g KXLCRwiekYl1JtoySFiJV86CkFJ87gbCelwcsAGa8b86TzM1WGLOOHwX3+wqJLa0ti0C E+eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xqn22C3m0jli2n6uu5yKQIyaAPKWQbXYU3N5QNZntjI=; b=dDIdvC+EgFB9Kv9zX0WNOTylserSnvIgBxbvbV3PXDLm6dQayeSs1Jy8wH5j1Dzhxz 6K4Rc2Y/V00sGLMX20Kp0cy6J6EsnnzWTeoVPYA5TTW/ThP0DTVXT6O2LxeJUdc1bL9J SQJYQ+v+O2LAVK6333onIkYQ3IF5Qv0Ej3PI1Mn6bOopDujwV2WrSZB42t1JONakQ9gL t1BZtZ3Btliv7dxIRFZCEiE3cxhS3rbT6TuyOoKSe6oGGT/EFzveUf3lmR3aYnGQP6Za /0MGAh/nSvYFlVh+a/rds5N2MI4k7IfNJgDIcQ8lLg1F4MDEHnhDcUt5SoPi3lqJ/z0F N93w== X-Gm-Message-State: AOAM530zM00FoTvxR5HNkLhe9LwurHODqX6rFshpps3olrVVCRlGz73u i4uo2QtWLW2+NBfiEtUZsKtBLikG+4ALhiOH X-Google-Smtp-Source: ABdhPJxL3gWQRuX3MWnQ2bnv0Xi7TnzMSdQeYCzEp3LXxL8er7IVWQQFe8pmmr1VynPjwsQgETasDw== X-Received: by 2002:a63:7e01:: with SMTP id z1mr7204934pgc.238.1635498235961; Fri, 29 Oct 2021 02:03:55 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Subject: [PATCH v9 68/76] target/riscv: gdb: support vector registers for rv64 & rv32 Date: Fri, 29 Oct 2021 16:59:13 +0800 Message-Id: <20211029085922.255197-69-frank.chang@sifive.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029085922.255197-1-frank.chang@sifive.com> References: <20211029085922.255197-1-frank.chang@sifive.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::52b; envelope-from=frank.chang@sifive.com; helo=mail-pg1-x52b.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , qemu-riscv@nongnu.org, Frank Chang , Hsiangkai Wang , Bin Meng , Palmer Dabbelt , Greentime Hu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635503300272100001 Content-Type: text/plain; charset="utf-8" From: Hsiangkai Wang Signed-off-by: Hsiangkai Wang Signed-off-by: Greentime Hu Signed-off-by: Frank Chang Acked-by: Alistair Francis --- target/riscv/cpu.c | 2 + target/riscv/cpu.h | 1 + target/riscv/gdbstub.c | 184 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c760ea08621..860f356bd99 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -675,6 +675,8 @@ static const char *riscv_gdb_get_dynamic_xml(CPUState *= cs, const char *xmlname) =20 if (strcmp(xmlname, "riscv-csr.xml") =3D=3D 0) { return cpu->dyn_csr_xml; + } else if (strcmp(xmlname, "riscv-vector.xml") =3D=3D 0) { + return cpu->dyn_vreg_xml; } =20 return NULL; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 5d93ccdfa71..dc10f27093b 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -291,6 +291,7 @@ struct RISCVCPU { CPURISCVState env; =20 char *dyn_csr_xml; + char *dyn_vreg_xml; =20 /* Configuration Settings */ struct { diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index 23429179e2e..881ab333924 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -20,6 +20,32 @@ #include "exec/gdbstub.h" #include "cpu.h" =20 +struct TypeSize { + const char *gdb_type; + const char *id; + int size; + const char suffix; +}; + +static const struct TypeSize vec_lanes[] =3D { + /* quads */ + { "uint128", "quads", 128, 'q' }, + /* 64 bit */ + { "uint64", "longs", 64, 'l' }, + /* 32 bit */ + { "uint32", "words", 32, 'w' }, + /* 16 bit */ + { "uint16", "shorts", 16, 's' }, + /* + * TODO: currently there is no reliable way of telling + * if the remote gdb actually understands ieee_half so + * we don't expose it in the target description for now. + * { "ieee_half", 16, 'h', 'f' }, + */ + /* bytes */ + { "uint8", "bytes", 8, 'b' }, +}; + int riscv_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) { RISCVCPU *cpu =3D RISCV_CPU(cs); @@ -101,6 +127,96 @@ static int riscv_gdb_set_fpu(CPURISCVState *env, uint8= _t *mem_buf, int n) return 0; } =20 +/* + * Convert register index number passed by GDB to the correspond + * vector CSR number. Vector CSRs are defined after vector registers + * in dynamic generated riscv-vector.xml, thus the starting register index + * of vector CSRs is 32. + * Return 0 if register index number is out of range. + */ +static int riscv_gdb_vector_csrno(int num_regs) +{ + /* + * The order of vector CSRs in the switch case + * should match with the order defined in csr_ops[]. + */ + switch (num_regs) { + case 32: + return CSR_VSTART; + case 33: + return CSR_VXSAT; + case 34: + return CSR_VXRM; + case 35: + return CSR_VCSR; + case 36: + return CSR_VL; + case 37: + return CSR_VTYPE; + case 38: + return CSR_VLENB; + default: + /* Unknown register. */ + return 0; + } +} + +static int riscv_gdb_get_vector(CPURISCVState *env, GByteArray *buf, int n) +{ + uint16_t vlenb =3D env_archcpu(env)->cfg.vlen >> 3; + if (n < 32) { + int i; + int cnt =3D 0; + for (i =3D 0; i < vlenb; i +=3D 8) { + cnt +=3D gdb_get_reg64(buf, + env->vreg[(n * vlenb + i) / 8]); + } + return cnt; + } + + int csrno =3D riscv_gdb_vector_csrno(n); + + if (!csrno) { + return 0; + } + + target_ulong val =3D 0; + int result =3D riscv_csrrw_debug(env, csrno, &val, 0, 0); + + if (result =3D=3D 0) { + return gdb_get_regl(buf, val); + } + + return 0; +} + +static int riscv_gdb_set_vector(CPURISCVState *env, uint8_t *mem_buf, int = n) +{ + uint16_t vlenb =3D env_archcpu(env)->cfg.vlen >> 3; + if (n < 32) { + int i; + for (i =3D 0; i < vlenb; i +=3D 8) { + env->vreg[(n * vlenb + i) / 8] =3D ldq_p(mem_buf + i); + } + return vlenb; + } + + int csrno =3D riscv_gdb_vector_csrno(n); + + if (!csrno) { + return 0; + } + + target_ulong val =3D ldtul_p(mem_buf); + int result =3D riscv_csrrw_debug(env, csrno, NULL, val, -1); + + if (result =3D=3D 0) { + return sizeof(target_ulong); + } + + return 0; +} + static int riscv_gdb_get_csr(CPURISCVState *env, GByteArray *buf, int n) { if (n < CSR_TABLE_SIZE) { @@ -187,6 +303,68 @@ static int riscv_gen_dynamic_csr_xml(CPUState *cs, int= base_reg) return CSR_TABLE_SIZE; } =20 +static int ricsv_gen_dynamic_vector_xml(CPUState *cs, int base_reg) +{ + RISCVCPU *cpu =3D RISCV_CPU(cs); + GString *s =3D g_string_new(NULL); + g_autoptr(GString) ts =3D g_string_new(""); + int reg_width =3D cpu->cfg.vlen; + int num_regs =3D 0; + int i; + + g_string_printf(s, ""); + g_string_append_printf(s, "= "); + g_string_append_printf(s, ""); + + /* First define types and totals in a whole VL */ + for (i =3D 0; i < ARRAY_SIZE(vec_lanes); i++) { + int count =3D reg_width / vec_lanes[i].size; + g_string_printf(ts, "%s", vec_lanes[i].id); + g_string_append_printf(s, + "", + ts->str, vec_lanes[i].gdb_type, count); + } + + /* Define unions */ + g_string_append_printf(s, ""); + for (i =3D 0; i < ARRAY_SIZE(vec_lanes); i++) { + g_string_append_printf(s, "", + vec_lanes[i].suffix, + vec_lanes[i].id); + } + g_string_append(s, ""); + + /* Define vector registers */ + for (i =3D 0; i < 32; i++) { + g_string_append_printf(s, + "", + i, reg_width, base_reg++); + num_regs++; + } + + /* Define vector CSRs */ + const char *vector_csrs[7] =3D { + "vstart", "vxsat", "vxrm", "vcsr", + "vl", "vtype", "vlenb" + }; + + for (i =3D 0; i < 7; i++) { + g_string_append_printf(s, + "", + vector_csrs[i], TARGET_LONG_BITS, base_reg+= +); + num_regs++; + } + + g_string_append_printf(s, ""); + + cpu->dyn_vreg_xml =3D g_string_free(s, false); + return num_regs; +} + void riscv_cpu_register_gdb_regs_for_features(CPUState *cs) { RISCVCPU *cpu =3D RISCV_CPU(cs); @@ -198,6 +376,12 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState= *cs) gdb_register_coprocessor(cs, riscv_gdb_get_fpu, riscv_gdb_set_fpu, 36, "riscv-32bit-fpu.xml", 0); } + if (env->misa_ext & RVV) { + gdb_register_coprocessor(cs, riscv_gdb_get_vector, riscv_gdb_set_v= ector, + ricsv_gen_dynamic_vector_xml(cs, + cs->gdb_num_= regs), + "riscv-vector.xml", 0); + } #if defined(TARGET_RISCV32) gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virt= ual, 1, "riscv-32bit-virtual.xml", 0); --=20 2.25.1