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 4228DFED3F0 for ; Fri, 24 Apr 2026 16:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PdL5J++jQFS0WI1Hq1Y43G2dZXRWh1hnOIKdQUKwLiY=; b=RHyomwRNEvd2cbxMWayybjA/5q uYYgnzbvF5Juiall7Ishzf33qI3EIyLG//oNvsrPFmAnIni1DlgesPLJRWUZvx7W0mVwhE2Zk24ls VVy1hYcKhpFzRLfWNjN4IusKybsmQehMjgBKbUhSfPD1aZp4B6VFaDVqypL5nPdkWc7lfvXizb6A4 PUde1cQkQuNsAE7k4psrLulMwOfi7APVqbjauxqP/9DGEmmYLxQzmLPu964vNtiCz+bj+gTnsQw0D CiIUdpEkaNYuYU3prUUnvMvMDzX+dvxZ2Y+r7+zzohK9KGAHTXlT8q1cM+CIGPcsyNAjqtiNSEwj1 MCaJzJwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wGJhA-0000000DTLe-0MZO; Fri, 24 Apr 2026 16:48:00 +0000 Received: from mail-dy1-x134a.google.com ([2607:f8b0:4864:20::134a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wGJh6-0000000DTJ7-3lYM for linux-arm-kernel@lists.infradead.org; Fri, 24 Apr 2026 16:47:58 +0000 Received: by mail-dy1-x134a.google.com with SMTP id 5a478bee46e88-2de07c12745so19743371eec.1 for ; Fri, 24 Apr 2026 09:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777049276; x=1777654076; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PdL5J++jQFS0WI1Hq1Y43G2dZXRWh1hnOIKdQUKwLiY=; b=AnyRp5Hgeez4pvu+enlWI45Oj0XLwzrQah1fSXblzTwP48rGlcnMAlsRo7bFHlzANU 2suP5K/B8/6mMH/CmgKaa2WW4fcQie5Zen/yGMQ7dmPo1NkWRTnRFTL3Mnxw419aBpt5 OsngcKs5CrfeeYdDkv9Vw51QUBrGLUUAHNiVoAV7FiC6brw0X7zB+Poq/nhn541+cHig Dxi5AiXDz5LSeDGQa+bIwIaLlH9ownlqU7WroI/8JxFIZOFuXEC46YrWO8/6qlpKKSPN Yq2z2IRaKYdHTHtDSAFgdrjlzzQX337H8N+3lZFp3DlqNF22iLrwAIA5YG1qPNMD0RuD nWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777049276; x=1777654076; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PdL5J++jQFS0WI1Hq1Y43G2dZXRWh1hnOIKdQUKwLiY=; b=jw+Hqf2lhTstZqUyLmujJcRJvrS1Afzp3YUmM5+JJPYxmfUE26hMvqo/Iq+quT0hrw sx6PQ+TSG+E/k+37YfZqvJuZi/R5xdKwBSbTdD2BkUPbEOPGoPyKW57Wx5crMZvdwCnT bwUNsl+DxTgk8mXeVuRpIewF6vMQYpLFBFyzWC4bcVS1TusXbMaq85QD+vItX/KuYibC /TBxw7afsEbVOoCkfGiDE8LJhpqohCWS8GJqt1MRFQarSLOnCykTqGhX8PHpZiX93axR mtFy13PG2qdBdfpPLTJ8iH2m8O25VJPjGjObAEjCGoVzyWs6uBUEBHfj1hApJs3z05wX Bb9Q== X-Forwarded-Encrypted: i=1; AFNElJ8amyusL36dSv6SM8ewG1WNwdNJ4jSftyIyAnNMiqvA3d/vhrtBrTM8giEaOFHpO1Ohh2kgLxSZ8ZIHunnlIqsW@lists.infradead.org X-Gm-Message-State: AOJu0YyXkDwEdEOv2HF47dXrjpjp/uChfIeUcyLDf5+Ixw+PPhxu1Bim JiHRhsfIdHJKTRPValJsUNxaDdI9+8phMHKNEyahw3TQsQUWaZZcP+5MVDT1QuhcmrLoc9hPlbG CCgJ0pKqNjQ== X-Received: from dybmf46.prod.google.com ([2002:a05:7301:92e:b0:2d9:3c6b:a26b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:6c27:b0:2da:1a81:5ae with SMTP id 5a478bee46e88-2e475b3994cmr19522429eec.10.1777049275591; Fri, 24 Apr 2026 09:47:55 -0700 (PDT) Date: Fri, 24 Apr 2026 09:46:27 -0700 In-Reply-To: <20260424164721.2229025-1-irogers@google.com> Mime-Version: 1.0 References: <20260423163406.1779809-1-irogers@google.com> <20260424164721.2229025-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260424164721.2229025-6-irogers@google.com> Subject: [PATCH v5 05/58] perf script: Sort includes and add missed explicit dependencies From: Ian Rogers To: acme@kernel.org, adrian.hunter@intel.com, james.clark@linaro.org, leo.yan@linux.dev, namhyung@kernel.org, tmricht@linux.ibm.com Cc: alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260424_094756_963557_CE3B1BCB X-CRM114-Status: GOOD ( 10.49 ) 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 Fix missing #include of pmu.h found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code. Doing this exposed a missing forward declaration of addr_location in print_insn.h, add this and sort the forward declarations. Signed-off-by: Ian Rogers --- tools/perf/builtin-script.c | 111 ++++++++++++++++++----------------- tools/perf/util/print_insn.h | 5 +- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index c8ac9f01a36b..853b141a0d50 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1,74 +1,77 @@ // SPDX-License-Identifier: GPL-2.0 -#include "builtin.h" +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "asm/bug.h" +#include "builtin.h" +#include "perf.h" +#include "print_binary.h" +#include "print_insn.h" +#include "ui/ui.h" +#include "util/annotate.h" +#include "util/auxtrace.h" +#include "util/cgroup.h" +#include "util/color.h" #include "util/counts.h" +#include "util/cpumap.h" +#include "util/data.h" #include "util/debug.h" +#include "util/dlfilter.h" #include "util/dso.h" -#include -#include "util/header.h" -#include -#include "util/perf_regs.h" -#include "util/session.h" -#include "util/tool.h" -#include "util/map.h" -#include "util/srcline.h" -#include "util/symbol.h" -#include "util/thread.h" -#include "util/trace-event.h" +#include "util/dump-insn.h" #include "util/env.h" +#include "util/event.h" #include "util/evlist.h" #include "util/evsel.h" #include "util/evsel_fprintf.h" #include "util/evswitch.h" +#include "util/header.h" +#include "util/map.h" +#include "util/mem-events.h" +#include "util/mem-info.h" +#include "util/metricgroup.h" +#include "util/path.h" +#include "util/perf_regs.h" +#include "util/pmu.h" +#include "util/record.h" +#include "util/session.h" #include "util/sort.h" -#include "util/data.h" -#include "util/auxtrace.h" -#include "util/cpumap.h" -#include "util/thread_map.h" +#include "util/srcline.h" #include "util/stat.h" -#include "util/color.h" #include "util/string2.h" +#include "util/symbol.h" #include "util/thread-stack.h" +#include "util/thread.h" +#include "util/thread_map.h" #include "util/time-utils.h" -#include "util/path.h" -#include "util/event.h" -#include "util/mem-info.h" -#include "util/metricgroup.h" -#include "ui/ui.h" -#include "print_binary.h" -#include "print_insn.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include "asm/bug.h" -#include "util/mem-events.h" -#include "util/dump-insn.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "util/dlfilter.h" -#include "util/record.h" +#include "util/tool.h" +#include "util/trace-event.h" #include "util/util.h" -#include "util/cgroup.h" -#include "util/annotate.h" -#include "perf.h" -#include #ifdef HAVE_LIBTRACEEVENT #include #endif diff --git a/tools/perf/util/print_insn.h b/tools/perf/util/print_insn.h index 07d11af3fc1c..a54f7e858e49 100644 --- a/tools/perf/util/print_insn.h +++ b/tools/perf/util/print_insn.h @@ -5,10 +5,11 @@ #include #include -struct perf_sample; -struct thread; +struct addr_location; struct machine; struct perf_insn; +struct perf_sample; +struct thread; #define PRINT_INSN_IMM_HEX (1<<0) -- 2.54.0.545.g6539524ca2-goog