From patchwork Thu Feb 2 12:26:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandipan Das X-Patchwork-Id: 51883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp209289wrn; Thu, 2 Feb 2023 04:32:42 -0800 (PST) X-Google-Smtp-Source: AK7set8i6q7fy1mwCIlHxtpy8xJIqxTS4b4It8UnEQmfKMAbg6EdptxHjvtNMLao9SNCop5hEB7P X-Received: by 2002:a05:6a20:c184:b0:bc:d651:f267 with SMTP id bg4-20020a056a20c18400b000bcd651f267mr7226654pzb.2.1675341162070; Thu, 02 Feb 2023 04:32:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675341162; cv=pass; d=google.com; s=arc-20160816; b=dMAu+c7vTpK4qAwJROSTXae8l1qvLd9v/oOdBlnSGeaVjkl1/Ik7is7Yc1Ak+0VAng SAlN7A1+zSSjIcIbW5IoXUBon+uC/L4smxtvNJv+2ybipeWKXncw0n05Gz5bv21tXyVJ bat5dZFe0RP8BHKvSuskmG4Hc7x6L4/jbkB4hO+FokMux+KPf20Dq7qSor+lgpzPMAMy 6E+zFQs4sjnK6TntPuFKCYnQ+ajRJISo73hagd12w19hCprgG76/pftODltKDTj5CZDW dRf5ne/JGqDaUSezLyGjrqL/CxOXAfZQEU4N+TrOC3k2GObAZ/tNGiRMceGrFTUOQAc5 AsiQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=W7HNIjTiTSdl2saigDfeXxkG03D0mjn7wwZNYGXKYR8=; b=dtKyca1lULP3/DOEsh6VTbn/DoxlZ+3hAQIakHTWbYIbqAbOp+RR8e2qGHgS7s9Hgi CyFs/Q344zF9XHZgNp4hj1vo6HF7O9yfPCoE4/UX9ybRLUVYwiiavFL2uwwhpMUKG3EC mU5MFPQ8+r89xQVFeXY1byIvhuuqSRO8pJDL78dTcOqcVcki4EbETcpkQRUuIhVYy9LT XVo7/9xEGgGiZBwSb7Rc795E/blle1Fey+sql0z6PPZ6cHquNNZGyiUBzTvhFdJ07ub7 mUyQ7fmma4gSA/EHd4c5+RJEB1xlyZfbVL6HENPZcuKMEjIufsq19DS16YaiOAn0Vvbw HiWg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=X+ljoKhe; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r72-20020a632b4b000000b004de59d9ed81si22097018pgr.712.2023.02.02.04.32.28; Thu, 02 Feb 2023 04:32:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=X+ljoKhe; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232020AbjBBM1D (ORCPT + 99 others); Thu, 2 Feb 2023 07:27:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbjBBM07 (ORCPT ); Thu, 2 Feb 2023 07:26:59 -0500 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2082.outbound.protection.outlook.com [40.107.102.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89F834ED09; Thu, 2 Feb 2023 04:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UaGLfHO6wCIG+KNDx7Sdwq3s7QphbTO3EGUvlskf2sKIJ4t2FSnS7SB0/1vaaSwlF/SxNM+dSiD+BWWptu66iv9sMtfcUQlJkEn+QuqFELlvCaDFSdFsNY4HwNINYuem0uBaSJENxdHiQJjpHhvVD05anbjESW28rvF29vLLfw3CMANTK5OAbbvq84eR1Mof1HS9vjToBr9jDILLDOj/13ILjsU6CtObAwJJnThc0dJYqjiidhEAemMhAXFFx5B1n5MkgNLu0YbeEA4srI2qM+FQlWHfakGRaqEMvcY8RdZjYIPYqWVqAh3OpChJPKUAUnJpsGzbBPSD77Kt/MW+2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W7HNIjTiTSdl2saigDfeXxkG03D0mjn7wwZNYGXKYR8=; b=l/cBVN23ZmghTWMczOQ+h0EwLqIVlytXkd6K0uMXS1eeP2PpJsOdCsIybKGnHgZkh2Wy3OwWuBIXbFOvqpCv4ME0gZ23ERQ0pzOkeqIpOG9AV6ExA+85VIwzbfUj9tuqZiZJjr9Kb5PGJFKwmP2MruaIbBRZjNCAihUXS5ZFnZZjCJl/lnuqxX2Fup38SpqMB/sTZ4+TUXyKRhzxpWjBDpjArf3ZB5LnBGSUVKKCrWbXdJRe4RsN9TU46G/BCYrvSQkaDa+jRhNYRNa533HvrNtE1b9TXE5rBUgt18rl/kTCQVazhCDG0gsyke/gBLXgWu8Kw9gJMxwBieTlMHgimA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W7HNIjTiTSdl2saigDfeXxkG03D0mjn7wwZNYGXKYR8=; b=X+ljoKhes/fTKZkwdGnCDi2TlScxxeVsPGSI4Rwa8f5RNhDSQPZjGhZHpuYLXwfwt56CdCh8qUbratyGf54zx9Fi3buaauUU+08KgQglumHhiHwexFwjRJZQrHiIPpyxjZGm/yStZS/aXrfP8uyly4nT85ITCo0XITQncmQwBV4= Received: from DM6PR04CA0024.namprd04.prod.outlook.com (2603:10b6:5:334::29) by DM4PR12MB5232.namprd12.prod.outlook.com (2603:10b6:5:39c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 12:26:51 +0000 Received: from DS1PEPF0000E62E.namprd02.prod.outlook.com (2603:10b6:5:334:cafe::2e) by DM6PR04CA0024.outlook.office365.com (2603:10b6:5:334::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.28 via Frontend Transport; Thu, 2 Feb 2023 12:26:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000E62E.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 12:26:51 +0000 Received: from sindhu.amdval.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 06:26:44 -0600 From: Sandipan Das To: , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 1/4] perf script: Show branch speculation info Date: Thu, 2 Feb 2023 17:56:14 +0530 Message-ID: <87c48949f5a442dda6d4dc75d4a4303973eb04b2.1675333809.git.sandipan.das@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E62E:EE_|DM4PR12MB5232:EE_ X-MS-Office365-Filtering-Correlation-Id: 44850ec6-4f31-4254-a28d-08db0518c2f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1dRcbPDb8+3u3WLva+mEP/CpB1DD6yDSkztLzxHd/WtHTSJIySydzE9Y6i24iT4nWaU1XVNLvcXEBreaygiH0SGT3YOFBFgvWpshrGsWvl+1N/xwaHhcPd0uzl3Q8fqy9GvPAkdXAUYdGOFazdMBUO3U9NudoQur4QyjcxRjUwno5XDb7Om9KjlNP4cXtn5W9f2alZB4lUj0bn0ceUGMtek/nOZuAnnJ07qgadCJ08rtwMM880zFvFZFEBwPyls05ax9/PaVoWZVMLqB9IXtmmgMHy/itjOnp4FvKYCrQJ/2hIkrgmqJUcMTaIDOygqR3p3XqxaSN9NOgltM7H2kNe+MAnm3S6zSIYuGMhJJ2FiQfgcImwJHLMTDaSDrCInDAVKIewtNFNs79+W+r2GGhnbJoSaCvsk7SzsNQdYGKE3Qqhh3VJ4NT5xV2LigqaOdKugTXhCjZ4SFwV2pHp1YzUIbCRdnQ4NUQ4tid8Tjv+TsWQdyg4xnrA0nupngnvSPTTnPQKAH+5LoePuugNPzr5Qr5sI65ZeXkqS00LhMJ7XCwZLo5mzVh1I+4lMpWXb8u8p8s2wMKCP5WzjlSt+KLDRt2muy3wFxrHMdMuFkM89Le1c+JSX4Lc4fV+E7g/qedR4odR7G5zQbJV9Y7UX+bNpM8ik/K6788hhv7ozQ6TcwxoSowcRTDtD8dbZy131Qz6FUXIdMg/BE80Lc1HXUNYDJ9MPo6pkmfg3wZElOpsw= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199018)(46966006)(36840700001)(40470700004)(70206006)(70586007)(8676002)(356005)(86362001)(36756003)(40460700003)(81166007)(4326008)(6666004)(336012)(426003)(83380400001)(186003)(26005)(16526019)(36860700001)(2616005)(41300700001)(8936002)(82310400005)(5660300002)(110136005)(54906003)(316002)(47076005)(82740400003)(7416002)(478600001)(2906002)(44832011)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 12:26:51.0180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44850ec6-4f31-4254-a28d-08db0518c2f0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E62E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5232 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756722534666962758?= X-GMAIL-MSGID: =?utf-8?q?1756722534666962758?= Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for optimizing code further. The speculation info is appended to the end of the list of fields so any existing tools that use "/" as a delimiter for access fields via an index remain unaffected. Also show "-" instead of "N/A" when speculation info is unavailable because "/" is used as the field separator. E.g. $ perf record -j any,u,save_type ./test_branch $ perf script --fields brstacksym Before: [...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL [...] After: [...] check_match+0x60/strcmp+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH do_lookup_x+0x3c5/check_match+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH [...] Signed-off-by: Sandipan Das --- tools/perf/builtin-script.c | 5 +++-- tools/perf/util/branch.c | 15 +++++++++++++++ tools/perf/util/branch.h | 2 ++ tools/perf/util/evsel.c | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 69394ac0a20d..782319e8fe6a 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -880,12 +880,13 @@ mispred_str(struct branch_entry *br) static int print_bstack_flags(FILE *fp, struct branch_entry *br) { - return fprintf(fp, "/%c/%c/%c/%d/%s ", + return fprintf(fp, "/%c/%c/%c/%d/%s/%s ", mispred_str(br), br->flags.in_tx ? 'X' : '-', br->flags.abort ? 'A' : '-', br->flags.cycles, - get_branch_type(br)); + get_branch_type(br), + br->flags.spec ? branch_spec_desc(br->flags.spec) : "-"); } static int perf_sample__fprintf_brstack(struct perf_sample *sample, diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c index 6d38238481d3..378f16a24751 100644 --- a/tools/perf/util/branch.c +++ b/tools/perf/util/branch.c @@ -212,3 +212,18 @@ int branch_type_str(struct branch_type_stat *st, char *bf, int size) return printed; } + +const char *branch_spec_desc(int spec) +{ + const char *branch_spec_outcomes[PERF_BR_SPEC_MAX] = { + "N/A", + "SPEC_WRONG_PATH", + "NON_SPEC_CORRECT_PATH", + "SPEC_CORRECT_PATH", + }; + + if (spec >= 0 && spec < PERF_BR_SPEC_MAX) + return branch_spec_outcomes[spec]; + + return NULL; +} diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h index 3ed792db1125..e41bfffe2217 100644 --- a/tools/perf/util/branch.h +++ b/tools/perf/util/branch.h @@ -89,4 +89,6 @@ const char *get_branch_type(struct branch_entry *e); void branch_type_stat_display(FILE *fp, struct branch_type_stat *st); int branch_type_str(struct branch_type_stat *st, char *bf, int bfsize); +const char *branch_spec_desc(int spec); + #endif /* _PERF_BRANCH_H */ diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 8550638587e5..019e53db03b3 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2319,7 +2319,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value) * abort:1 //transaction abort * cycles:16 //cycle count to last branch * type:4 //branch type - * reserved:40 + * spec:2 //branch speculation info + * new_type:4 //additional branch type + * priv:3 //privilege level + * reserved:31 * } * } * @@ -2335,7 +2338,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value) new_val |= bitfield_swap(value, 3, 1); new_val |= bitfield_swap(value, 4, 16); new_val |= bitfield_swap(value, 20, 4); - new_val |= bitfield_swap(value, 24, 40); + new_val |= bitfield_swap(value, 24, 2); + new_val |= bitfield_swap(value, 26, 4); + new_val |= bitfield_swap(value, 30, 3); + new_val |= bitfield_swap(value, 33, 31); } else { new_val = bitfield_swap(value, 63, 1); new_val |= bitfield_swap(value, 62, 1); @@ -2343,7 +2349,10 @@ u64 evsel__bitfield_swap_branch_flags(u64 value) new_val |= bitfield_swap(value, 60, 1); new_val |= bitfield_swap(value, 44, 16); new_val |= bitfield_swap(value, 40, 4); - new_val |= bitfield_swap(value, 0, 40); + new_val |= bitfield_swap(value, 38, 2); + new_val |= bitfield_swap(value, 34, 4); + new_val |= bitfield_swap(value, 31, 3); + new_val |= bitfield_swap(value, 0, 31); } return new_val; From patchwork Thu Feb 2 12:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandipan Das X-Patchwork-Id: 51882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp209026wrn; Thu, 2 Feb 2023 04:32:09 -0800 (PST) X-Google-Smtp-Source: AK7set/3DCd/fMiSeI7736ylBQrhk2WJfGiyO5AWRZAkLoYKNDC5eh8tJuK3gcZq5UTycIMPrWIl X-Received: by 2002:a05:6a20:8ba4:b0:b8:5813:e700 with SMTP id m36-20020a056a208ba400b000b85813e700mr1636872pzh.3.1675341129318; Thu, 02 Feb 2023 04:32:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675341129; cv=pass; d=google.com; s=arc-20160816; b=l+ZGcbRq3nGFvVDzXCellFqAS8jhaO92ySwV3xbCkDsM47nn3uKmyTwBDEy8UztrEZ 45CnfpuF2zZrjvLmlG5wZh0D9IE5d8XlGynrbePqJIuzWwxq9jV7ZOih+3jCDyTG4c2W kthTOCUXZSEWNxXV4sb/5CdfEswYiziLA/dItz/s2wNTPJxYjGOt9Nhqirpibuukk3S0 LdGtK6VXPV5hPqXtl1JwpEoLl/43KzvSsc33c+oFtYjm+CFoNrrLLS0HifOahip9NbPm W2Fbd4LAR/V0zzuhuNAE9qCWO9feRmiqK2R6Xw1aZbzunNoZySDR9P+Nbi/FmEoqwUXX ZbsQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u3t70GHC+KZ9uqeaeknYCgT+u2wTzp8TF0kraXSY3dc=; b=dMIC430Gn+b2eBzbuExGV9uSB/xlMJhePTv8il7A8ui9JWlsiT8L5TTpbGI0jA/p2s BeTHQaUKk22/kD44zaaXjLkQVoJ+kbdvvuCIyAIbuBx6fJEcorUSqI1CVbM5B0jNsO0c pCxw6DLbLiUM+mQS7LsnJvnbc0GnsTgZCF/XgTpNzXZthtBJLHaG2HYAX6nBb6355WOb 32ZUZFeA1LjDOrTI+OmfLdBKfkwmEgc6bn3tdzXnsnXMkBbScN0tuuJ9ZcRIB3BDQYRb 78kGVmft9XlXdko1mFDf+LrfBCAjaU8Nsg4apnjDw/vakgri/eKfs84x1ulIEqvE/Igc ufqw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=JqaTE6Cp; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a6566d4000000b004e2d59b31c1si1446383pgw.402.2023.02.02.04.31.56; Thu, 02 Feb 2023 04:32:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=JqaTE6Cp; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229972AbjBBM1W (ORCPT + 99 others); Thu, 2 Feb 2023 07:27:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbjBBM1Q (ORCPT ); Thu, 2 Feb 2023 07:27:16 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2078.outbound.protection.outlook.com [40.107.92.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCC8B3FF12; Thu, 2 Feb 2023 04:27:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lWhdIXxsfJUtUTnuSJmUb+H/JdnPNUUhIOiKagkKZrr6B1oHwn9GDt1HTSPI4buXlGXrtegPFi8MfQyGv8bxoAov65VRUd+fsFvYfKU7RcIl2f6O3CJ88VoQdFtGbMIQ6NNA0Qsy7yh/KypRBznpxkZloGCiE3ZO66Mseoaz4Cx/77AyJn76mojRZhcUbsGIYf0epZVN6lSAZKpYpYNSxppo8bdFltNTI3JEaif5lFKRGwCWVihmmvOTAIAZp72qSuXlBtIrcUUkrFSL7j403dykPH6VQW5XsIG0VEMwPHFWvEmFb2bx1IP9Zh3TSML9/TaQ9b4QcPZIM1btq1sFqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u3t70GHC+KZ9uqeaeknYCgT+u2wTzp8TF0kraXSY3dc=; b=B1KscAEfjcK2/fbpZ6uwJ9Tnxr6bmHdthks/RB9Va92B1SS/sTpMDfzdCWM90rDUZFDs2KxtM2zh9vWCjhX6/KgP5pLNhQ2Opf0NMB6CTLZkWsDagoFGAKbv7Yc//Pm7wt+x9R+iQ5y0GPuwaRUmTd5D8rCwjcEekaYkC3U5zhMJHXl1p2XWH3PxE0iccqeaP4sBt8FkF8rHNUtelk02CXklSl+NTTY90LipUUWt8BVQUVxXqwoQJpIMN5tfuJb7NUWgZO90MC+DLRPoLyD5B000mJuYvZmCIAB/IaLFO3pJ3yoqW+oqWAoXrq4Ap2jg6ssp/XvGVY10o7udYtZmmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u3t70GHC+KZ9uqeaeknYCgT+u2wTzp8TF0kraXSY3dc=; b=JqaTE6CpBcES53qyuhPsM+9RySVOj4xeuW8+sfJ1tHFLkqP7azR9IFk38h4MCfCnf/oEfu/TULNEtMt3sI/fWXgC4k50WSJ7pZoR6sEBIMgo5LGPkpdjcFvbCOqtvTe1ALj7W+ulaY7uwcja4myUIGh2BjabVTUqLylYTq24uz8= Received: from DM6PR04CA0007.namprd04.prod.outlook.com (2603:10b6:5:334::12) by CH0PR12MB5236.namprd12.prod.outlook.com (2603:10b6:610:d3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.24; Thu, 2 Feb 2023 12:27:10 +0000 Received: from DS1PEPF0000E62E.namprd02.prod.outlook.com (2603:10b6:5:334:cafe::54) by DM6PR04CA0007.outlook.office365.com (2603:10b6:5:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.28 via Frontend Transport; Thu, 2 Feb 2023 12:27:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000E62E.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 12:27:10 +0000 Received: from sindhu.amdval.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 06:27:03 -0600 From: Sandipan Das To: , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 2/4] perf session: Show branch speculation info in raw dump Date: Thu, 2 Feb 2023 17:56:15 +0530 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E62E:EE_|CH0PR12MB5236:EE_ X-MS-Office365-Filtering-Correlation-Id: 8648c29c-7265-4668-e8da-08db0518ce75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 92/r32rqQVHwQhpRnPV2cdSH87NPsWAfwzOi8kg1XLRiGxkIb96HfW6PKFLZF+rw396t7uEpu3M3cEvMlEuLs5qesz3Gb6YIdJjrIK/umZweDAtBxB2Y1qIaUbMORcH/OMf6aN8grKB/VfSDZNuhH5GYPI3mFzs3IsqihkfsvDY8iRNghhPetfxZtpIXMPYhWEtiuyU6ZD1nl3RU/3DlObZdpQSsvMVR/Q0z72jFzpdm/NdhhGmzMWrnivweZJn5YQAiZuX94T053n7wO3oc9SYqP1wuuh2c85fTcRqgdaZpIC1truv3Yy9X7OgEVYnbtxqSTeYKv8HBvdSbSn3TDPhLlists3R1NIzmYqGgviPfWe8IpSUlpMFqEYKquV/6A5vRONPqOhvpAgThnkgyVBDfEk61+n+D0e60FXPbSKzTDvdiCNzgTMA7ueBF04gSfsIh6O/zaBVeeUuPMrFAinncKSJPWVTlZc2OLFCS0KI+DdJ09t6YH/xqi/47IarIq/AnWWY5NOJMbbZ7yO+hgABwr4I1LCeve5eXCRomsD9eLhKaD/tDSQwi/lDhDJn0MPys65O7oC5BXUcTpmpB1ZJ0QD3b4lGY+vzmehNPs4SPPu60ttLlfDVb5qiyXCfOeWX4AwjYmEHRN5px8YSpwBYwOQ50rkjhGmDaZtNwbnKsJxXgsL9iDCjFxi7PzpUp4HOfnkxSWCroKtoVdsxdfbkUQ4/lF9ECncVKqACxVR4= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(376002)(39860400002)(136003)(396003)(346002)(451199018)(40470700004)(46966006)(36840700001)(7416002)(316002)(47076005)(86362001)(478600001)(2616005)(82740400003)(26005)(6666004)(356005)(81166007)(82310400005)(16526019)(186003)(5660300002)(54906003)(110136005)(83380400001)(336012)(36756003)(426003)(2906002)(40480700001)(40460700003)(36860700001)(8936002)(70206006)(8676002)(44832011)(41300700001)(70586007)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 12:27:10.3464 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8648c29c-7265-4668-e8da-08db0518ce75 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E62E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5236 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756722500063779178?= X-GMAIL-MSGID: =?utf-8?q?1756722500063779178?= Show the branch speculation info if provided by the branch recording hardware feature. This can be useful for purposes of code optimization. E.g. $ perf record -j any,u ./test_branch $ perf report --dump-raw-trace Before: [...] 8380958377610 0x40b178 [0x1b0]: PERF_RECORD_SAMPLE(IP, 0x2): 7952/7952: 0x4f851a period: 48973 addr: 0 ... branch stack: nr:16 ..... 0: 00000000004b52fd -> 00000000004f82c0 0 cycles P 0 ..... 1: ffffffff8220137c -> 00000000004b52f0 0 cycles M 0 ..... 2: 000000000041d1c4 -> 00000000004b52f0 0 cycles P 0 ..... 3: 00000000004e7ead -> 000000000041d1b0 0 cycles M 0 ..... 4: 00000000004e7f91 -> 00000000004e7ead 0 cycles P 0 ..... 5: 00000000004e7ea8 -> 00000000004e7f70 0 cycles P 0 ..... 6: 00000000004e7e52 -> 00000000004e7e98 0 cycles M 0 ..... 7: 00000000004e7e1f -> 00000000004e7e40 0 cycles M 0 ..... 8: 00000000004e7f60 -> 00000000004e7df0 0 cycles P 0 ..... 9: 00000000004e7f58 -> 00000000004e7f60 0 cycles M 0 ..... 10: 000000000041d85d -> 00000000004e7f50 0 cycles P 0 ..... 11: 000000000043306a -> 000000000041d840 0 cycles P 0 ..... 12: ffffffff8220137c -> 0000000000433040 0 cycles M 0 ..... 13: 000000000041e4a1 -> 0000000000433040 0 cycles P 0 ..... 14: ffffffff8220137c -> 000000000041e490 0 cycles M 0 ..... 15: 000000000041d89b -> 000000000041e487 0 cycles P 0 ... thread: test_branch:7952 ...... dso: /data/sandipan/test_branch [...] After: [...] 8380958377610 0x40b178 [0x1b0]: PERF_RECORD_SAMPLE(IP, 0x2): 7952/7952: 0x4f851a period: 48973 addr: 0 ... branch stack: nr:16 ..... 0: 00000000004b52fd -> 00000000004f82c0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 1: ffffffff8220137c -> 00000000004b52f0 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 2: 000000000041d1c4 -> 00000000004b52f0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 3: 00000000004e7ead -> 000000000041d1b0 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 4: 00000000004e7f91 -> 00000000004e7ead 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 5: 00000000004e7ea8 -> 00000000004e7f70 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 6: 00000000004e7e52 -> 00000000004e7e98 0 cycles M 0 SPEC_CORRECT_PATH ..... 7: 00000000004e7e1f -> 00000000004e7e40 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 8: 00000000004e7f60 -> 00000000004e7df0 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 9: 00000000004e7f58 -> 00000000004e7f60 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 10: 000000000041d85d -> 00000000004e7f50 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 11: 000000000043306a -> 000000000041d840 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 12: ffffffff8220137c -> 0000000000433040 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 13: 000000000041e4a1 -> 0000000000433040 0 cycles P 0 NON_SPEC_CORRECT_PATH ..... 14: ffffffff8220137c -> 000000000041e490 0 cycles M 0 NON_SPEC_CORRECT_PATH ..... 15: 000000000041d89b -> 000000000041e487 0 cycles P 0 NON_SPEC_CORRECT_PATH ... thread: test_branch:7952 ...... dso: /data/sandipan/test_branch [...] Signed-off-by: Sandipan Das --- tools/perf/util/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 7c021c6cedb9..a42f051dab9d 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1180,7 +1180,7 @@ static void branch_stack__printf(struct perf_sample *sample, bool callstack) struct branch_entry *e = &entries[i]; if (!callstack) { - printf("..... %2"PRIu64": %016" PRIx64 " -> %016" PRIx64 " %hu cycles %s%s%s%s %x %s\n", + printf("..... %2"PRIu64": %016" PRIx64 " -> %016" PRIx64 " %hu cycles %s%s%s%s %x %s %s\n", i, e->from, e->to, (unsigned short)e->flags.cycles, e->flags.mispred ? "M" : " ", @@ -1188,7 +1188,8 @@ static void branch_stack__printf(struct perf_sample *sample, bool callstack) e->flags.abort ? "A" : " ", e->flags.in_tx ? "T" : " ", (unsigned)e->flags.reserved, - get_branch_type(e)); + get_branch_type(e), + e->flags.spec ? branch_spec_desc(e->flags.spec) : ""); } else { if (i == 0) { printf("..... %2"PRIu64": %016" PRIx64 "\n" From patchwork Thu Feb 2 12:26:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandipan Das X-Patchwork-Id: 51887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp212715wrn; Thu, 2 Feb 2023 04:40:06 -0800 (PST) X-Google-Smtp-Source: AK7set9IoJ9Kn1cbjNkQ6PqzZJwG5GlJJ+3EG2/5fWdDVddxeySeVE1hM+Lc2OuZzA6KvHznXwn1 X-Received: by 2002:a17:906:b35a:b0:85d:dd20:60a4 with SMTP id cd26-20020a170906b35a00b0085ddd2060a4mr6207899ejb.40.1675341606177; Thu, 02 Feb 2023 04:40:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675341606; cv=pass; d=google.com; s=arc-20160816; b=R09TGUtGFJSQtowx3Qpa+4Pkhj49iH/4wvGkEiwVvQs5l4MRm6sCNlLaLGLzT/B9bk dZgs9OMVBZQ20VwjQK7gWL5RH00aSZh73AimB69hseXpHQsIDn+PaD0CyuXMOhi/uDYT 2UDIIyG8zpWmFlZbIKSMkER9PsxH8IQPwObses7hxkjdhsMLMXb/w6G9rVWrp3Y0dLYf 85rL2fI2of0qAAAwUx0fx66V2HjRs2Ws3Fov76sTHtz0MYfsTJnK50J1c3BFHqjsWE1a R3Yl6W/wSvsa/knWdKwSt7R9NN3yUwjcyj+0LQsAELxWLpHRC8bRG07EIplsMIGqKNfo v/kQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PSfOvvWBr9ba0itMMof2yQVIqCNwurrKdmvKfV9TwRA=; b=nJKaJldL4SF0eGacpfKxv+zjc/XrC19R2quIAEs+cpEsJmCYR1dgrniv53RCb8Dpur wQq38UP6q29W+VJujqNNkpAF/weQDpMCOni0wy5O+m6G2rzx712Yb4atgNwDVKC3xfQ8 f1TdOlvw3m13Lt5dUm2DyvW3PdIDYOYPp0lX7HyuY4/YgIlu4JfsdBbcI3OVAOIk0W1Z il0msJwKp95OYj4Vf4BtuExwKUKn/9NFEEaXuHOmEtzoWd3bMvXik6Na/DlzI5OUFoB+ 2WbcWZAbEmgSz0G1Rv/bp3gF1Ia5XebA8+cAaneL8hMNcdy0CW6DHpEnaI2WcYRnqSEA jcDg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=4ZxXyjTO; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cp19-20020a17090793d300b00878b89038c4si20618115ejc.76.2023.02.02.04.39.42; Thu, 02 Feb 2023 04:40:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=4ZxXyjTO; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231339AbjBBM1f (ORCPT + 99 others); Thu, 2 Feb 2023 07:27:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbjBBM1c (ORCPT ); Thu, 2 Feb 2023 07:27:32 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2067.outbound.protection.outlook.com [40.107.92.67]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83F821448C; Thu, 2 Feb 2023 04:27:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J6yxOXin+b6sD8Debskaz9SvYYRNlse0qX2a0TjSNvJofBZueqBRSujKht/gUoIuqtoh0CcNedKlTd6LUgAlyWrnkokQv/vhYhojz7B0OdcmMksqzRrGv7RKlVvBVjQGxqDkbZSty7f8aXSToDG+pwvxgVXT+AticOcNYJogzEAPCk/QvzEHvsCXcZvm6FH1a+tC4z6u07B2JsysBqkKfZnZUSZ9urAxRIpbVYt8PF2JsaxHvUUtnw58jn3kBSM9O69uBoG0KOOp8r8JL4lAmzcRd4sw5cxkUdf7LbSV+PuhO5vRjBXCz0NOEAGTypJadyOxogMkVcrBBf65MHg/oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PSfOvvWBr9ba0itMMof2yQVIqCNwurrKdmvKfV9TwRA=; b=PbA0DLOZEdxi1T2mmt2OGPnC7IA2UsClqBDwsLiRhnE4CG07RTk6YSzhcBAWHWzuW7lCfuXFv4weQi7zi5a8MB4lARz512y7NKPsh9XoD85F8N9aKFb9S07vaIDLXghNy50vVn2h1ZWdtznM7jGUeQ420xRsK/MEA9dxDoP1yzXdRwosvE+JX/bHo3KHybSxhK7swM9AwRSoNYnLzhFG5wExjtC1V1SeT7wvu2jtsEmWtVjZIW20+b885hLpvKJ6Dma8RN6yGPnoH8dmG8MFt7XqLb7vA9j7j5TT8+5RjqituQD7c+LLAdJll0pbL6ZAeuIZHriFfIDOTIphiXAkfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PSfOvvWBr9ba0itMMof2yQVIqCNwurrKdmvKfV9TwRA=; b=4ZxXyjTOrXuKpT+rayBy+iORXUdmVHuh24uHUKKL4F83twOMaN3dJocuv94Jln5RNdStPvnftDplfia2Q3MzO2qRQQ08tYqwx0y/xByT9XgFug+bdwtY1BIXUldNxa0sQpWNkrRQZKNFTtbH4o8YTJDskgA4xlPyAhR0RfmiwnI= Received: from DM6PR11CA0052.namprd11.prod.outlook.com (2603:10b6:5:14c::29) by DM4PR12MB6038.namprd12.prod.outlook.com (2603:10b6:8:ab::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 12:27:29 +0000 Received: from DS1PEPF0000E62F.namprd02.prod.outlook.com (2603:10b6:5:14c:cafe::63) by DM6PR11CA0052.outlook.office365.com (2603:10b6:5:14c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 12:27:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000E62F.mail.protection.outlook.com (10.167.17.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 12:27:29 +0000 Received: from sindhu.amdval.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 06:27:23 -0600 From: Sandipan Das To: , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 3/4] perf test sample-parsing: Update expected branch flags Date: Thu, 2 Feb 2023 17:56:16 +0530 Message-ID: <56e272583552526e999ba0b536ac009ae3613966.1675333809.git.sandipan.das@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E62F:EE_|DM4PR12MB6038:EE_ X-MS-Office365-Filtering-Correlation-Id: cd2cee29-634c-4aab-c877-08db0518d9fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CntnYP7dIqKKfZZYlRJwJRJdFzIIhfKT0of52pM2t1UH/VPawft/FP8uFnco6PUSewaojkhX0o7UMMsL9/F7UwRnCLP2oJi0m5jrw0W+meGObhztuZhfHfG2mht/jLYuyGUS1uU+lOMAQHYxjM+47HL65lQTfHoz9zNYj8d+bjr1OIGSspSmlPmcPaM/6sH+wkurfEP2uyhzeH7YgX107ADo7S0FcvBFpQM46V4B/GJxvWyRZY70BOuk1xFnhUEEVmV2oUBRs1t+e7b/WgFxInSyUGXnRMbQupdpQv3N4zVQoYFGVSxlryCEZFaraL238d6QiLZCVc0OFwwryP2pt/0wD2GHB+hWFg36IQVacT//ILRDQSQfIyAseb8zGJ7KPRVtcULFxZQxuLbEv6PrpWycfUcZI2ZvYWXgS+oM3mMyzvbB0+QrpWmeN4eefQsspvXDbmfr6YjbVuYP1mgOwVa3w4hkceoZ4ZOtL6gIv75dgcrY1/JmfBhOdUUdd3ckSvInzsZbD8FDOYuDERYnZ9Pa7nn8Ay2g2xgAHFXAYQAT1qsSpZd/9AMyi2qGRpjcLb9T51epO8xjmjP5FspfTyWcg5ZEmq5rKuQFYvU57twZuZiDYJGFNgBWcSpbQX9447b0Ln3W0Sh6cdbsOE66j15cRgdIJxXAKjBZT9pv20kK5Hz2AHDx10gW5oFX7WlIV6qDZdhuB6HtzHoCi0ZpIlMUoCZiK1Wg5VXSTmrej0w= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(396003)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(41300700001)(8676002)(4326008)(83380400001)(70586007)(70206006)(8936002)(36756003)(5660300002)(40460700003)(44832011)(186003)(81166007)(26005)(7416002)(16526019)(356005)(36860700001)(2906002)(40480700001)(110136005)(426003)(54906003)(6666004)(316002)(47076005)(86362001)(82740400003)(336012)(478600001)(82310400005)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 12:27:29.6761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd2cee29-634c-4aab-c877-08db0518d9fd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E62F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6038 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756723000029841228?= X-GMAIL-MSGID: =?utf-8?q?1756723000029841228?= The bitfield swapping scheme used duing sample parsing has changed because of the addition of new branch flags, namely "spec", "new_type" and "priv". Earlier, these were all part of the "reserved" field but now, each of these fields get swapped separately. Change the expected flag values accordingly for the test to pass. E.g. $ perf test -v 27 Before: 27: Sample parsing : --- start --- test child forked, pid 61979 parsing failed for sample_type 0x800 test child finished with -1 ---- end ---- Sample parsing: FAILED! After: 27: Sample parsing : --- start --- test child forked, pid 63293 test child finished with 0 ---- end ---- Sample parsing: Ok Signed-off-by: Sandipan Das --- tools/perf/tests/sample-parsing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c index 927c7f0cc4cc..25a3f6cece50 100644 --- a/tools/perf/tests/sample-parsing.c +++ b/tools/perf/tests/sample-parsing.c @@ -37,7 +37,7 @@ * in branch_stack variable. */ #define BS_EXPECTED_BE 0xa000d00000000000 -#define BS_EXPECTED_LE 0xd5000000 +#define BS_EXPECTED_LE 0x1aa00000000 #define FLAG(s) s->branch_stack->entries[i].flags static bool samples_same(const struct perf_sample *s1, From patchwork Thu Feb 2 12:26:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandipan Das X-Patchwork-Id: 51886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp212708wrn; Thu, 2 Feb 2023 04:40:04 -0800 (PST) X-Google-Smtp-Source: AK7set/AJcZUGDPb2FimE/0ptxXDiVqvD+1qcJT0Zs1f45LJjqDKrIMB/Ws7viXVZubPL/yGWwVz X-Received: by 2002:a17:907:362:b0:868:b2b6:ee71 with SMTP id rs2-20020a170907036200b00868b2b6ee71mr6147626ejb.6.1675341603998; Thu, 02 Feb 2023 04:40:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675341603; cv=pass; d=google.com; s=arc-20160816; b=Aa+LNuKvbF9XAFOU2W4nPvJw0zbq2/1SuoA+Qqq3YDgvzKO197BE0SyzIa3pKLdwBW tCV/h4k1DkG+NP2GiX5dtvLms4g+cpPWyEbQsAy5AqYyHK+q1SNX7VkYkKOB8T9KoqcA ZH+LnF+xw+eM52jdi7N93HYpXELvoD4ONL5A/i294pMZBzDQX5e7QcVQY4dZlwWU0ALX 314CR9d5Z3kG3dtUBbYWveEbmfMdN8IS0VIztjiUckUegRRSqJkKxdE29KJE0JdSIYkX 3uDmqdyKMfWxuAUqFZDKe17WPlmWAIlrlM+banuZCZxdLtvbaP0YE4cGwJDsCkp/g7aQ BcrQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7YfGmaFE7m5rxYqbGSHX8cAe16dJevny0odHsvL9mwA=; b=am8B9vfjMwe/+26qFDJg0jebZ5+5rR2CnOWLEOhihrofcxntX8y7FrQf8sUSN3qzTH KnK1tuw2DBD/KRhkF16SQmL5e2xaroUTScrXYfhHqFfpKNDcY+8/6Lelnbdx44XNEorJ E0LTpWutEufNyCouCORUMsNhymBpa+A7dYhiMejQumysoEeg3crBn58vH3ej6Evwa4iG qushqTnViEMm14iuuAi4ddAnaA+Zr0Oe2gIw3imClq/MfMPlXBdWQ2dhe9QSD862hkyU MKiU5/sof2ovPgFE49nESh8hOtvml76/UIoZYS7NQPLHWyLrHpgZdO/CovEcJcvPjliN CX/w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b="Y0c/cMff"; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ew1-20020a170907950100b0088dbb061a74si4941459ejc.217.2023.02.02.04.39.40; Thu, 02 Feb 2023 04:40:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b="Y0c/cMff"; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229495AbjBBM17 (ORCPT + 99 others); Thu, 2 Feb 2023 07:27:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232075AbjBBM1x (ORCPT ); Thu, 2 Feb 2023 07:27:53 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2071.outbound.protection.outlook.com [40.107.94.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAB638B32D; Thu, 2 Feb 2023 04:27:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRIp6BDTCE6H6HVbm6o5uW5q0gB3+u49iuJxSWIp6C5p9oi66ikqFdMvY4Lc7nf4kMnrA9J6hVczVxKhdh/8iKNNr4dtCnYX+J0ERPg7BckBKF7chwaknwsPCWq5PCQOhvIyweLGLD+zzMp4zECXTxp4CGPwZjJ2uIJ+NKpIAjuIUd05ERRZa5/h+LAucpaKrDqQFMZOB7PlyYdPcS1WOn8h8PvUlY2bMuEDFTq4yxoDAsQpraM+q44QGt3C9vaZ2IIsbPn1zqfpp63QD01J9SdARBj26WY+QrKReewGB/z0GdVY6Tw1TZ/8Gmsq2V9Csj5qUCf8n8NKkUQo1VeJQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7YfGmaFE7m5rxYqbGSHX8cAe16dJevny0odHsvL9mwA=; b=hc083eL/Af++BlgaW2hnr+et4qMHqxP2bgdRWX6SlV9ZvAw2ajMBZOMT8fvhMm7FCzp3VMfjHx6ZPqrIXK+FzuN4Fbw+pKj/apjb/dJyesXQxlS9suXGEm9pY78UgrKqBuCyyAx6zGIWVBgo93b1OiQdPtTp5a/9ZZz3bwbGUnwY9VJEQRzUvFCCfQv5/gNbVHOK3mIy1dIMJ8Zm1BsO+ec5lxTJ8WUqKdms2w9iZzmm0F5dUu4521NFOxzDwBzwjhuWKsZiWFEpNqwA1LmvtTXTzs7/ffhuh68LtHyHRAvLWgDoP6rE4VKQb61N3+seUN0rnGrgOE2UW1fMhXyh7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7YfGmaFE7m5rxYqbGSHX8cAe16dJevny0odHsvL9mwA=; b=Y0c/cMff+FV7GOfVk4rgHal1wzDzSAaKnBf3zuwiRzMnlCmWRIQn2M5td4g5nMWVYsXKk3yyC+q81QYrsqIh7a8mF9tfwnkuskfhhlPiB69yyvOs7ZcIjgWaeE40eCHhSenhTsgBaD+JInYLQvF7fQjjuAQbakfml1HC7ahgH8A= Received: from DM6PR11CA0013.namprd11.prod.outlook.com (2603:10b6:5:190::26) by CH3PR12MB8329.namprd12.prod.outlook.com (2603:10b6:610:12e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25; Thu, 2 Feb 2023 12:27:49 +0000 Received: from DS1PEPF0000E632.namprd02.prod.outlook.com (2603:10b6:5:190:cafe::f8) by DM6PR11CA0013.outlook.office365.com (2603:10b6:5:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 12:27:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000E632.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 12:27:49 +0000 Received: from sindhu.amdval.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 06:27:42 -0600 From: Sandipan Das To: , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 4/4] perf test brstack: Update regex to include spec field Date: Thu, 2 Feb 2023 17:56:17 +0530 Message-ID: <048d67c9de3cc8e3dbf19aaa7ff718dec91364c5.1675333809.git.sandipan.das@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E632:EE_|CH3PR12MB8329:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f4c1739-9984-47af-e547-08db0518e580 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LoKEP9fn9M4+APSWqABLnMf1blGzF/bt+KbayVAAN2Po3O0BQQbcFb6WnJW9bqC96YrYiFLenXuVtHQ14ontfk0JED+X8IY/Cy+4tPqIONBgUIpPwy47dFWey5RcSXN+z2y+l2MlihWxVIdzZRqs8beQ5mwR4owIysIvj7P5PJcM/i5dsXT91KKc4DnK5ive0jAkKxuHkforgL5WaQd3SwgDRdVnHg17kkauvuqQC7kYU0JgUBA8y8mf9Jv4gPqhb0ZCz1vrs3yiRtG/xVzHRRpPz0OPWsjDBgA0Y1uYhCHcY6QVQCgvtm53tJODpU57uApY02mSqR2IB5mUJKQS34TAoNmSyHj66i01GL5Twhqf0+nw8IODT140qWd4UvsgMhJewl9n8R3QjzYje5oZNKOovjgwtYYAuFrh+pWvFKqOEhwlxah2+S9U0RU1K2VdtDWJNlAAXFSsgNONSGcDp/uzV6U7SqaGt2gUSsnO63n5S48/Lqf0c16sslrbaZXyM/GwqWbIuO7JRBmW4kraJg5T+nwWkwtIPECxyTcEwDfETeUW//v4uq6AnNG6YYq8QtFA/eGvcctfjcIN6yTHFoEVY/BvKpyxbiqfcc088F6cfqZoYK+0JSVJk0J36VMx/M7hIoPNQlmh8gA3ENlti8j3F+gCKVXkoVeFCKwPQBj4Xk1dCi/ZjvJD6WIwRbHPG6N3RayIfl5xzi4hECue5AuvGzu9ibYSRiFQrLqDMZg= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199018)(36840700001)(40470700004)(46966006)(316002)(356005)(110136005)(8936002)(2906002)(81166007)(82740400003)(5660300002)(478600001)(8676002)(7416002)(4326008)(36860700001)(86362001)(70586007)(70206006)(83380400001)(6666004)(47076005)(426003)(44832011)(41300700001)(336012)(40480700001)(82310400005)(54906003)(40460700003)(2616005)(36756003)(186003)(26005)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 12:27:49.0059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f4c1739-9984-47af-e547-08db0518e580 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E632.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8329 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756722997858626601?= X-GMAIL-MSGID: =?utf-8?q?1756722997858626601?= With the addition of new branch flags, the "brstacksym" fields in perf script output now shows speculation information after the branch type. Change the regular expressions accordingly for the test to pass. Since branch speculation information may vary across platforms, the test does not look for specific values. E.g. $ perf test -v 110 Before: 110: Check branch stack sampling : --- start --- test child forked, pid 54154 Testing user branch stack sampling + grep -E -m1 ^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$ /tmp/__perf_test.program.AfhUI/perf.script + cleanup + rm -rf /tmp/__perf_test.program.AfhUI test child finished with -1 ---- end ---- Check branch stack sampling: FAILED! After: 110: Check branch stack sampling : --- start --- test child forked, pid 43716 Testing user branch stack sampling + grep -E -m1 ^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_bench+0x66/brstack_foo+0x0/P/-/-/0/IND_CALL/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_foo+0x1b/brstack_bar+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_bench+0x58/brstack_foo+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_bench+0x5d/brstack_bar+0x0/P/-/-/0/CALL/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_bar+0x31/brstack_foo+0x20/P/-/-/0/RET/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_foo+0x36/brstack_bench+0x5d/P/-/-/0/RET/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack_bench+0x76/brstack_bench+0x7d/P/-/-/0/COND/NON_SPEC_CORRECT_PATH + grep -E -m1 ^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND/.*$ /tmp/__perf_test.program.xgzAi/perf.script brstack+0x5a/brstack+0x41/P/-/-/0/UNCOND/NON_SPEC_CORRECT_PATH + set +x Testing branch stack filtering permutation (any_call,CALL|IND_CALL|COND_CALL|SYSCALL|IRQ) Testing branch stack filtering permutation (call,CALL|SYSCALL) Testing branch stack filtering permutation (cond,COND) Testing branch stack filtering permutation (any_ret,RET|COND_RET|SYSRET|ERET) Testing branch stack filtering permutation (call,cond,CALL|SYSCALL|COND) Testing branch stack filtering permutation (any_call,cond,CALL|IND_CALL|COND_CALL|IRQ|SYSCALL|COND) Testing branch stack filtering permutation (cond,any_call,any_ret,COND|CALL|IND_CALL|COND_CALL|SYSCALL|IRQ|RET|COND_RET|SYSRET|ERET) test child finished with 0 ---- end ---- Check branch stack sampling: Ok Signed-off-by: Sandipan Das --- tools/perf/tests/shell/test_brstack.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/tests/shell/test_brstack.sh b/tools/perf/tests/shell/test_brstack.sh index 59195eb80052..1c49d8293003 100755 --- a/tools/perf/tests/shell/test_brstack.sh +++ b/tools/perf/tests/shell/test_brstack.sh @@ -30,14 +30,14 @@ test_user_branches() { # brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL set -x - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET$" $TMPDIR/perf.script - grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND$" $TMPDIR/perf.script - grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/IND_CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_foo\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bar\+[^ ]*/CALL/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bar\+[^ ]*/brstack_foo\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_foo\+[^ ]*/brstack_bench\+[^ ]*/RET/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack_bench\+[^ ]*/brstack_bench\+[^ ]*/COND/.*$" $TMPDIR/perf.script + grep -E -m1 "^brstack\+[^ ]*/brstack\+[^ ]*/UNCOND/.*$" $TMPDIR/perf.script set +x # some branch types are still not being tested: @@ -57,7 +57,7 @@ test_filter() { # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-) - if grep -E -vm1 "^[^ ]*/($expect|-|( *))$" $TMPDIR/perf.script; then + if grep -E -vm1 "^[^ ]*/($expect|-|( *))/.*$" $TMPDIR/perf.script; then return 1 fi }