Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp4258569pxy; Tue, 27 Apr 2021 00:06:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8oq1hD8jHxm9kLnya5tiX3b7frH9PbM2vmFqpGILdI2w5nKr7n4Ij4YrMPd+87Q+QHBzl X-Received: by 2002:a17:906:9385:: with SMTP id l5mr22091865ejx.32.1619507185042; Tue, 27 Apr 2021 00:06:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619507185; cv=none; d=google.com; s=arc-20160816; b=adxXphODkBbZix8T0lk/BIWgV/+Kn0SLkiWF3Fd2SJZTQiFxxQV08Vv76edeALb8q4 ohbYI40AqSzmF56cTx/LRI+HgqJofUnAuQRqqGDFWKlBvrykOBfHTLdZawzR/Oswib59 d/+ToGWUfHKzPAOF2tIwgXYwXt3ffnGmj8wFfoRs+NlLhMVrUjAHtH8tzakEENi1k6rC Za7CxKM/ZoaS2P/JdaRFm+LhfCG1MFLVkHUgc3YSHztNYp79ydup/03pPvEVNidA7WvZ dHBZlJbBgRFrX6n9jXzLosfffKI9YX/LCja6FPeQI6AbT7vK+3paoKz/6prmDqszvddE rdUg== 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=j91bxu4ci/oxCrE/MKuCHpQK/BdlOoWvL7mCCSrsDD0=; b=uc+nEgdlRcFRiKuB8DSiMWbSpYJjNjpdbFJdUs3IMOtyX9clAhSsLaFCEtE42YARY4 jVQSDzBiM2gLrN8iRHee7/lML9+g5KTMhu4yVO2DkRZKzAp/BeGIae3x6lRfaNO55t5m 7ZPOPqb5xy7T/BvDxBX2z4WJJ++dpkO5A/7ctsVYJ/BF+PRrJGI0CnHPqrcja6uHJW2Y Eb1wjcfwS7sm+dHE3/uvt/3jVxWHnZErY4iz0Kbk+1Ve86aXWMhlMT20Ld/qiaeALEQU CXF/dcdTKJ5SZ3FDDlOAOJEyhO/eZ4PT3XEZvoC0Dz5qv/Cug9WdLh+oKWHgmftWuQK7 hgxQ== 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 ba26si1723948edb.105.2021.04.27.00.06.02; Tue, 27 Apr 2021 00:06:25 -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 S237107AbhD0HFI (ORCPT + 99 others); Tue, 27 Apr 2021 03:05:08 -0400 Received: from mga09.intel.com ([134.134.136.24]:54937 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237188AbhD0HEx (ORCPT ); Tue, 27 Apr 2021 03:04:53 -0400 IronPort-SDR: 66eA6xzqxs350hf5mta4Zn+y27XE5TZJSL+hUAqiHcbWUuJMp5uzV0ha538xWX32srXV5fl1v6 vCAxpbZJxL9A== X-IronPort-AV: E=McAfee;i="6200,9189,9966"; a="196573075" X-IronPort-AV: E=Sophos;i="5.82,254,1613462400"; d="scan'208";a="196573075" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2021 00:04:10 -0700 IronPort-SDR: Ahtv7fVmqJ6YAtAU2xW8T+/8l6hc8bR7uZMwjIP4CzISGK9+aWuMI35NyilXhi5mRuYwgDmQUh B6e9hP15E8eA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,254,1613462400"; d="scan'208";a="447507028" Received: from kbl-ppc.sh.intel.com ([10.239.159.163]) by fmsmga004.fm.intel.com with ESMTP; 27 Apr 2021 00:04:08 -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 v6 23/26] perf tests: Support 'Session topology' test for hybrid Date: Tue, 27 Apr 2021 15:01:36 +0800 Message-Id: <20210427070139.25256-24-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210427070139.25256-1-yao.jin@linux.intel.com> References: <20210427070139.25256-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 --- v6: - No change. v5: - Add "TEST_ASSERT_VAL session->evlist". tools/perf/tests/topology.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index 050489807a47..ec4e3b21b831 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,8 +41,16 @@ 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(); - TEST_ASSERT_VAL("can't get evlist", session->evlist); + if (!perf_pmu__has_hybrid()) { + session->evlist = evlist__new_default(); + TEST_ASSERT_VAL("can't get evlist", session->evlist); + } else { + struct parse_events_error err; + + session->evlist = evlist__new(); + TEST_ASSERT_VAL("can't get evlist", session->evlist); + parse_events(session->evlist, "cpu_core/cycles/", &err); + } perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY); perf_header__set_feat(&session->header, HEADER_NRCPUS); -- 2.17.1