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 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 DFD00C433EF for ; Wed, 5 Jan 2022 06:19:01 +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=vAlD3k0U2crucfw050PX56qjcZDHixkor4qsATBTyHw=; b=4jPaJvZrByvq+o1kikw45D32Zr A/XlDf4uckxqd/hXQvl7WFkJ/v3WPdzk7O3hkKHwcB0Pn3XNW6apT99cEfCHXcTw49QT3pXQL7psj 5Ws45uNaPQJN041HQi7GJba3FPSvgInvNDdnbc7JwHypHkG+x9INmDX0XHpZie+PjhNsTOTGQ26ra m9zUijqsDyZZylCqkfo82CqfsTmP2YuUJSRPBiX23lXxKO6e6Yh+aFQjYCYK6o+BNVtZ9u6PsPM7E mn4g3Fe/Dewhn+c4e9Ob4cRdmX/F6F7GbbIJ9rZbCOoufa1Q5rw+FsLh5WcfQvPoitGXoKg0cjo3e 6/QDX9EQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4zc1-00DhZO-TJ; Wed, 05 Jan 2022 06:17:30 +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 1n4zYz-00Dfif-8A for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 06:14:22 +0000 Received: by mail-yb1-xb49.google.com with SMTP id e137-20020a25378f000000b0060c1f2f4939so51883547yba.3 for ; Tue, 04 Jan 2022 22:14:20 -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=Zr180MbAuyMK3FOJ6p+f1v/pd05fFRyT7sFFspoiHfQ=; b=VNo9f4KK4euu5YXn4BKU7BXdArb0b4h8wW8IVc6HqTx5HwZzfdL4N0X5sw0VC4MMvv v3btgO4OZiiH1LcdyGTdJ9ifbhjqt05X+aRCiz0Whzjj4AE/MiML5USCm2wstiDL/+FS ZNdU5zUzjkcH4f/AGwLHcbV8J7v+kyOMmIDSeKMJTlFh9ntMpFsgAuv23DZ8zYL1OKk9 TfEET6XsgVSq6xEC1PBn68PQhwWCDqUFvNm7iiSx5qx6+GwelE0klY6BqWP+RbFruYVA LBviSiVYsBea4dDS/y8npKhko1Rpo8vjhIAW8IYxSAF9HONeCxGmBdpGJFjcACPVcTs1 gBxA== 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=Zr180MbAuyMK3FOJ6p+f1v/pd05fFRyT7sFFspoiHfQ=; b=c6wLXZrZmMevqziWPHbux8qzbicK4fucpfUV93jDiKxVOjfRdGowbmSF1imCXyYmeS 7BNeQjGbmdTK6QwskLbM/Jsx4nrSlhktZnxQyi0sh2DeSoi2wvIWvTo9y3k2aJVJVzCB e2X9AeVUm4AePJVpkHuJdTxloVkkTc1B1bqqc4MVfLCnJcv8dq5v9KLlsZ8+XZRpDNlA gTktiObHozFzOKQoyXtISJOheQR++BcpV0qluEiRoUBZY9SKv8zTze+t+RiHYl2A8LKO nfSIQgN2KxDIzQzvDUQly0+T5r641poJx/tYnaJKJT68moR4WT596gdszqZLiFXAZtFy rGlQ== X-Gm-Message-State: AOAM533sdJKL352fPVLFZd8xBKLpfPalxdDTk0h/3+2a46gCPLHt5Obz FUL/q0b+W/H0jC/NjdBDGWNYNHtOkiK4 X-Google-Smtp-Source: ABdhPJxBobdXrtq0N0+VovRJPnr4rxsjyWi0x6tNIMNdX7bMcDzKwzquhVhYNQSaffe2kDLoMJrPwegRdhRF X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a25:1389:: with SMTP id 131mr48194573ybt.381.1641363259688; Tue, 04 Jan 2022 22:14:19 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:12 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-10-irogers@google.com> Mime-Version: 1.0 References: <20220105061351.120843-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v4 09/48] perf cpumap: Remove map+index get_core 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, zhengjun.xing@intel.com Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220104_221421_315042_CE33B860 X-CRM114-Status: GOOD ( 14.11 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 | 8 -------- tools/perf/util/cpumap.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index ce085b6f379b..9a671670415a 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -121,7 +121,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) // Test that core ID contains socket, die and core for (i = 0; i < map->nr; i++) { - id = cpu_map__get_core(map, i, NULL); + id = cpu_map__get_core_aggr_by_cpu(perf_cpu_map__cpu(map, i), NULL); TEST_ASSERT_VAL("Core map - Core ID doesn't match", session->header.env.cpu[map->map[i]].core_id == id.core); diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index ff91c32da688..e8149bcf8bfa 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -246,14 +246,6 @@ 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) -{ - if (idx < 0 || idx > map->nr) - return cpu_map__empty_aggr_cpu_id(); - - return cpu_map__get_core_aggr_by_cpu(map->map[idx], data); -} - struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused) { struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index 365ed69699e1..7e1829468bd6 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -36,7 +36,6 @@ int cpu_map__get_die_id(int cpu); struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, 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); int cpu_map__get_node_id(int cpu); struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data); struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data); -- 2.34.1.448.ga2b2bfdf31-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel