From nobody Mon Feb 9 02:43: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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1750104813; cv=none; d=zohomail.com; s=zohoarc; b=Pv+GwU0YqMMaWRf1HwugYrBcFIgnf6BZuBEB9bUAeDxqQ2QjoKxWi7MpyGxn8xoRFWvMq503xn3ruY1SjgcHTAuVZoOZCdnwRt0168VTHg0b8FHC5i43XkpX8WBhYU9GiVD1UterBgbRiAVDjLdMxOX+0Q1SJEy4aAAO0JWAuRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750104813; 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=kgOv3QDrLKhGVW571WktLHmM4FnfBbBuC/m2NpVkdPg=; b=acAXPQ/J8eLgtrI29DjPkWZ2cdRy2mx2XnKWgim6WJHNnmnmHbjW2tBbjcNlYH4UPvyGHkP2+zSnfJrjA6L6uN4lR3FNOdiG01BUaaMc15wck5vFM+SmH2wiz94h/jTx1GgV82RupEbwB+9vlGzaFcy1XP4qbgL2MoBxjDOmVsI= 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 1750104813285779.7284267518357; Mon, 16 Jun 2025 13:13:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRGC8-0002UY-LO; Mon, 16 Jun 2025 16:12:40 -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 1uRGC5-0002S9-AP for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:37 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uRGC0-00072W-Rk for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:35 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-234c5b57557so46990145ad.3 for ; Mon, 16 Jun 2025 13:12:32 -0700 (PDT) Received: from ubuntu.. ([49.207.59.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2fe1642dfdsm7369494a12.18.2025.06.16.13.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 13:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750104750; x=1750709550; 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=kgOv3QDrLKhGVW571WktLHmM4FnfBbBuC/m2NpVkdPg=; b=S3Oay+OBJEdhBxmbeZMuhpZh03ZbsjnZD2jjx46EYjLq60+ASQz8r6csf5cJyc5/n5 Z8w24u4wlWNRgvOXgWdh9E7cStfS9GUbQ3clT4P/cjK0/wdts3py3zom8nIAUGgLcwtY ZQdxsGVypbTgVL9SAo/8E/sBRYBRsWzB0YNMpq1spbtFemVa9Z0+wb4z1tT9zvFsgoMa l82gDmrn9Y3L0w6Gqjc7a98xwRPTMMkCWqFMldd34knsrYY2u9m79foeEBKhxHKql3gK OCMoFSwL3BbL0s9wQ3dCnBiq0xt2Yjl08cnOV41rrP3r8u+vzTyO90QbE+o5DEYWcRKy 74tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750104750; x=1750709550; 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=kgOv3QDrLKhGVW571WktLHmM4FnfBbBuC/m2NpVkdPg=; b=iCstnnMDqmQULFlEqHYPsr/L9+JRQu7Wt+jhM9AP5R8KyYTISTJznB5wmxWvZikOkr zKFaUFX7PTVmVoe2NEL3WJKAWmTCmGmqeZXNuIhs9hGN55Qd6tAz3AEGt5Sx4MoXUL8l bj2cYiXJnrWx5n2cneugj+yMLkxHGOwzOtDv6l+USyDHcyNgdwbgMheXFF/33PojdALF 2/1vk9HWgHjsQ+Mntd8Hlr/0Jvh9jOTpR3WMp6NiqefLVbuTvVIMudFn2Ulj/D2lZg0k tgGLWNlrH7Gq8n1Xl/S+I4zslyyweh535eypKXSms7d2GnENSkXlWzmPoa+ZFnzi0h2N TfEA== X-Gm-Message-State: AOJu0YziOZihh6/paOfoW3YChv6g5i0mljOPicAXsPjuEd5RD5mSHgTZ CM8gVeQWaI55cGJ6PAQVIzgICfogzelRU5nfS2MEoskWtxoixnO58m5ohaFkfKGxLnE7Rw== X-Gm-Gg: ASbGnctoFq4RhymS6Pb9ihNldB8w/xEH9bxvDAI47NtaVAvkxEAAff1Y11rNYkCJzGv p6HIt+TkwmXKN670riOoF2VpAFUzPPifbLUplAEaZacxwlcURRPDHm/KC/L7WyrxfaRQc3PPQeg cgbKHal9QJkjIBIwMATRoIzRj8YVCA2+ozaYKM+bukf1ne0VH/+JuSHDoHptU+HosF2PzEh4mNp PUfTVeUx+TQXtRvHyoFsOGKoqnwrVd5AgT3fT5+TyYujLJQVuXRnz759lCkjqe9WWOHx5iS9YFM YFS5mL9TMuQvULNRcBfPSBlOYqX9j5Ql3qzSd2s/LP3KDpQEIuOrycjGfLUPYbDkR6VC6ezrgBO HwQ== X-Google-Smtp-Source: AGHT+IHRcn+Cd7E7Imk4di+9+p9PyhEH+jIPZL0wga1pLreg7d1TbCRbaAR7bE+nXvs7KThvFaiUQw== X-Received: by 2002:a17:902:8bc8:b0:234:a139:120d with SMTP id d9443c01a7336-2366b32e4ebmr97028755ad.7.1750104750542; Mon, 16 Jun 2025 13:12:30 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Paolo Bonzini , Mads Ynddal , Stefan Hajnoczi , Tanish Desai Subject: [PATCH 1/3] tracetool: removed the unused vcpu property Date: Mon, 16 Jun 2025 20:12:20 +0000 Message-Id: <20250616201222.6416-2-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250616201222.6416-1-tanishdesai37@gmail.com> References: <20250616201222.6416-1-tanishdesai37@gmail.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::62f; envelope-from=tanishdesai37@gmail.com; helo=mail-pl1-x62f.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: 1750104814669116600 Content-Type: text/plain; charset="utf-8" The vcpu property is no longer used in these backends. Removing it avoids unnecessary checks and simplifies the code generation for these trace backe= nds. Signed-off-by: Tanish Desai Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Stefan Hajnoczi --- scripts/tracetool/backend/log.py | 6 +----- scripts/tracetool/backend/simple.py | 6 +----- scripts/tracetool/backend/syslog.py | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index de27b7e62e..f24acad74c 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -31,11 +31,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) + cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) =20 out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', ' if (message_with_timestamp) {', diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index 2688d4b64b..7c84c06b20 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -37,11 +37,7 @@ def generate_h_begin(events, group): =20 def generate_h(event, group): event_id =3D 'TRACE_' + event.name.upper() - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % event_id + cond =3D "trace_event_get_state(%s)" % event_id out(' if (%(cond)s) {', ' _simple_%(api)s(%(args)s);', ' }', diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 012970f6cc..6fdc1142fb 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -30,11 +30,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) + cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) =20 out(' if (%(cond)s) {', '#line %(event_lineno)d "%(event_filename)s"', --=20 2.34.1 From nobody Mon Feb 9 02:43: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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1750104791; cv=none; d=zohomail.com; s=zohoarc; b=KC1rbF7GvwRqjVt398fMtPGq2Xu7FiXpAZMdBybZK1WLQoIR5836RrPRcFpcmZFnu8Zj2KRfsVzD1f/j0GRfz+iwh730n3r0OGisLFDfmlcOWtash3wc63TwgtC2I+359ZumKDlV4r+cq1j11w2HQRUuskVtS4oRoj4HutPtUeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750104791; 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=Uq8r4SY6dBJOUCHBztuIABwLi9QFf5rV0uIKi8BAX2Y=; b=aZS8kg5lgXEMqDGtfyJGWniLfh0owT5jYgdL0m7iBcFf4yIdMSOLFgrXy2wserug4r9QygDv+tlBXgJ0A96zeB6gYcFpVN0SHdoN+5+Rk7R7nlW/HbCZCbWP2jSOoyeRNvggVFGxfWQXcp3IgqcrqeRJ8vBD1uU2P3gXjcx9ndU= 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 1750104791742533.410643362775; Mon, 16 Jun 2025 13:13:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRGCG-0002WD-4j; Mon, 16 Jun 2025 16:12:48 -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 1uRGCB-0002VC-JS for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:44 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uRGC5-00073s-8y for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:43 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-7fd35b301bdso5905440a12.2 for ; Mon, 16 Jun 2025 13:12:36 -0700 (PDT) Received: from ubuntu.. ([49.207.59.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2fe1642dfdsm7369494a12.18.2025.06.16.13.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 13:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750104753; x=1750709553; 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=Uq8r4SY6dBJOUCHBztuIABwLi9QFf5rV0uIKi8BAX2Y=; b=UQZ6AIo7i0PPJb04zBK8i1qBvxvmt0khhnODL8NZY+Z4hsYyh8wSUxMo+bcdmGrGi8 3n3yqnw4S6+CueEqT6egZUzxrZOjL0Pz0n/rmZu9eNqT6BTyl+X2gvAR4DAoGPn3qh1x 4UmSu92+MAx6mDfo1a5Z56izQ3omWyST5bkOiLqfIRzb6H4CPX6BescPQ1z/IMrsvCN0 F/XhpBVrhrP2pJ/mrnWJR4R3xLb0HmlGLsaW15DjIqq2lFxurfWTmM5qLsBmOAIzMd/D nKyPFhCq0RmNG91wL9aOhNFklcj4ETKBbFx5+KNLAyB10EBeC3p3R7TipJow6X2v8yhg 8xpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750104753; x=1750709553; 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=Uq8r4SY6dBJOUCHBztuIABwLi9QFf5rV0uIKi8BAX2Y=; b=GX7kN8+yYzStywk7LrbPtBHJuEt9Gbq25c39ZKI8LpnVU8caqE/Ozgy5z+D+Jdjufe bjcRtsatBgSxW8dI3nntEZsi9Cdxz71+YU4+Tx4ly5G8SFAb6Q9jtWL+lYmfEZ1wHWqd YRftBbLweI/bHmwZGAx0XtFa2ZVXrBwYxQi49q/DakILl78kah5mCbgK03T61cT/Kqa3 m1v+FxOuQ2xR0TOy5UoUGvBrs7afKIGp5WhGS5k/TffWyVvzCOgINoDzF2+DTBvt/0PV YKQhM7AT8OMAJvVSyWkvCKmk81XI948AuLexGk5YswKdycNuXr3nFt9fCBdPPOdH9yCo MUqw== X-Gm-Message-State: AOJu0YzJvw2s3KQsjUfmGeAlJVKWJN3NV+cVkvKpbf5p9j1+BUALmWUJ yPEjoW4CI3l4u3wk9IiddNB2u3SvPwGwf1vjwjYUx6m30fEM64N7m24+DqYnGmByiMECYA== X-Gm-Gg: ASbGnctgNZvweO/OzcwJLNywhc77L2h0BmlWRBGUK8h1PqdsFEBFowJ9rHLlsgjXI+s OJjcmmKpsdbhW3stuorY2ugxE4YmQXdv347/xIbpvR/RIVMuSUGyuPCg8cy2EoyCkWXARvre+eF 46aSQXqE775++YK7Les8UlsPfLCfJG9Vi9Cqzo1jaTymXhlbLZkqsL5Az2FPA8yAyaT8UwBBURB KB3mVRKxw948vNQ9TOreE0Jw19BboMAsyWwAleLdDIGCHBr7mQcgebilnAoD9FW0mqFH2oc//EK 5eth2pwxpUVqO0mnf6u05zeFhiOZVckT+7ndVS6d980wVeFhWUmVrwiXB69IX/OE8hMQQ2gXFl6 FQg== X-Google-Smtp-Source: AGHT+IH2HblgeAwP+Nsiok75hKrwGZM2CSefExtvTqQzZyrNRCojSbSeJY68oUefXPV+QGBkII6HRA== X-Received: by 2002:a05:6a20:e687:b0:1f5:9330:29fe with SMTP id adf61e73a8af0-21fbd4c7e08mr13286691637.17.1750104752982; Mon, 16 Jun 2025 13:12:32 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Paolo Bonzini , Mads Ynddal , Stefan Hajnoczi , Tanish Desai Subject: [PATCH 2/3] tracetool: introduce generate_unconditional Date: Mon, 16 Jun 2025 20:12:21 +0000 Message-Id: <20250616201222.6416-3-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250616201222.6416-1-tanishdesai37@gmail.com> References: <20250616201222.6416-1-tanishdesai37@gmail.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::532; envelope-from=tanishdesai37@gmail.com; helo=mail-pg1-x532.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: 1750104792647116600 Content-Type: text/plain; charset="utf-8" This patch separates the generation logic of trace_foo() for the UST and DT= race backends from other backends. The motivation is to remove the unnecessary if (true) in the _no_check func= tion, as UST and DTrace do not require a trace_event_get_state check withou= t introducing a seperate function it is very difficult to generate code whi= ch keeps them out of unified if condition. With this separation, we can safely move the trace_event_get_state check in= to trace_foo for the other backends only, keeping UST/DTrace generation pat= hs clean. A new generate_h_unconditional function has been introduced for UST and DTr= ace. It behaves similarly to generate_h, but is defined only in UST and DTr= ace backends. This ensures that generate_h is used by the other backends, w= hile UST/DTrace selectively use generate_h_unconditional. Signed-off-by: Tanish Desai Reviewed-by: Alex Benn=C3=A9e --- scripts/tracetool/backend/__init__.py | 3 +++ scripts/tracetool/backend/dtrace.py | 3 ++- scripts/tracetool/backend/ust.py | 2 +- scripts/tracetool/format/h.py | 10 +++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/back= end/__init__.py index 7bfcc86cc5..c4456a5efd 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -118,6 +118,9 @@ def generate_begin(self, events, group): def generate(self, event, group): self._run_function("generate_%s", event, group) =20 + def generate_unconditional(self, event, group): + self._run_function("generate_%s_unconditional", event, group) + =20 def generate_backend_dstate(self, event, group): self._run_function("generate_%s_backend_dstate", event, group) =20 diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index e17edc9b9d..171b7e09ed 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -61,7 +61,8 @@ def generate_h_begin(events, group): '#endif', uppername=3De.name.upper()) =20 -def generate_h(event, group): + +def generate_h_unconditional(event, group): out(' QEMU_%(uppername)s(%(argnames)s);', uppername=3Devent.name.upper(), argnames=3D", ".join(event.args.names())) diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/u= st.py index c857516f21..1564b490ec 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -30,7 +30,7 @@ def generate_h_begin(events, group): '') =20 =20 -def generate_h(event, group): +def generate_h_unconditional(event, group): argnames =3D ", ".join(event.args.names()) if len(event.args) > 0: argnames =3D ", " + argnames diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index ea126b07ea..89d54b9aff 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -76,13 +76,17 @@ def generate(events, backend, group): out('', 'static inline void %(api)s(%(args)s)', '{', - ' if (%(cond)s) {', + api=3De.api(), + args=3De.args) + =20 + if "disable" not in e.properties: + backend.generate_unconditional(e, group) + + out(' if (%(cond)s) {', ' %(api_nocheck)s(%(names)s);', ' }', '}', - api=3De.api(), api_nocheck=3De.api(e.QEMU_TRACE_NOCHECK), - args=3De.args, names=3D", ".join(e.args.names()), cond=3Dcond) =20 --=20 2.34.1 From nobody Mon Feb 9 02:43: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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1750104818; cv=none; d=zohomail.com; s=zohoarc; b=jGcWqhqRlnr7ItIK/V2qQ9e4hJsh2pvdBcyBGpK8Yd7QFbvksRZTvVYuxIPC2oNl9apGE5hoiB/PQbLcF1rVoZND/ImJgDdftvUMlAOH5RwiBE/H2TvxvjN9vXnZWyIN3vD5A6ESMfzGqWwhV50XB9CaU4aaKmeFC2Dt7nQ7Ytw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750104818; 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=rMLuv2vyspJx1ktef09ky9DNsdcrDZF/n+8r+bXhZTs=; b=kpZ7BYWAS12D78ridPyfBc7kZWuYB7z8QtCbK4Ke1AC3s7PZAITr1sOdugBABYBHh8NhccW5rCE6DmhQ8uNCyCWQiCZsgc4X0fRCT0aPUXY0IFAdoaKSxGHxLCkgz+ztZLgV0DNtUTnHTgiwQNEP1xEAaL1BTyzmqvz11u0RDyw= 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 175010481848237.89072747695991; Mon, 16 Jun 2025 13:13:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRGCE-0002VN-8n; Mon, 16 Jun 2025 16:12:46 -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 1uRGC7-0002UZ-P7 for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:40 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uRGC5-00074q-M0 for qemu-devel@nongnu.org; Mon, 16 Jun 2025 16:12:39 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso5359961b3a.2 for ; Mon, 16 Jun 2025 13:12:37 -0700 (PDT) Received: from ubuntu.. ([49.207.59.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2fe1642dfdsm7369494a12.18.2025.06.16.13.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 13:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750104755; x=1750709555; 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=rMLuv2vyspJx1ktef09ky9DNsdcrDZF/n+8r+bXhZTs=; b=TVez522h9/Ku2fOmOwg8TEpMl82qpb9x5tJ15ix0PzmAJiIJ3YT3h0X72UUpdSYqV6 GKJg52plmNegn6Nj5lkitthQGG0WcaF57kg0rzvlqBuC7335moQ2EDZiYFtQkAgLyEJK SfYLxFMrEP4Z72/UZNY63zkqBelCMzExAuHRM3Bwu0aO64FSMcit4+CUkgbjt/o41jSS gfiFblOqsW1V6HdZA4+83KueadQ2FG6e2To0zVB3ha9xbLOci+XYk/21IEViSBmzv+1n ug9BNSfFfyvPFGUalD9Gv6EIFmt5ZBNg1CibBd47BQl2su+VpivfypJ22wx3TJe2wgy6 4pzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750104755; x=1750709555; 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=rMLuv2vyspJx1ktef09ky9DNsdcrDZF/n+8r+bXhZTs=; b=U03KeyLT1Css34rUUaAQH8NyIEFlDbKBDE+UIGBaBCW/7SiPkC9NrDFTjU/Nt+XgDN EWk7ZhIqU0lsCzn0XBSrbAM9uSY7d4CVQEwCpkZ3Rc4YtqsUBREWsfpX7hGcpaCpXSWg /J/U0Qt3Ry530RlJb/29hPWnn+DZjKI5l5PIzRW7tiITPlzx28wKP78+13fC8gLQvwzE +BrFRVNIyc7zhjV3GVlfTLfxrylKPfA3EapIVbQRQZxMV9tr3XxWmqinUSJgqlZC2HRF 1eMG6Ccrb0Y83+3qfu9nkAUZcfQkOrNgjfLA5cXm8boOqaDrrLnGw4tjzREzNs7VYTep Ou8A== X-Gm-Message-State: AOJu0YyZ9lOX+NFbLN7JZAfWzutdyhEv9qVFprjEisf1a7YMYImXnkWF nb8Bw7CNsIpTF0ebAJLjQj9mpanFijelqPwkaI2k/HHIc/HsKaM6g4JU1TF0ggTkFjksnQ== X-Gm-Gg: ASbGnctm7gVaxN7n8VxrArn7N4yKzmrWtpjjwP+py63dMOkaNXnvzY4wM5Z5leptvI3 O61v0CKSSV6+/Eg4ocL2a/HIZLnlHFrOl7ZIHzPb0ActDsAsEsYLK9MltbcQT+8nIjogGO0ug0J 0pcvoANkDENQCPSEmOYlu5txdXPHhtnREg1DLUYa6i1bdMtza1PY2YHR6aDYhsV7ddKe8+EWLCp vSdntnsqYlOj/CsvLD/A2P/e36XcvpQ/kk2BjnKU8rVHQns3iagMKOlSjhLUqZoCNyaRPklaGz8 4byfuo+mBAFiB5xcoAZ79OywwwQVJFFiz/G+YAweXd5hwjJzOoEbQkFBTugoHxeFCAjCBB4VVX8 OpFMzVwM5q10D X-Google-Smtp-Source: AGHT+IHadnjeBaHytxdHlaAAJyLlzEQNf+vnUDIiJhuf8KWg0aTPHDkFbZn20fAEmtl0fLEorIkipA== X-Received: by 2002:a05:6a20:3ca5:b0:20b:a75e:fa32 with SMTP id adf61e73a8af0-21fbd5d2f63mr16670365637.40.1750104755489; Mon, 16 Jun 2025 13:12:35 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Paolo Bonzini , Mads Ynddal , Stefan Hajnoczi , Tanish Desai Subject: [PATCH 3/3] tracetool: remove redundant event_get_state checks Date: Mon, 16 Jun 2025 20:12:22 +0000 Message-Id: <20250616201222.6416-4-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250616201222.6416-1-tanishdesai37@gmail.com> References: <20250616201222.6416-1-tanishdesai37@gmail.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::434; envelope-from=tanishdesai37@gmail.com; helo=mail-pf1-x434.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: 1750104820875116600 Content-Type: text/plain; charset="utf-8" Moved trace_event_get_state check from _no_check_trace_foo to trace_foo, an= d removed if (true) checks. The _no_check_trace_foo now only emits backend-specific c= ore logic, avoiding trace event conditionals entirely. This brings conditional logic in format/h.py, reducing duplication across backends and simplifying their code generation. It also removes one conditi= onal branch instruction from the fast path (trace_foo), improving runtime perfor= mance slightly(for some old compiler). --- scripts/tracetool/backend/ftrace.py | 3 --- scripts/tracetool/backend/log.py | 5 +---- scripts/tracetool/backend/simple.py | 7 +------ scripts/tracetool/backend/syslog.py | 7 +------ scripts/tracetool/format/h.py | 3 ++- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index baed2ae61c..2d6d608add 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -34,18 +34,15 @@ def generate_h(event, group): ' char ftrace_buf[MAX_TRACE_STRLEN];', ' int unused __attribute__ ((unused));', ' int trlen;', - ' if (trace_event_get_state(%(event_id)s)) {', '#line %(event_lineno)d "%(event_filename)s"', ' trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN,', ' "%(name)s " %(fmt)s "\\n" %(argnames= )s);', '#line %(out_next_lineno)d "%(out_filename)s"', ' trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1);', ' unused =3D write(trace_marker_fd, ftrace_buf, trlen);= ', - ' }', ' }', name=3Devent.name, args=3Devent.args, - event_id=3D"TRACE_" + event.name.upper(), event_lineno=3Devent.lineno, event_filename=3Dos.path.relpath(event.filename), fmt=3Devent.fmt.rstrip("\n"), diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index f24acad74c..35a3aeee55 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -31,9 +31,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) - - out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', + out(' if (qemu_loglevel_mask(LOG_TRACE)) {', ' if (message_with_timestamp) {', ' struct timeval _now;', ' gettimeofday(&_now, NULL);', @@ -49,7 +47,6 @@ def generate_h(event, group): '#line %(out_next_lineno)d "%(out_filename)s"', ' }', ' }', - cond=3Dcond, event_lineno=3Devent.lineno, event_filename=3Dos.path.relpath(event.filename), name=3Devent.name, diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index 7c84c06b20..ce8036f5da 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -36,13 +36,8 @@ def generate_h_begin(events, group): =20 =20 def generate_h(event, group): - event_id =3D 'TRACE_' + event.name.upper() - cond =3D "trace_event_get_state(%s)" % event_id - out(' if (%(cond)s) {', - ' _simple_%(api)s(%(args)s);', - ' }', + out(' _simple_%(api)s(%(args)s);', api=3Devent.api(), - cond=3Dcond, args=3D", ".join(event.args.names())) =20 =20 diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 6fdc1142fb..f84cec641c 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -30,14 +30,9 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) - - out(' if (%(cond)s) {', - '#line %(event_lineno)d "%(event_filename)s"', + out('#line %(event_lineno)d "%(event_filename)s"', ' syslog(LOG_INFO, "%(name)s " %(fmt)s %(argnames)s);', '#line %(out_next_lineno)d "%(out_filename)s"', - ' }', - cond=3Dcond, event_lineno=3Devent.lineno, event_filename=3Dos.path.relpath(event.filename), name=3Devent.name, diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 89d54b9aff..7bbe6d3148 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -71,7 +71,8 @@ def generate(events, backend, group): =20 out('}') =20 - cond =3D "true" + event_id =3D 'TRACE_' + e.name.upper() + cond =3D "trace_event_get_state(%s)" % event_id =20 out('', 'static inline void %(api)s(%(args)s)', --=20 2.34.1