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 X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9526C63699 for ; Sun, 15 Nov 2020 21:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 594182244C for ; Sun, 15 Nov 2020 21:17:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Nx1Wvz0n" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727957AbgKOVR2 (ORCPT ); Sun, 15 Nov 2020 16:17:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52124 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727969AbgKOVRZ (ORCPT ); Sun, 15 Nov 2020 16:17:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605475044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GjjXvcnfdqyDsGA40s5TOY3s1flYptQXXZm0oMtNmng=; b=Nx1Wvz0nbRj1zxvdTg0qLgcOwUwykZeGuBiQNixExHY/GtDGD/fQVpGQO5ljXroog1Mg+k 8hhtD2uuJTjwRX+YzRVWGfppHDeiDB1PgGZMAqi07bDsGhTwNsVhAh2s827RXwakSlq7Bd 73lz7Jq3DdCcgUyfOVTxuYuovnki48M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-252-sONxaeU2MNm_s4vfIRJtwQ-1; Sun, 15 Nov 2020 16:17:20 -0500 X-MC-Unique: sONxaeU2MNm_s4vfIRJtwQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6AA81084D60; Sun, 15 Nov 2020 21:17:18 +0000 (UTC) Received: from krava (unknown [10.40.192.76]) by smtp.corp.redhat.com (Postfix) with SMTP id B257B60BFA; Sun, 15 Nov 2020 21:17:15 +0000 (UTC) Date: Sun, 15 Nov 2020 22:17:14 +0100 From: Jiri Olsa To: James Clark Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Namhyung Kim , Thomas Richter , John Garry Subject: Re: [PATCH 13/13 v4] perf tools: add thread field Message-ID: <20201115211714.GA1081385@krava> References: <20201113172654.989-1-james.clark@arm.com> <20201113172654.989-14-james.clark@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201113172654.989-14-james.clark@arm.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On Fri, Nov 13, 2020 at 07:26:54PM +0200, James Clark wrote: > A separate field isn't strictly required. The core > field could be re-used for thread IDs as a single > field was used previously. > > But separating them will avoid confusion and catch > potential errors where core IDs are read as thread > IDs and vice versa. > > Also remove the placeholder id field which is now > no longer used. > > Signed-off-by: James Clark > Cc: Peter Zijlstra > Cc: Ingo Molnar > Cc: Arnaldo Carvalho de Melo > Cc: Mark Rutland > Cc: Alexander Shishkin > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Thomas Richter > Cc: John Garry > --- > tools/perf/tests/topology.c | 8 ++++---- > tools/perf/util/cpumap.c | 14 +++++++------- > tools/perf/util/cpumap.h | 2 +- > tools/perf/util/stat-display.c | 8 ++++---- > 4 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c > index 694f786a77f3..2276db0b1b6f 100644 > --- a/tools/perf/tests/topology.c > +++ b/tools/perf/tests/topology.c > @@ -119,7 +119,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) > TEST_ASSERT_VAL("Core map - Die ID doesn't match", > session->header.env.cpu[map->map[i]].die_id == id.die); > TEST_ASSERT_VAL("Core map - Node ID is set", id.node == -1); > - TEST_ASSERT_VAL("Core map - ID is set", id.id == -1); > + TEST_ASSERT_VAL("Core map - Thread is set", id.thread == -1); > } > > // Test that die ID contains socket and die > @@ -131,7 +131,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) > TEST_ASSERT_VAL("Die map - Die ID doesn't match", > session->header.env.cpu[map->map[i]].die_id == id.die); > TEST_ASSERT_VAL("Die map - Node ID is set", id.node == -1); > - TEST_ASSERT_VAL("Die map - ID is set", id.id == -1); > + TEST_ASSERT_VAL("Die map - Thread is set", id.thread == -1); > } > > // Test that socket ID contains only socket > @@ -141,7 +141,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) > session->header.env.cpu[map->map[i]].socket_id == id.socket); > TEST_ASSERT_VAL("Socket map - Node ID is set", id.node == -1); > TEST_ASSERT_VAL("Socket map - Die ID is set", id.die == -1); > - TEST_ASSERT_VAL("Socket map - ID is set", id.id == -1); > + TEST_ASSERT_VAL("Socket map - Thread is set", id.thread == -1); > } > > // Test that node ID contains only node > @@ -149,7 +149,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) > id = cpu_map__get_node(map, i, NULL); > TEST_ASSERT_VAL("Node map - Node ID doesn't match", > cpu__get_node(map->map[i]) == id.node); > - TEST_ASSERT_VAL("Node map - ID shouldn't be set", id.id == -1); > + TEST_ASSERT_VAL("Node map - Thread shouldn't be set", id.thread == -1); > TEST_ASSERT_VAL("Node map - Die ID is set", id.die == -1); > } should we test all unset parts are -1, like here id.core, id.socket and there are missing tests also in above code jirka