From nobody Fri Nov 14 23:30:40 2025 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=1762861870; cv=none; d=zohomail.com; s=zohoarc; b=l2rTf+qTwKqUk7biuQ0vsYFiM/CkusZgI2dQvdJu+jadIa5Pc/c989eyuC6AOee6xyHm5cTL/lO7I5x9xvg9cNtOIOlxv4JT0tiNwG+pNASk0FJi08CtUbr+6z3ed5aJStFV0VwpgZLLZ+UgoxqfL0tvrAnLmatVhyqLOnILpJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762861870; 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=ivUquUYiwaXXCD1dXO2VwN1hIYAeG2qwuYKXR8Yl3go=; b=irHuKRbiyzV3N1poVZUF6dIQt+OmlsMq3FQNdn+FCk9GIFNU74pkgHlWccunZYBaVgiSoMZwFf66yYYs6Iu6ANbwqloB+XylGYhJfPX1qzd6tnvY1LzB7lpfGc7AcKVD8597Ip2zeKlsjodzULTDfNjAZKYT/Ejm8YKXRgfqo3Q= 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 1762861870613735.0224535023749; Tue, 11 Nov 2025 03:51:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vImsU-0000wq-Td; Tue, 11 Nov 2025 06:49:41 -0500 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 1vImre-0007pW-KT for qemu-devel@nongnu.org; Tue, 11 Nov 2025 06:48:46 -0500 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vImrc-0004Zm-Ec for qemu-devel@nongnu.org; Tue, 11 Nov 2025 06:48:46 -0500 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b994baabfcfso2547417a12.3 for ; Tue, 11 Nov 2025 03:48:44 -0800 (PST) Received: from grind.dc1.ventanamicro.com ([179.93.21.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651c747d1sm177533125ad.63.2025.11.11.03.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 03:48:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1762861722; x=1763466522; 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=ivUquUYiwaXXCD1dXO2VwN1hIYAeG2qwuYKXR8Yl3go=; b=N344eOHodYbTS1W/XLuXZpR8sn0rYVcerZXDkioBPa6EZfuP2qGvDZAeEqVvWFqATR MeqUIXCqD+Q3DoaiFtR8nWJi9jwMGTuzDb/+Ws+nXIw6CkSH8Iw9fke0aXMlQjmsSR2I VgvgqfADU8jrgojRLTkGzbNmVLZaNymrYRsBAxIpUskSnLKqW2XKLjpf98//DT5YGrV8 QTY0u3p13FVVbkfSo58oRBBIWm86h76wbwXtVZGp7k43yM8RgpSLnVD9KYSkRB/zxluU hh3gAGbuGn4Y3UM3ppHVxlXoC/+Yc14gW54GMKXqma1r0kHJho2GokZyJ9NbWUGX8ZPb KdZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762861722; x=1763466522; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ivUquUYiwaXXCD1dXO2VwN1hIYAeG2qwuYKXR8Yl3go=; b=FsP/QwujV/NMzsnNSC0USq/Mu7XJjjGfj3KXmhDVjCDZhx+hRFG9AxmxvWWFBgTu+j 3GofOagMxIibBNHYubPL+diCsvBVuhCCTokzbV7jBqC93LNU7IFMmZyn+K7d4iOD/WeO vqmDnzDfAcHP5i4N1UwT8/SZaOlyOLaExD9w3mw1KzAO4gEiJVIT9C6GPgE2i4jwE2ry 6Y4BeaLKoyRtobVZNcoqSIJP4pcY4AD33FAQECx0h8ggfFTBqIBA2iINvuE3yezvxniN +kpqMuATnMIXWEDXxsat3XLjnamrZBrlUOygsqDQgrOW9GzOq2GOKfd+wJkmE0WOjk6p PwUA== X-Gm-Message-State: AOJu0YzVx3OrHmsShl45S5LQZXvYXP+v1wrVwEbVAYdDmXZe3rzVVqln mQFlSfvyyZDJ2ZldS2hC3msDVbMIw+xp5L142rxTkvqRVcL6V4N0kzjS8OiPy6aEdmzzVbljNK/ sT/zrrKk= X-Gm-Gg: ASbGnct/oZ+iWkRzGlFtvxsTnpGNC9rgU/8O9zVswNM6gwdUJ6V01VJpJ4UjLQ1KzyS 7TJd0bMJ9yNR5zRB1wPaOZp+RZ945TnYe8iFOBAGNyvsqSXzjl/4x1Dl1u0Y6JEWxOBjhBDzyku hvovDzXkqpLr8fL9zymZc3hGPxx5YlB+/XhaA+jHIwooWFHmYm1BSPKK5aKw16rYEeyEd+R6T48 mX9L38IczqgqqDwlTscFsgCSPhF8ABQGqfO42GKnnGPmqB/awS+O5WjqzDN2VU81rrE1smGgiJD tcs7Oj3JW+si/OgC55AHrgXbmmnAfrMNrRbKWU9L9OXBOvQ0z2pt6QR5kj5sZNfmaTF/MyyMqUf iGt6tIW+Cw1p6rHFmUSv3yywV3VCLicpUFUK0L9Fxp7CgRSRKqWxdz0GcvyfteVCCeNsFO9tnj9 tCwRhVNPuKHo2NXHl2Y67mzHCTAgs= X-Google-Smtp-Source: AGHT+IHPPmjHiYmtcQd6TJYSSaltcKlRmr4hQ8mCkU45m7nMaJ1AXhW1TeazFNrtFH1SAzJT+T48hA== X-Received: by 2002:a17:902:f707:b0:297:f09a:51db with SMTP id d9443c01a7336-297f09a5380mr131373575ad.15.1762861722509; Tue, 11 Nov 2025 03:48:42 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@dabbelt.com, Daniel Henrique Barboza Subject: [PATCH v2 15/17] hw/riscv/rv-trace-messages: add format 1 msgs with branch info Date: Tue, 11 Nov 2025 08:46:54 -0300 Message-ID: <20251111114656.2285048-16-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251111114656.2285048-1-dbarboza@ventanamicro.com> References: <20251111114656.2285048-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::530; envelope-from=dbarboza@ventanamicro.com; helo=mail-pg1-x530.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: 1762861872147158501 Content-Type: text/plain; charset="utf-8" Add encoded message helpers to send branch information trace packets. Signed-off-by: Daniel Henrique Barboza --- hw/riscv/rv-trace-messages.c | 126 +++++++++++++++++++++++++++++++++++ hw/riscv/rv-trace-messages.h | 7 ++ 2 files changed, 133 insertions(+) diff --git a/hw/riscv/rv-trace-messages.c b/hw/riscv/rv-trace-messages.c index 3fa70ba81c..a93b0adfc6 100644 --- a/hw/riscv/rv-trace-messages.c +++ b/hw/riscv/rv-trace-messages.c @@ -64,6 +64,31 @@ typedef struct RVTraceFormat2Payload { } RVTraceFormat2Payload; #define FORMAT2_PAYLOAD_SIZE_64BITS 9 =20 +typedef struct RVTraceFormat1BasePayload { + uint8_t format:2; + uint8_t branches:5; + uint32_t branch_map:31; +} RVTraceFormat1BasePayload; +#define FORMAT1_BASE_PAYLOAD_SIZE_64BITS 5 + +typedef struct RVTraceFormat1Payload { + uint8_t format:2; + uint8_t branches:5; + uint32_t branch_map; + uint32_t addressLow; + uint32_t addressHigh; + uint8_t notify:1; + uint8_t updiscon:1; + uint8_t irreport:1; + uint8_t irdepth:3; +} RVTraceFormat1Payload; + +/* + * FORMAT2_PAYLOAD_SIZE_64BITS =3D 9 plus 5 bits of 'branches', + * plus minimal 3 bits of 'branch_map' =3D 10 bytes. + */ +#define FORMAT1_PAYLOAD_MIN_SIZE_64BITS 10 + static void rv_etrace_write_bits(uint8_t *bytes, uint32_t bit_pos, uint32_t num_bits, uint32_t val) { @@ -245,3 +270,104 @@ size_t rv_etrace_gen_encoded_format2_msg(uint8_t *buf= , uint64_t addr, =20 return HEADER_SIZE + header.length; } + +size_t rv_etrace_gen_encoded_format1_noaddr(uint8_t *buf, + uint8_t branches, + uint32_t branch_map) +{ + RVTraceMessageHeader header =3D {.flow =3D 0, .extend =3D 0, + .length =3D FORMAT1_BASE_PAYLOAD_SIZE_64BITS}; + RVTraceFormat1BasePayload payload =3D {.format =3D 0b01, + .branches =3D branches, .branch_map =3D branch_map}; + uint8_t bit_pos; + + rv_etrace_write_header(buf, header); + bit_pos =3D 8; + + rv_etrace_write_bits(buf, bit_pos, 2, payload.format); + bit_pos +=3D 2; + + rv_etrace_write_bits(buf, bit_pos, 5, payload.branches); + bit_pos +=3D 5; + + rv_etrace_write_bits(buf, bit_pos, 31, payload.branch_map); + + return HEADER_SIZE + header.length; +} + +/* + * Same reservations made in the format 2 helper: + * + * - irreport and irdepth is always =3D=3D updiscon; + * + * - return_stack_size_p + call_counter_size_p is hardcoded + * to 3 since we don't implement neither ATM. + */ +size_t rv_etrace_gen_encoded_format1(uint8_t *buf, + uint8_t branches, uint32_t branch_map, + uint64_t addr, + bool notify, bool updiscon) +{ + RVTraceMessageHeader header =3D {.flow =3D 0, .extend =3D 0}; + RVTraceFormat1Payload payload =3D {.format =3D 0b01, + .branches =3D branches, + .notify =3D notify, + .updiscon =3D updiscon}; + uint8_t payload_size =3D FORMAT1_PAYLOAD_MIN_SIZE_64BITS; + uint8_t branch_map_size =3D 0; + uint8_t bit_pos; + + g_assert(branches < 32); + + if (branches <=3D 3) { + branch_map_size =3D 3; + } else if (branches <=3D 7) { + branch_map_size =3D 7; + payload_size++; + } else if (branches <=3D 15) { + branch_map_size =3D 15; + payload_size +=3D 2; + } else { + branch_map_size =3D 31; + payload_size +=3D 4; + } + + header.length =3D payload_size; + + rv_etrace_write_header(buf, header); + bit_pos =3D 8; + + payload.addressLow =3D extract64(addr, 0, 32); + payload.addressHigh =3D extract64(addr, 32, 32); + + payload.irreport =3D updiscon; + if (updiscon) { + payload.irdepth =3D 0b111; + } else { + payload.irdepth =3D 0; + } + + rv_etrace_write_bits(buf, bit_pos, 2, payload.format); + bit_pos +=3D 2; + + rv_etrace_write_bits(buf, bit_pos, 5, payload.branches); + bit_pos +=3D 5; + + rv_etrace_write_bits(buf, bit_pos, branch_map_size, payload.branch_map= ); + bit_pos +=3D branch_map_size; + + rv_etrace_write_bits(buf, bit_pos, 32, payload.addressLow); + bit_pos +=3D 32; + rv_etrace_write_bits(buf, bit_pos, 32, payload.addressHigh); + bit_pos +=3D 32; + + rv_etrace_write_bits(buf, bit_pos, 1, payload.notify); + bit_pos +=3D 1; + rv_etrace_write_bits(buf, bit_pos, 1, payload.updiscon); + bit_pos +=3D 1; + rv_etrace_write_bits(buf, bit_pos, 1, payload.irreport); + bit_pos +=3D 1; + rv_etrace_write_bits(buf, bit_pos, 3, payload.irdepth); + + return HEADER_SIZE + header.length; +} diff --git a/hw/riscv/rv-trace-messages.h b/hw/riscv/rv-trace-messages.h index 50a4a0ef19..2b371641a4 100644 --- a/hw/riscv/rv-trace-messages.h +++ b/hw/riscv/rv-trace-messages.h @@ -28,5 +28,12 @@ size_t rv_etrace_gen_encoded_trap_msg(uint8_t *buf, uint= 64_t trap_addr, uint64_t tval); size_t rv_etrace_gen_encoded_format2_msg(uint8_t *buf, uint64_t addr, bool notify, bool updiscon); +size_t rv_etrace_gen_encoded_format1_noaddr(uint8_t *buf, + uint8_t branches, + uint32_t branch_map); +size_t rv_etrace_gen_encoded_format1(uint8_t *buf, + uint8_t branches, uint32_t branch_map, + uint64_t addr, + bool notify, bool updiscon); =20 #endif --=20 2.51.1