From patchwork Wed Jan 4 20:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 39084 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5335464wrt; Wed, 4 Jan 2023 12:16:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXuGiz/coPa9u7GxxbZrcL+CNwtLZ2GJdbgweRyq41yaKHgXeX+hf/Z9xHCXu1/beA8Z6Gq1 X-Received: by 2002:a17:90b:4d8c:b0:223:dd6f:13af with SMTP id oj12-20020a17090b4d8c00b00223dd6f13afmr53339240pjb.36.1672863387744; Wed, 04 Jan 2023 12:16:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672863387; cv=none; d=google.com; s=arc-20160816; b=wHHGJAobnOY6dSYzco9Efted0ZTETqAykC2Ep4GOdsf1lzIHYPlt4Ihsdk+wWlnKhF 60NEheCkh21RRhQK+6OuLhBiKRPNMVh02FppS3D9rsNp6hOHrsC8XFyuErxH8TKC1Pii saIR9BQQ7nPTQVTEtJFoCtg/zPvCNaCS93wD0H2cFZeyUYyQ2hbmFllGBFd/djWVYaUy 4bkUMUcXPQYRtca4e88bOdig32uyIVk49KPuh8Jny1T0VtqjTCjLloZkFdO6Ei17vZGR w4WRy4VWw0+gKIcCHz7/WcKr9IFZDT58DtzGMrm5U9QWqEj9ijXCwSZh2uP3q76DGzFi HQXQ== ARC-Message-Signature: i=1; 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=/HJ/AsLtnKZ7+OXdCien0MOZCvk+IfeRb+2A559OPLY=; b=YHZg2ensm0Cn6pKXkuGWRvfD1OKprwLmC/KwUfqgHOoIQXIXwPBP5oMVrmoU+Zfnbj NELOvwMMK516dmzmy56c0g4Bi3fS/LjOh/Y+bkbQGFL4lCOoQ198ZTUrcQTsCnyaAJtm tAYjfQ3F86qNKvx0m07rigOHTz7kwZqktCLmpAdJ7XbN6hke9Cme55IUp8PHkG23qEzq YoF8LGv5e2TtpWPGslvTu9j15kdJvsduRg5zSxL+JJxwDT0D1axJMCBQgnz+6pLKuDRe poZ84Oij5SeqCUhhpo0fXSpmZ5ov3Y52F0nPXnXJOZbgnrkXnpjZH/Jtb9YsAlnvoFR+ 0CtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n7DKaUYo; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j6-20020a17090a7e8600b0022695223cdcsi5757198pjl.178.2023.01.04.12.16.15; Wed, 04 Jan 2023 12:16:27 -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=@intel.com header.s=Intel header.b=n7DKaUYo; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240127AbjADUOn (ORCPT + 99 others); Wed, 4 Jan 2023 15:14:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239935AbjADUOO (ORCPT ); Wed, 4 Jan 2023 15:14:14 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4679F11C3A for ; Wed, 4 Jan 2023 12:14:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672863253; x=1704399253; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ehlpv62JJoPoTAs4sBwCHanyUqPdY5VYO9Qbv8uzt+o=; b=n7DKaUYo+UkNAhzuC2lUl9N1nfs0I0VD3buMIcbtnNg3dafxsr+h14lq IcV+dnIGnpmZI1LSCWup5vSZ/nnhNvBqCgEx739CTXpj0rWoHMSUaBzYs RWRGHg99rpYB4960bRgFTUlJ73JCZm2ENBM5Oak5cfJal5JgdlPyWT5rw P/frrIqjfNwdnz805h9ObPBl/2PyMCbBaCydaMmiteFRC09BvFifrhp+s WKmSqdkE9I+W+tmvHqs8DUgblCvCCWBqQI9sEF0OLDw1N24yCmboEr5yp MpIqofMTt7N7DJi1yFkNrFFxrf/qlLKKTG1Den+iheZ4vCybgEGEpJy68 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="322105490" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="322105490" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 12:14:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="779324019" X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="779324019" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga004.jf.intel.com with ESMTP; 04 Jan 2023 12:14:12 -0800 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, eranian@google.com, irogers@google.com, Kan Liang Subject: [PATCH V2 8/9] perf report: Support Retire Latency Date: Wed, 4 Jan 2023 12:13:48 -0800 Message-Id: <20230104201349.1451191-8-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230104201349.1451191-1-kan.liang@linux.intel.com> References: <20230104201349.1451191-1-kan.liang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham 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?1754124399705672627?= X-GMAIL-MSGID: =?utf-8?q?1754124399705672627?= From: Kan Liang The Retire Latency field is added in the var3_w of the PERF_SAMPLE_WEIGHT_STRUCT. The Retire Latency reports pipeline stall of this instruction compared to the previous instruction in cycles. That's quite useful to display the information with perf mem report. The p_stage_cyc for Power is also from the var3_w. Union the p_stage_cyc and retire_lat to share the code. Implement X86 specific codes to display the X86 specific header. Add a new sort key retire_lat for the Retire Latency. Reviewed-by: Andi Kleen Signed-off-by: Kan Liang --- Change since V1 - Rebase on top of 6.2-rc1 tools/perf/Documentation/perf-report.txt | 2 ++ tools/perf/arch/x86/util/event.c | 20 ++++++++++++++++++++ tools/perf/util/sample.h | 5 ++++- tools/perf/util/sort.c | 2 ++ tools/perf/util/sort.h | 2 ++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt index 4fa509b15948..e3971ddb666c 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt @@ -115,6 +115,8 @@ OPTIONS - p_stage_cyc: On powerpc, this presents the number of cycles spent in a pipeline stage. And currently supported only on powerpc. - addr: (Full) virtual address of the sampled instruction + - retire_lat: On X86, this reports pipeline stall of this instruction compared + to the previous instruction in cycles. And currently supported only on X86 By default, comm, dso and symbol keys are used. (i.e. --sort comm,dso,symbol) diff --git a/tools/perf/arch/x86/util/event.c b/tools/perf/arch/x86/util/event.c index a3acefe6d0c6..37b3feb53e8d 100644 --- a/tools/perf/arch/x86/util/event.c +++ b/tools/perf/arch/x86/util/event.c @@ -89,6 +89,7 @@ void arch_perf_parse_sample_weight(struct perf_sample *data, else { data->weight = weight.var1_dw; data->ins_lat = weight.var2_w; + data->retire_lat = weight.var3_w; } } @@ -102,3 +103,22 @@ void arch_perf_synthesize_sample_weight(const struct perf_sample *data, *array |= ((u64)data->ins_lat << 32); } } + +const char *arch_perf_header_entry(const char *se_header) +{ + if (!strcmp(se_header, "Local Pipeline Stage Cycle")) + return "Local Retire Latency"; + else if (!strcmp(se_header, "Pipeline Stage Cycle")) + return "Retire Latency"; + + return se_header; +} + +int arch_support_sort_key(const char *sort_key) +{ + if (!strcmp(sort_key, "p_stage_cyc")) + return 1; + if (!strcmp(sort_key, "local_p_stage_cyc")) + return 1; + return 0; +} diff --git a/tools/perf/util/sample.h b/tools/perf/util/sample.h index 60ec79d4eea4..33b08e0ac746 100644 --- a/tools/perf/util/sample.h +++ b/tools/perf/util/sample.h @@ -92,7 +92,10 @@ struct perf_sample { u8 cpumode; u16 misc; u16 ins_lat; - u16 p_stage_cyc; + union { + u16 p_stage_cyc; + u16 retire_lat; + }; bool no_hw_idx; /* No hw_idx collected in branch_stack */ char insn[MAX_INSN]; void *raw_data; diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index e188f74698dd..e2cc18cd08cd 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -2132,6 +2132,8 @@ static struct sort_dimension common_sort_dimensions[] = { DIM(SORT_LOCAL_PIPELINE_STAGE_CYC, "local_p_stage_cyc", sort_local_p_stage_cyc), DIM(SORT_GLOBAL_PIPELINE_STAGE_CYC, "p_stage_cyc", sort_global_p_stage_cyc), DIM(SORT_ADDR, "addr", sort_addr), + DIM(SORT_LOCAL_RETIRE_LAT, "local_retire_lat", sort_local_p_stage_cyc), + DIM(SORT_GLOBAL_RETIRE_LAT, "retire_lat", sort_global_p_stage_cyc), }; #undef DIM diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 921715e6aec4..9a91d0df2833 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -237,6 +237,8 @@ enum sort_type { SORT_LOCAL_PIPELINE_STAGE_CYC, SORT_GLOBAL_PIPELINE_STAGE_CYC, SORT_ADDR, + SORT_LOCAL_RETIRE_LAT, + SORT_GLOBAL_RETIRE_LAT, /* branch stack specific sort keys */ __SORT_BRANCH_STACK,