From patchwork Mon Jan 19 20:40:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1635 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855340; bh=7HWz9cbDC3h8w119XdBNUtYIOxApI6igJsl7VLzzNNw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rwNgo2vLGdnEU8Ad0h7aA1e4AsNl0ChJULXAWtSPDkHDHONP1jcKVrgBevDRGxGw0 x0jWWkaowaYGsjc6b7E+Mq3BNOYp8xYPIZpvkzb59i2Fub622DzpXmm3Px2gfhqefb 75TpmX+I+yz6TDh8QZDw4L2qfYLOT6LDKsdQtBTYXr050N9oP16DoYJoFWhl75xgqy bH9d3m6G3kgdVPYc7eiIBvuAdvCInJoLrTOkIseZ9eTL7IBjBwL3nvIzbBvL//o2z3 stXIB4ECAyq1QewN1zs+l4VsB1swkhSZPxTlKI9CAbdBBlOahSpKLscwsrEM2PvCvE xB17eriTHhCvA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BE8236950F for ; Mon, 19 Jan 2026 13:42:20 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Mj8mu0WIzIlZ for ; Mon, 19 Jan 2026 13:42:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855340; bh=7HWz9cbDC3h8w119XdBNUtYIOxApI6igJsl7VLzzNNw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rwNgo2vLGdnEU8Ad0h7aA1e4AsNl0ChJULXAWtSPDkHDHONP1jcKVrgBevDRGxGw0 x0jWWkaowaYGsjc6b7E+Mq3BNOYp8xYPIZpvkzb59i2Fub622DzpXmm3Px2gfhqefb 75TpmX+I+yz6TDh8QZDw4L2qfYLOT6LDKsdQtBTYXr050N9oP16DoYJoFWhl75xgqy bH9d3m6G3kgdVPYc7eiIBvuAdvCInJoLrTOkIseZ9eTL7IBjBwL3nvIzbBvL//o2z3 stXIB4ECAyq1QewN1zs+l4VsB1swkhSZPxTlKI9CAbdBBlOahSpKLscwsrEM2PvCvE xB17eriTHhCvA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id AD160694CE for ; Mon, 19 Jan 2026 13:42:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855338; bh=a9DALZ9QUT3Ir+hWZrQZpCDetZGQHH76ox7PjKD3TDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XjLuMuGgEKNEoeozaTpbxPUJZnxExEHtOhULdQYT4zzpay8Z7OXxcfb2qZaDpDP7X 7UmCWVMsZXEdYP0n3sPU5XeUwFRVBzBvQrK3cUFbOd1kXpi3IwM7beKeXBkZBvsWnl /AdKGRFlT6FNJiKUI+q6HnsT5o3L8G1EoeIDyd6miXCvV6feAn8eGm5JaJBrTFktVI Yvy3GnTxjITSvwo/GC4SHST7FFe3HLwlB6NNivxuORt5MioA7xvi5x6mVmeHNstMOX omkjjd1jUoSLMYFD1TRB6NVX7ALq2YYMlqIU1gBfFLbY7EFxyS3eK0SdjulEl+o5uk ldqLffJ0EPRyA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9D593694CE; Mon, 19 Jan 2026 13:42:18 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id AE8CVv3rXWRO; Mon, 19 Jan 2026 13:42:18 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768855333; bh=onqr3kgXhDVKYrkjM3XnxVmkDrPwMAWd4VotdyjyTkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S1uBiDI2i0gLrrJU1M9FT4lAomxgHB/LpOO3tPfJ27JEzAy6YtPwdMIHcltOBzLGf B6f34Kd2V2y0Dyqif1NR2BIl7/sgzz92GsnozpnrCjcl7UrqtHfsHbpkhpWuU+6lCU fsQwP3sOxainq+KE7ctWa3F1wN3ukyAdxvI63CC0H/G70ePFqYxTJnEwZ5eCn+yPd3 +wAMjqPCzPsdXZAl/aU3F21ZBwcCglfRK/3zWYGLjiPrEncjzNJjaQ0GBEG0TVBqm9 Sl4a/eyc5GcdgYUPXRbCEUW1+XpFLCo7g8vlMkcUhKQzUke3O5n/s4eGd17RgtU4Kj Nnod9LKxJjEJA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 584A1693E3; Mon, 19 Jan 2026 13:42:13 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 19 Jan 2026 13:40:58 -0700 Message-ID: <20260119204130.3972647-6-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260119204130.3972647-1-sjg@u-boot.org> References: <20260119204130.3972647-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 66XT3O4QQW5D4JNZJJRPCLTXAATB24ES X-Message-ID-Hash: 66XT3O4QQW5D4JNZJJRPCLTXAATB24ES X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 05/27] test: trace: Fix funcgraph check for matching exit indent List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The check_funcgraph() function looks for initf_bootstage() entry and its matching exit brace. Fix two issues: 1. The expected_indent should match the entry indent, not child level (indent + 2 spaces). Entry and exit braces are at the same level. 2. Increase head limit from 70 to 100 lines. With the log_file driver enabled, there are more traced function calls and the exit brace may appear beyond line 70. Fixes: 6acf4a242f27 ("proftool: Fix funcgraph depth for exit records") Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- test/py/tests/test_trace.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_trace.py b/test/py/tests/test_trace.py index 0bddf408833..498949372aa 100644 --- a/test/py/tests/test_trace.py +++ b/test/py/tests/test_trace.py @@ -189,7 +189,7 @@ def check_funcgraph(ubman, fname, proftool, map_fname, trace_dat): 'dump-ftrace', '-f', 'funcgraph']) # Check that the trace has what we expect - cmd = f'trace-cmd report -l {trace_dat} |head -n 70' + cmd = f'trace-cmd report -l {trace_dat} |head -n 100' out = utils.run_and_log(ubman, ['sh', '-c', cmd]) # First look for this: @@ -221,7 +221,7 @@ def check_funcgraph(ubman, fname, proftool, map_fname, trace_dat): break elif func == 'initf_bootstage() ': found_start = True - expected_indent = indent + ' ' + expected_indent = indent elif found_start and indent == expected_indent and brace == '}': found_end = True