From patchwork Thu Jun 15 13:53:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 108542 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp659411vqr; Thu, 15 Jun 2023 07:04:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/UJvhFJeVuh2Gbd8YZ6rzQjplx9risWLyuCmj6pWW0aKDzKr1VbJEYaYj+6CAOuw+Tjz1 X-Received: by 2002:a05:6a21:6da2:b0:10b:e88f:597c with SMTP id wl34-20020a056a216da200b0010be88f597cmr5059169pzb.44.1686837888819; Thu, 15 Jun 2023 07:04:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686837888; cv=none; d=google.com; s=arc-20160816; b=XRlLDP1+fwpXMSQPzzFo6Ng4/mdtIn4GmjVjLHWvJBZSPByNsbKY2xYBB8UjySK1/L 9/k/NqNuKc9zOuwd5bNqaLOTxONOb+8uwbIDTbpKnRYHMWDOlJwnAuxOTGKk19E+nu7k mFjVZ2NfjkSrgjo9EacDLlewtZzWsqFVzVd40FhfLhLI89foEP226h/ln2raDWwqArOv 0XXfHgxqnJNGDW/Wc0Rw6kM6dwtSFie7nO36QKxKULsq60o79Hn4ugwkiv5a8W/YCOQZ vt9HkNMjBvhOe9ozweSfsi9+Pym+g7zDVAIDrVdIPUrOQ/NQky7n6YtrhFLdRz5OOueX jjSg== 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=4G8OQNDJdcrHQOFV5m+UPAG49NiftaTgsQXx0P9OVFo=; b=qmPQoB2F/yUjCT9mVmIhVER/1b5uAoB0P4E2gUEckMT2A5+JvriDHNpBl+xLV1+SzP QV6oGlv9RYCCkDpn4wBIjIfbxWcYUGaPH++zT/H3MHo9eeDXEjdmsqIxGC32OS1CMpcX tWwFW+HDQZbZRdfkogd4ubQ13tXx80etqPvjMj89JggeVa6RZUdzEMjbkUdRflMVMQAQ HADbBCNfIarLTmfZ0Autg8UCr7SMKwJSFQ4E5blcTQwCv+pf/1QLX/EeS70SsMCTqNcV 9+UImpi+sneTfpSS/mfSfaJTE7zVYxwvZd3ltgvAQenWNzey5smR/HB6oWt2hMLgEbOe W0RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ADYGDOf3; 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 l190-20020a6388c7000000b0054ff0a52bbesi1734221pgd.507.2023.06.15.07.04.18; Thu, 15 Jun 2023 07:04:48 -0700 (PDT) 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=ADYGDOf3; 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 S1344104AbjFONze (ORCPT + 99 others); Thu, 15 Jun 2023 09:55:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344469AbjFONyn (ORCPT ); Thu, 15 Jun 2023 09:54:43 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DC4A1FD5; Thu, 15 Jun 2023 06:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686837282; x=1718373282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jazqzmxuygKHAVF1T3XyECyr+VZwL4+XwB2HASyrSgQ=; b=ADYGDOf3H+cdA92Ar+vhVwGS/K3msFYJKp68j/WHgNmfJbozrTlpdaxi wxKvXdT3ZZOw8COcUajuHlZnRaUpWTvoSVFgzeuBZhTzWu2HwCCNw5sy6 E7tIcw1Us2EXpNqAsVekoZfOVt/ky5LW1YRaAbURapoGZ6sqrwdk6K9Q8 VE+H4LQkqX/Fv1x294Pq8bi8llBWRLArLXHz60DwScbo3F51wG+DNeA6M nYYSZOGRyawnb5kE3Zij8k55VPQtU2dad5GumZbR3I3nlVey3zKsRBBDK gPKH4eBSv/YrBdifmII6piqGgw9xsuSNPpCcKbd9aGtBXHORXgRGVMLE2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="356411418" X-IronPort-AV: E=Sophos;i="6.00,245,1681196400"; d="scan'208";a="356411418" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 06:54:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="782527066" X-IronPort-AV: E=Sophos;i="6.00,245,1681196400"; d="scan'208";a="782527066" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by fmsmga004.fm.intel.com with ESMTP; 15 Jun 2023 06:54:40 -0700 From: kan.liang@linux.intel.com To: acme@kernel.org, mingo@redhat.com, peterz@infradead.org, irogers@google.com, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, eranian@google.com, ahmad.yasin@intel.com, Kan Liang Subject: [PATCH V3 6/8] pert tests: Update metric-value for perf stat JSON output Date: Thu, 15 Jun 2023 06:53:13 -0700 Message-Id: <20230615135315.3662428-7-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230615135315.3662428-1-kan.liang@linux.intel.com> References: <20230615135315.3662428-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,T_SCC_BODY_TEXT_LINE 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?1768777725828253434?= X-GMAIL-MSGID: =?utf-8?q?1768777725828253434?= From: Kan Liang There may be multiplexing triggered, e.g., e-core of ADL. Reviewed-by: Ian Rogers Signed-off-by: Kan Liang --- tools/perf/tests/shell/lib/perf_json_output_lint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py index 5e9bd68c83fe..ea55d5ea1ced 100644 --- a/tools/perf/tests/shell/lib/perf_json_output_lint.py +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py @@ -66,10 +66,10 @@ def check_json_output(expected_items): for item in json.loads(input): if expected_items != -1: count = len(item) - if count != expected_items and count >= 1 and count <= 4 and 'metric-value' in item: + if count != expected_items and count >= 1 and count <= 6 and 'metric-value' in item: # Events that generate >1 metric may have isolated metric - # values and possibly other prefixes like interval, core and - # aggregate-number. + # values and possibly other prefixes like interval, core, + # aggregate-number, or event-runtime/pcnt-running from multiplexing. pass elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item: pass