From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D15AC38C402 for ; Sat, 25 Apr 2026 22:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777156903; cv=none; b=tqQurv2rWikbX0BnLDHM7a6n/UqBake/ed1dE+QYD7Zr0mf6oIQ3/2MzbMKrraTk34UGahCa3Y2CmILlH6taIwHNDyz8gHzzpv9WsswcfpO4cfBo9AP/eGHhgUinKJRH9xZosP2J1eI7+eCvxu8N6LNhwFZCU6da3curm2jDPuY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777156903; c=relaxed/simple; bh=QHTZx5MPgaaZQHiX00rro2INAj+zmier+jw6hcgWdKU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AF5LHlATO/ytq/+uzOXG3trGdZICqFLNzVFW5nuK9CR24RYIxA8bBp8L+ON8vk3EJ+YFFSLM4JECZOtUZuYhyyw5WxHnbuUuCr5jGDmR2dh2Hk85u2blouungPqqh8+pfTs9GXizpOqdH+LUVRNG3V4J2BoCpiyqf1xT4X6uBQk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jUf8PXZ3; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jUf8PXZ3" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2d8a677cdfaso9574272eec.1 for ; Sat, 25 Apr 2026 15:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777156901; x=1777761701; darn=vger.kernel.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=jUf8PXZ3YVUeO1NG2KhnEnUSwQPgOeck/NtmudTyzd2Uerm72lDKnO55AvDBstSjJw Ya3og1Lbmuw0lIBEXxhZ2umIMlNlGi/Dd8Idnt4t2F/TVCEFnRNdnqFel0fFlTyaR+Na zU+ha73e7UHc/Jp1qpYgrp3C1b4dFv549HT/B+AqQ7u8paKWsqywmXb9t5snNjBdzLUX BYjY6MFKXMdvO6EABH/n0WhLgc0OxOSJePrzJQSWnNHpHYfZHEgaGWq5heh5VqgkFI2h ZzrZskVEWGhI53HDFuR+eV4bKUR9Wx9M5YMzo/7zRn08R7RssgRtGNTJLqOg0QRx/wYm 6iCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777156901; x=1777761701; 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=fZKktMwLL+xYEzI8UmMlzKIKtV78rGkiJ8v4rA9gFgD35ER9eFzFUmGyUSzfO6afGs JZElQA7iiixXpFXE2iLSDEbawptGZJwg6xtjv9Aqnycsy605EgiMh7rx4/m00iJo9yFV hRFy9MSAKQn2BlfkwffAzMe4t7X8H4cMWzGAkj9uhOaDHmAv5NrSzHCmUehjScnwMLwW Jw5VZV0u5s2r+gMraJ1Kfw2y1Cew9sJVxlxtnogCP1K357GK61jOaiNnGnuPkiUiC/US XS7AfwO5QcRTUC6QHy2d6E9+EBvLePCAsSLbzA2gup0FtB8t2D6Ky60Za+NCJLTuFm8L JYvA== X-Forwarded-Encrypted: i=1; AFNElJ+d/L9tKZUyn2ssqn0VR0JUSsu1vn4fMh5IKAkCAio1dAcIGZgZvFZKunbS2Sn4LleBybzhtYYy+nU4XWnNGm7g@vger.kernel.org X-Gm-Message-State: AOJu0YxY18RIwIkWaPXRNjyg/3R2ipfw8nHh4ZyLW/OQmXT6gO9kNT1I QNE00Ghj7kSkvmq2NXRwv2EYl0LyMWpg+5tKRq1QVBAkWqTfVh0UIl8hMseUQlbzEhC2+E+Phlz UEh0HMS+bQQ== X-Received: from dycns6.prod.google.com ([2002:a05:7300:f786:b0:2df:c53c:24a5]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:748f:b0:2e0:909a:b9c with SMTP id 5a478bee46e88-2e478839eaamr19408597eec.15.1777156900661; Sat, 25 Apr 2026 15:41:40 -0700 (PDT) Date: Sat, 25 Apr 2026 15:40:30 -0700 In-Reply-To: <20260425224125.160890-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260425174858.3922152-1-irogers@google.com> <20260425224125.160890-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260425224125.160890-6-irogers@google.com> Subject: [PATCH v7 05/59] 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" 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