From patchwork Thu Dec 23 07:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12697985 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 94ECFC433EF for ; Thu, 23 Dec 2021 07:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=AldTVxa8zkJbmSPoLQYJrKVn0Mcwq8+Tfa/AiUCwD+0=; b=R9UlfKK0INTIUa9eQSb4/cKkQ8 VAGY9BxCAQ3+g+EtKSwLQaYw1X+xpXxRvTItRY/wn2XjwFaZNMzwko6n6ZJiR6ukEhCmuuSsbOFUU Mjl4432jKkLeBbE2UnCORkNS+1aJ9/uO31PFm0QMpV/fThKyH9HcVB/4e8pdV21Je0aMQPvex+VAw 4wAJ2O+V2Kj2ecB+eAcmCuqSX2hTaqXnaHIU6LrxEdEMeSu2VAoY/XjPneCYVINTGoy81xNVDJ/Xz 7O6x/Vs9eSi63HfwLOG/sm4gJGL764O7tvbuYuxFoqHpwIps7xXwJ4eQScVAyfwtL8m1XRJj+ph/B j7Ei47pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0IrD-00C19V-Vg; Thu, 23 Dec 2021 07:49:48 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0Io1-00BzUP-Gw for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 07:46:30 +0000 Received: by mail-yb1-xb49.google.com with SMTP id g36-20020a25ae64000000b005c1f46f7ee6so8748427ybe.8 for ; Wed, 22 Dec 2021 23:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=XMhxFWBeVRuEETnE+BwPikcCWy5mLHkNqyV9tFQoVss=; b=I57ah+5DPDWKDOY7/eycjwMW6xNYhZ1jfVuGS5ncB/vx1ZlIhbOrR6FKrSwZbpthZA M/uTasVvE1VQ4VE9MNUUvSHO4jkNkXbmVru1Sh4UWOOvtkZtkufI4/tvyaLb2lK/mUeg 2mAhf0L3+g41Szw2v4rir6kWaq43e2nyBMf+/58Ryq2dCkbXXXSoXY68gOw1MGkjyTFR rBPMAerBqWq3oycoeTioSQBDHmhV1mgkwE6DFKKkOZen+xYLPgGGS3y4jdfSgADc8Dgx kFSwUO4tcWu2NCVc2iZ10Vpxa/d3/p0MzP+QvgLhLuj/qA3uqpwfacpViSJnNQ3dnpKq eYDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XMhxFWBeVRuEETnE+BwPikcCWy5mLHkNqyV9tFQoVss=; b=xzofxtwvK2cdv9Eni/JsYX3OPio4+qPE9HrYY8TU1YdqbE1aNszD11TzaDJjsaLNOT tMVsr0R2JhoeF0hy1nMrL6exH2QaK2lV86dlTurNqEksxXu9iwhznGq7Yvh43Of5qyHM H3TmOftQ50PBHyjoY9Cl2v2wr5d/2Nv3yLzW6WzWslKDNqNqfPirOIsnAkoSrfOBKvD4 HQJKpw0PAKg4rP0EUk+m4m20W+Vot46a9Tm+vl9aqzUgkMgGSwJ27simp8ItRD4CLjYl Tf4xPHFD89lKWzauzz9Rimma9QFih1+lJwvfpHQOwyrgkRunQ46rPCqIEs2DUwdyRL7A ErlA== X-Gm-Message-State: AOAM5325XMBjwzFRx/jhY6bUZ/CdGzu47Rliez3Y/NBNVliZgAMIZv9N L7nVxUQ3lFwrpR9pjXMOhHUQUIxCeAOW X-Google-Smtp-Source: ABdhPJyGDKLEdbH97OTrkXsESmtagS+ejAQGDy2zvluksa3GsQzoOmQS9wGFqpCbULRTZC+qoTrzr/mJEm84 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:4fef:90ff:589d:24ca]) (user=irogers job=sendgmr) by 2002:a25:1fc1:: with SMTP id f184mr1663842ybf.687.1640245587870; Wed, 22 Dec 2021 23:46:27 -0800 (PST) Date: Wed, 22 Dec 2021 23:45:01 -0800 In-Reply-To: <20211223074541.3318938-1-irogers@google.com> Message-Id: <20211223074541.3318938-9-irogers@google.com> Mime-Version: 1.0 References: <20211223074541.3318938-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.307.g9b7440fafd-goog Subject: [PATCH v2 08/48] perf cpumap: Remove map+index get_die From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211222_234629_597006_D48D5097 X-CRM114-Status: GOOD ( 15.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Migrate final users to appropriate cpu variant. Reviewed-by: James Clark Signed-off-by: Ian Rogers --- tools/perf/tests/topology.c | 2 +- tools/perf/util/cpumap.c | 9 --------- tools/perf/util/cpumap.h | 1 - tools/perf/util/stat.c | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index 69a64074b897..ce085b6f379b 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -136,7 +136,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) // Test that die ID contains socket and die for (i = 0; i < map->nr; i++) { - id = cpu_map__get_die(map, i, NULL); + id = cpu_map__get_die_aggr_by_cpu(perf_cpu_map__cpu(map, i), NULL); TEST_ASSERT_VAL("Die map - Socket ID doesn't match", session->header.env.cpu[map->map[i]].socket_id == id.socket); diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index 342a5eaee9d3..ff91c32da688 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -216,15 +216,6 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) return id; } -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, - void *data) -{ - if (idx < 0 || idx > map->nr) - return cpu_map__empty_aggr_cpu_id(); - - return cpu_map__get_die_aggr_by_cpu(map->map[idx], data); -} - int cpu_map__get_core_id(int cpu) { int value, ret = cpu__get_topology_int(cpu, "core_id", &value); diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index a53af24301d2..365ed69699e1 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -34,7 +34,6 @@ int cpu_map__get_socket_id(int cpu); struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data); int cpu_map__get_die_id(int cpu); struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data); -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data); int cpu_map__get_core_id(int cpu); struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data); struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data); diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 9eca1111fa52..5ed99bcfe91e 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -336,7 +336,7 @@ static int check_per_pkg(struct evsel *counter, * On multi-die system, die_id > 0. On no-die system, die_id = 0. * We use hashmap(socket, die) to check the used socket+die pair. */ - d = cpu_map__get_die(cpus, cpu, NULL).die; + d = cpu_map__get_die_id(cpu); if (d < 0) return -1;