From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27FDCC77B7D for ; Thu, 18 May 2023 12:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230385AbjERMzs (ORCPT ); Thu, 18 May 2023 08:55:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230268AbjERMzp (ORCPT ); Thu, 18 May 2023 08:55:45 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A264D170B; Thu, 18 May 2023 05:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684414543; x=1715950543; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=vVk+fyl5tUyWK2h+sqIQYrC0ydmStlZoTzOm+/4qsDA=; b=bMZ12Pegsidx9GQG71uc0olJ6SsqfNC2hos3EYQkf0zraF0ihYWYyAO4 4hzYEUu4rekQEb2qY+dthDuqsx1DEMAZIgIZZ//zuMB1+5wd3T9BFTutl eTJDrMEBJrP3S9GRDmbIRYsun++8UYFcYH/WLbDn/LZ9oFzVdtj/+F1UO nNXuJupHtlpc3rC7XdAheZ9ki3cVVJs265ZS5EI5ecp4LpAffHAcLgKfY ObdofEuTcFZfHCSdYaTmzLbuOlZijhoaQ62Nconvzk9INkGRDF934cPPc msv69jFYL6e+7K2c1d6EKlCmChm5jcjqo+1QjlP7eBW2TZWSYAe3ubhED Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10713"; a="336623237" X-IronPort-AV: E=Sophos;i="5.99,285,1677571200"; d="scan'208";a="336623237" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2023 05:55:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10713"; a="679666624" X-IronPort-AV: E=Sophos;i="5.99,285,1677571200"; d="scan'208";a="679666624" Received: from linux.intel.com ([10.54.29.200]) by orsmga006.jf.intel.com with ESMTP; 18 May 2023 05:55:42 -0700 Received: from [10.209.99.208] (kliang2-mobl1.ccr.corp.intel.com [10.209.99.208]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id E1D87580BE4; Thu, 18 May 2023 05:55:40 -0700 (PDT) Message-ID: Date: Thu, 18 May 2023 08:55:39 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [PATCH v1 1/2] perf test attr: Update no event/metric expectations Content-Language: en-US To: Arnaldo Carvalho de Melo , James Clark , Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Thomas Richter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230517225707.2682235-1-irogers@google.com> <64f329a9-09a3-aa84-a354-23a919062d09@arm.com> From: "Liang, Kan" In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnaldo, On 2023-05-18 8:20 a.m., Arnaldo Carvalho de Melo wrote: > Em Thu, May 18, 2023 at 08:50:14AM +0100, James Clark escreveu: >> >> >> On 17/05/2023 23:57, Ian Rogers wrote: >>> Previously hard coded events/metrics were used, update for the use of >>> the TopdownL1 json metric group. >>> >>> Fixes: 94b1a603fca7 ("perf stat: Add TopdownL1 metric as a default if present") >>> Signed-off-by: Ian Rogers >>> --- >>> tools/perf/tests/attr/base-stat | 2 +- >>> tools/perf/tests/attr/test-stat-default | 80 ++++++++----- >>> tools/perf/tests/attr/test-stat-detailed-1 | 95 +++++++++------ >>> tools/perf/tests/attr/test-stat-detailed-2 | 119 +++++++++++-------- >>> tools/perf/tests/attr/test-stat-detailed-3 | 127 ++++++++++++--------- >>> 5 files changed, 249 insertions(+), 174 deletions(-) >>> >> >> Reviewed-by: James Clark > > Thanks, applied both patches to perf-tools. > Could you please hold patch 1 for a while? The formula of TopdownL1 may be changed generation by generation on Intel platforms. Some of events in the current TopdownL1 formula, e.g., INT_MISC.UOP_DROPPING, (Which are harded code in this patch), are not architectural events. It means that they may be changed in the future platforms as well. Hard code the current TopdownL1 formual and the non-architectural events don't seems a proper fix for the generic perf test case. We have to update the test case for each generation when the formula is changed. Thanks, Kan > - Arnaldo > > >>> diff --git a/tools/perf/tests/attr/base-stat b/tools/perf/tests/attr/base-stat >>> index a21fb65bc012..fccd8ec4d1b0 100644 >>> --- a/tools/perf/tests/attr/base-stat >>> +++ b/tools/perf/tests/attr/base-stat >>> @@ -16,7 +16,7 @@ pinned=0 >>> exclusive=0 >>> exclude_user=0 >>> exclude_kernel=0|1 >>> -exclude_hv=0 >>> +exclude_hv=0|1 >>> exclude_idle=0 >>> mmap=0 >>> comm=0 >>> diff --git a/tools/perf/tests/attr/test-stat-default b/tools/perf/tests/attr/test-stat-default >>> index d8ea6a88163f..a1e2da0a9a6d 100644 >>> --- a/tools/perf/tests/attr/test-stat-default >>> +++ b/tools/perf/tests/attr/test-stat-default >>> @@ -40,7 +40,6 @@ fd=6 >>> type=0 >>> config=7 >>> optional=1 >>> - >>> # PERF_TYPE_HARDWARE / PERF_COUNT_HW_STALLED_CYCLES_BACKEND >>> [event7:base-stat] >>> fd=7 >>> @@ -89,79 +88,98 @@ enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> +# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> [event13:base-stat] >>> fd=13 >>> group_fd=11 >>> type=4 >>> -config=33024 >>> +config=33280 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> +# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> [event14:base-stat] >>> fd=14 >>> group_fd=11 >>> type=4 >>> -config=33280 >>> +config=33536 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> +# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> [event15:base-stat] >>> fd=15 >>> group_fd=11 >>> type=4 >>> -config=33536 >>> +config=33024 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-heavy-ops (0x8400) >>> +# PERF_TYPE_RAW / INT_MISC.UOP_DROPPING >>> [event16:base-stat] >>> fd=16 >>> -group_fd=11 >>> type=4 >>> -config=33792 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=4109 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-br-mispredict (0x8500) >>> +# PERF_TYPE_RAW / cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/ >>> [event17:base-stat] >>> fd=17 >>> -group_fd=11 >>> type=4 >>> -config=34048 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=17039629 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fetch-lat (0x8600) >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.THREAD >>> [event18:base-stat] >>> fd=18 >>> -group_fd=11 >>> type=4 >>> -config=34304 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=60 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-mem-bound (0x8700) >>> +# PERF_TYPE_RAW / INT_MISC.RECOVERY_CYCLES_ANY >>> [event19:base-stat] >>> fd=19 >>> -group_fd=11 >>> type=4 >>> -config=34560 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=2097421 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.REF_XCLK >>> +[event20:base-stat] >>> +fd=20 >>> +type=4 >>> +config=316 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / IDQ_UOPS_NOT_DELIVERED.CORE >>> +[event21:base-stat] >>> +fd=21 >>> +type=4 >>> +config=412 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE >>> +[event22:base-stat] >>> +fd=22 >>> +type=4 >>> +config=572 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_RETIRED.RETIRE_SLOTS >>> +[event23:base-stat] >>> +fd=23 >>> +type=4 >>> +config=706 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_ISSUED.ANY >>> +[event24:base-stat] >>> +fd=24 >>> +type=4 >>> +config=270 >>> optional=1 >>> diff --git a/tools/perf/tests/attr/test-stat-detailed-1 b/tools/perf/tests/attr/test-stat-detailed-1 >>> index b656ab93c5bf..1c52cb05c900 100644 >>> --- a/tools/perf/tests/attr/test-stat-detailed-1 >>> +++ b/tools/perf/tests/attr/test-stat-detailed-1 >>> @@ -90,89 +90,108 @@ enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> +# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> [event13:base-stat] >>> fd=13 >>> group_fd=11 >>> type=4 >>> -config=33024 >>> +config=33280 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> +# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> [event14:base-stat] >>> fd=14 >>> group_fd=11 >>> type=4 >>> -config=33280 >>> +config=33536 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> +# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> [event15:base-stat] >>> fd=15 >>> group_fd=11 >>> type=4 >>> -config=33536 >>> +config=33024 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-heavy-ops (0x8400) >>> +# PERF_TYPE_RAW / INT_MISC.UOP_DROPPING >>> [event16:base-stat] >>> fd=16 >>> -group_fd=11 >>> type=4 >>> -config=33792 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=4109 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-br-mispredict (0x8500) >>> +# PERF_TYPE_RAW / cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/ >>> [event17:base-stat] >>> fd=17 >>> -group_fd=11 >>> type=4 >>> -config=34048 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=17039629 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fetch-lat (0x8600) >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.THREAD >>> [event18:base-stat] >>> fd=18 >>> -group_fd=11 >>> type=4 >>> -config=34304 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=60 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-mem-bound (0x8700) >>> +# PERF_TYPE_RAW / INT_MISC.RECOVERY_CYCLES_ANY >>> [event19:base-stat] >>> fd=19 >>> -group_fd=11 >>> type=4 >>> -config=34560 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=2097421 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.REF_XCLK >>> +[event20:base-stat] >>> +fd=20 >>> +type=4 >>> +config=316 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / IDQ_UOPS_NOT_DELIVERED.CORE >>> +[event21:base-stat] >>> +fd=21 >>> +type=4 >>> +config=412 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE >>> +[event22:base-stat] >>> +fd=22 >>> +type=4 >>> +config=572 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_RETIRED.RETIRE_SLOTS >>> +[event23:base-stat] >>> +fd=23 >>> +type=4 >>> +config=706 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_ISSUED.ANY >>> +[event24:base-stat] >>> +fd=24 >>> +type=4 >>> +config=270 >>> optional=1 >>> >>> # PERF_TYPE_HW_CACHE / >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event20:base-stat] >>> -fd=20 >>> +[event25:base-stat] >>> +fd=25 >>> type=3 >>> config=0 >>> optional=1 >>> @@ -181,8 +200,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event21:base-stat] >>> -fd=21 >>> +[event26:base-stat] >>> +fd=26 >>> type=3 >>> config=65536 >>> optional=1 >>> @@ -191,8 +210,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event22:base-stat] >>> -fd=22 >>> +[event27:base-stat] >>> +fd=27 >>> type=3 >>> config=2 >>> optional=1 >>> @@ -201,8 +220,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event23:base-stat] >>> -fd=23 >>> +[event28:base-stat] >>> +fd=28 >>> type=3 >>> config=65538 >>> optional=1 >>> diff --git a/tools/perf/tests/attr/test-stat-detailed-2 b/tools/perf/tests/attr/test-stat-detailed-2 >>> index 97625090a1c4..7e961d24a885 100644 >>> --- a/tools/perf/tests/attr/test-stat-detailed-2 >>> +++ b/tools/perf/tests/attr/test-stat-detailed-2 >>> @@ -90,89 +90,108 @@ enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> +# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> [event13:base-stat] >>> fd=13 >>> group_fd=11 >>> type=4 >>> -config=33024 >>> +config=33280 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> +# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> [event14:base-stat] >>> fd=14 >>> group_fd=11 >>> type=4 >>> -config=33280 >>> +config=33536 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> +# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> [event15:base-stat] >>> fd=15 >>> group_fd=11 >>> type=4 >>> -config=33536 >>> +config=33024 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-heavy-ops (0x8400) >>> +# PERF_TYPE_RAW / INT_MISC.UOP_DROPPING >>> [event16:base-stat] >>> fd=16 >>> -group_fd=11 >>> type=4 >>> -config=33792 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=4109 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-br-mispredict (0x8500) >>> +# PERF_TYPE_RAW / cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/ >>> [event17:base-stat] >>> fd=17 >>> -group_fd=11 >>> type=4 >>> -config=34048 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=17039629 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fetch-lat (0x8600) >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.THREAD >>> [event18:base-stat] >>> fd=18 >>> -group_fd=11 >>> type=4 >>> -config=34304 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=60 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-mem-bound (0x8700) >>> +# PERF_TYPE_RAW / INT_MISC.RECOVERY_CYCLES_ANY >>> [event19:base-stat] >>> fd=19 >>> -group_fd=11 >>> type=4 >>> -config=34560 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=2097421 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.REF_XCLK >>> +[event20:base-stat] >>> +fd=20 >>> +type=4 >>> +config=316 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / IDQ_UOPS_NOT_DELIVERED.CORE >>> +[event21:base-stat] >>> +fd=21 >>> +type=4 >>> +config=412 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE >>> +[event22:base-stat] >>> +fd=22 >>> +type=4 >>> +config=572 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_RETIRED.RETIRE_SLOTS >>> +[event23:base-stat] >>> +fd=23 >>> +type=4 >>> +config=706 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_ISSUED.ANY >>> +[event24:base-stat] >>> +fd=24 >>> +type=4 >>> +config=270 >>> optional=1 >>> >>> # PERF_TYPE_HW_CACHE / >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event20:base-stat] >>> -fd=20 >>> +[event25:base-stat] >>> +fd=25 >>> type=3 >>> config=0 >>> optional=1 >>> @@ -181,8 +200,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event21:base-stat] >>> -fd=21 >>> +[event26:base-stat] >>> +fd=26 >>> type=3 >>> config=65536 >>> optional=1 >>> @@ -191,8 +210,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event22:base-stat] >>> -fd=22 >>> +[event27:base-stat] >>> +fd=27 >>> type=3 >>> config=2 >>> optional=1 >>> @@ -201,8 +220,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event23:base-stat] >>> -fd=23 >>> +[event28:base-stat] >>> +fd=28 >>> type=3 >>> config=65538 >>> optional=1 >>> @@ -211,8 +230,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1I << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event24:base-stat] >>> -fd=24 >>> +[event29:base-stat] >>> +fd=29 >>> type=3 >>> config=1 >>> optional=1 >>> @@ -221,8 +240,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1I << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event25:base-stat] >>> -fd=25 >>> +[event30:base-stat] >>> +fd=30 >>> type=3 >>> config=65537 >>> optional=1 >>> @@ -231,8 +250,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_DTLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event26:base-stat] >>> -fd=26 >>> +[event31:base-stat] >>> +fd=31 >>> type=3 >>> config=3 >>> optional=1 >>> @@ -241,8 +260,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_DTLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event27:base-stat] >>> -fd=27 >>> +[event32:base-stat] >>> +fd=32 >>> type=3 >>> config=65539 >>> optional=1 >>> @@ -251,8 +270,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_ITLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event28:base-stat] >>> -fd=28 >>> +[event33:base-stat] >>> +fd=33 >>> type=3 >>> config=4 >>> optional=1 >>> @@ -261,8 +280,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_ITLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event29:base-stat] >>> -fd=29 >>> +[event34:base-stat] >>> +fd=34 >>> type=3 >>> config=65540 >>> optional=1 >>> diff --git a/tools/perf/tests/attr/test-stat-detailed-3 b/tools/perf/tests/attr/test-stat-detailed-3 >>> index d555042e3fbf..e50535f45977 100644 >>> --- a/tools/perf/tests/attr/test-stat-detailed-3 >>> +++ b/tools/perf/tests/attr/test-stat-detailed-3 >>> @@ -90,89 +90,108 @@ enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> +# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> [event13:base-stat] >>> fd=13 >>> group_fd=11 >>> type=4 >>> -config=33024 >>> +config=33280 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fe-bound (0x8200) >>> +# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> [event14:base-stat] >>> fd=14 >>> group_fd=11 >>> type=4 >>> -config=33280 >>> +config=33536 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-be-bound (0x8300) >>> +# PERF_TYPE_RAW / topdown-bad-spec (0x8100) >>> [event15:base-stat] >>> fd=15 >>> group_fd=11 >>> type=4 >>> -config=33536 >>> +config=33024 >>> disabled=0 >>> enable_on_exec=0 >>> read_format=15 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-heavy-ops (0x8400) >>> +# PERF_TYPE_RAW / INT_MISC.UOP_DROPPING >>> [event16:base-stat] >>> fd=16 >>> -group_fd=11 >>> type=4 >>> -config=33792 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=4109 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-br-mispredict (0x8500) >>> +# PERF_TYPE_RAW / cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/ >>> [event17:base-stat] >>> fd=17 >>> -group_fd=11 >>> type=4 >>> -config=34048 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=17039629 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-fetch-lat (0x8600) >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.THREAD >>> [event18:base-stat] >>> fd=18 >>> -group_fd=11 >>> type=4 >>> -config=34304 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=60 >>> optional=1 >>> >>> -# PERF_TYPE_RAW / topdown-mem-bound (0x8700) >>> +# PERF_TYPE_RAW / INT_MISC.RECOVERY_CYCLES_ANY >>> [event19:base-stat] >>> fd=19 >>> -group_fd=11 >>> type=4 >>> -config=34560 >>> -disabled=0 >>> -enable_on_exec=0 >>> -read_format=15 >>> +config=2097421 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.REF_XCLK >>> +[event20:base-stat] >>> +fd=20 >>> +type=4 >>> +config=316 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / IDQ_UOPS_NOT_DELIVERED.CORE >>> +[event21:base-stat] >>> +fd=21 >>> +type=4 >>> +config=412 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE >>> +[event22:base-stat] >>> +fd=22 >>> +type=4 >>> +config=572 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_RETIRED.RETIRE_SLOTS >>> +[event23:base-stat] >>> +fd=23 >>> +type=4 >>> +config=706 >>> +optional=1 >>> + >>> +# PERF_TYPE_RAW / UOPS_ISSUED.ANY >>> +[event24:base-stat] >>> +fd=24 >>> +type=4 >>> +config=270 >>> optional=1 >>> >>> # PERF_TYPE_HW_CACHE / >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event20:base-stat] >>> -fd=20 >>> +[event25:base-stat] >>> +fd=25 >>> type=3 >>> config=0 >>> optional=1 >>> @@ -181,8 +200,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event21:base-stat] >>> -fd=21 >>> +[event26:base-stat] >>> +fd=26 >>> type=3 >>> config=65536 >>> optional=1 >>> @@ -191,8 +210,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event22:base-stat] >>> -fd=22 >>> +[event27:base-stat] >>> +fd=27 >>> type=3 >>> config=2 >>> optional=1 >>> @@ -201,8 +220,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_LL << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event23:base-stat] >>> -fd=23 >>> +[event28:base-stat] >>> +fd=28 >>> type=3 >>> config=65538 >>> optional=1 >>> @@ -211,8 +230,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1I << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event24:base-stat] >>> -fd=24 >>> +[event29:base-stat] >>> +fd=29 >>> type=3 >>> config=1 >>> optional=1 >>> @@ -221,8 +240,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1I << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event25:base-stat] >>> -fd=25 >>> +[event30:base-stat] >>> +fd=30 >>> type=3 >>> config=65537 >>> optional=1 >>> @@ -231,8 +250,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_DTLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event26:base-stat] >>> -fd=26 >>> +[event31:base-stat] >>> +fd=31 >>> type=3 >>> config=3 >>> optional=1 >>> @@ -241,8 +260,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_DTLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event27:base-stat] >>> -fd=27 >>> +[event32:base-stat] >>> +fd=32 >>> type=3 >>> config=65539 >>> optional=1 >>> @@ -251,8 +270,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_ITLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event28:base-stat] >>> -fd=28 >>> +[event33:base-stat] >>> +fd=33 >>> type=3 >>> config=4 >>> optional=1 >>> @@ -261,8 +280,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_ITLB << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_READ << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event29:base-stat] >>> -fd=29 >>> +[event34:base-stat] >>> +fd=34 >>> type=3 >>> config=65540 >>> optional=1 >>> @@ -271,8 +290,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_PREFETCH << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16) >>> -[event30:base-stat] >>> -fd=30 >>> +[event35:base-stat] >>> +fd=35 >>> type=3 >>> config=512 >>> optional=1 >>> @@ -281,8 +300,8 @@ optional=1 >>> # PERF_COUNT_HW_CACHE_L1D << 0 | >>> # (PERF_COUNT_HW_CACHE_OP_PREFETCH << 8) | >>> # (PERF_COUNT_HW_CACHE_RESULT_MISS << 16) >>> -[event31:base-stat] >>> -fd=31 >>> +[event36:base-stat] >>> +fd=36 >>> type=3 >>> config=66048 >>> optional=1 >