Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3381143pxf; Mon, 29 Mar 2021 00:07:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+OWXPv83LPLt9x334NmX7jERmbmrNGthavnvC4U+oYXPgbkgnsiDIq7KmUVL/Ktb8mQ5W X-Received: by 2002:a05:6402:2d0:: with SMTP id b16mr27697843edx.194.1617001636009; Mon, 29 Mar 2021 00:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617001636; cv=none; d=google.com; s=arc-20160816; b=mgzaKG5kKDP2uUs27weZxnJS6adA3iPkBqtBuzeKPPExcO3Sz7PAuwFAbjP2TfeiPS MMaKAiHJcSHONy/XiC8f270gLkSwwHKj4BNR77WGLmpLhQ2QUnIj6Z3y0ZVvKznrBNW+ sX8qsIF51TCFNqPs0RIEKL8yrXuBETo/BvGi1hQV8ZX7anHalL/LCeCMMiB65JdJGPmg Ieg7HuG153v538QLTDsuLUS/5sAWguNE5PhftGildZS5DwOCCRJOaUoGuZQ/ILY82mZT DInokeBx2AS0N/9Q9Uj2972rtAXNq+gUAT1ZdY+F6P+AUNpT/h5Y6GgqJL8oLbG8Kg9R Nx8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=DyAFk3ZLfGx2GXBa1tN98yG7K7wKjmYKkbThYgD828c=; b=Hne7bMwQ0B7QubTQk9oWEwrfz7dDNUzfrzUvUFYyJyWaND6VdCXGo+eKEdfJ6jC7PT U+2k/vq+vPszo7f3S9CQsxdhpvErmweHmFA9o3Rq6Wb5zx9UwLDIBImPcpKttmU7Bg0y nBMYgCmz7YcnZiLORY2kkrIAR0iPbRhLfjBk9Ju6/PEg5h+rw+Ibz4blGcmVrhKVp6Zg nf5Z11LvbsCJIdvZ4ux/Z5gvP5KHRLPkeQYtt9965jxr/DINErnC/24uSiFRWNNP3y9p m6vO0623FWXq4+9KcmIOWbclxnnHgp5ipAXCvJc1wSCyiw4LD8yS9daigh884OShm3a2 DpoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dg2si12071711edb.136.2021.03.29.00.06.54; Mon, 29 Mar 2021 00:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231579AbhC2HDh (ORCPT + 99 others); Mon, 29 Mar 2021 03:03:37 -0400 Received: from mga14.intel.com ([192.55.52.115]:20002 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231382AbhC2HCq (ORCPT ); Mon, 29 Mar 2021 03:02:46 -0400 IronPort-SDR: ExefGAyQnw/PJCa6ASB8M1bQ4fsMQCNb2poCXr3/0Ul9b6TODWHk13ai392X9PzmgovM3BBx5d JC5uDEDC4gxw== X-IronPort-AV: E=McAfee;i="6000,8403,9937"; a="190956324" X-IronPort-AV: E=Sophos;i="5.81,287,1610438400"; d="scan'208";a="190956324" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2021 00:02:46 -0700 IronPort-SDR: trnCpWIHh7jU2I5vjunfrRm3NrzdCUQPjBZpAsF+GfT8brtqWoZv6jPeJZojc8NuNdCUPukKuz 9jAtRmrmy1Aw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,287,1610438400"; d="scan'208";a="444677656" Received: from kbl-ppc.sh.intel.com ([10.239.159.163]) by FMSMGA003.fm.intel.com with ESMTP; 29 Mar 2021 00:02:44 -0700 From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com, Jin Yao Subject: [PATCH v3 24/27] perf tests: Support 'Session topology' test for hybrid Date: Mon, 29 Mar 2021 15:00:43 +0800 Message-Id: <20210329070046.8815-25-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210329070046.8815-1-yao.jin@linux.intel.com> References: <20210329070046.8815-1-yao.jin@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Force to create one event "cpu_core/cycles/" by default, otherwise in evlist__valid_sample_type, the checking of 'if (evlist->core.nr_entries == 1)' would be failed. # ./perf test 41 41: Session topology : Ok Signed-off-by: Jin Yao --- v3: - No functional change. tools/perf/tests/topology.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index 050489807a47..30b4acb08d35 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -8,6 +8,7 @@ #include "session.h" #include "evlist.h" #include "debug.h" +#include "pmu.h" #include #define TEMPL "/tmp/perf-test-XXXXXX" @@ -40,7 +41,14 @@ static int session_write_header(char *path) session = perf_session__new(&data, false, NULL); TEST_ASSERT_VAL("can't get session", !IS_ERR(session)); - session->evlist = evlist__new_default(); + if (!perf_pmu__has_hybrid()) { + session->evlist = evlist__new_default(); + } else { + struct parse_events_error err; + + session->evlist = evlist__new(); + parse_events(session->evlist, "cpu_core/cycles/", &err); + } TEST_ASSERT_VAL("can't get evlist", session->evlist); perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY); -- 2.17.1