From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 8FE9E390229 for ; Sat, 25 Apr 2026 22:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777157420; cv=none; b=k5urcGw0zyypfB9+05jxc2uaVTT2XuNfwcb5PDiT4jHkmtO0FWy7A2InEqV0fDfQ8WIpNyaIczfmPf331MW+hdHOQuVw0JmEN/HXnirGx4MuElnM2mwr3o1fHnSZQoQJNbWWTHSDGmmd11w64aEQRw81hQTbY84cRZl2utyEueI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777157420; c=relaxed/simple; bh=QHTZx5MPgaaZQHiX00rro2INAj+zmier+jw6hcgWdKU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ofs8ArHM8J+HvmRZf8OsilrrFUSwaeuy8GZzShHdhCv4ciNTnE2yU/QuDxIrFfQ6j00t2AffCF6XfFYuhg+9GVm4cLQpgKGFGDakkvLDdwjQ2eKMeLoQvWrMRI7W1XT1e8bY/y7ws9iFL3tkkHWy5d5hdIqR2ZzmaZxfF4ISRuA= 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=h2dM6I92; arc=none smtp.client-ip=74.125.82.201 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="h2dM6I92" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2eaed3d96d7so860318eec.0 for ; Sat, 25 Apr 2026 15:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777157418; x=1777762218; 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=h2dM6I92bck/DW8hyRZ8Ffq2YnOk6+1aHodFFKa+5y0ryc4eAMuFF+GMX0Lgqw95qu dgWlLkyf0NQK8jRuSX5SZTB65MK8D2U+G84F5iQdftZopP6lUAXCs6/ihpKyAfVYG7in MvA5JHA4aKYy7zd2aSAGxOlUxF+aC9R56m/Y86AkYfXTOpfC6Ba7XiASxcLl/z+je+F9 yjiEqF21tnxvkr61Dxqj1J6VHZOxmdoUg7936xTKZFtua7hPGsAufOrePxYp26Rxg7cP bQbYgtQVFOJpq8DyW6jF8cws+Ycju+dg/krbOIFgcKbi8O95hEFK6ZBIbspjN/Tylx45 nj4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777157418; x=1777762218; 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=qeuuYNPU38EwkGNf4sOk1x3QVpO6rd8hFPssP9TpyIsnv+NuFPSsNnEw13teFcfUWb KgL6qXTfeKbTuKAvnMmGMdUblUOHGJgAX3CYfEgEMfOC9ilV9D7Q68qcdSZCPstKhAx2 twFqZPgOE8Z8zWS9196Hv9RK9qyAxPePuf2HjBh7cpWG21XTB6zGMViTjN2HHBhFy/em +tLVntkbgLqqfPS4ES/LLsQKct1yw2HezY7ZNATyteZdxFDsWArV6xMc+YF6knZQ/jM3 WGH8cR8joccfT+bnij/lnpzTRz47h6b2gvQFb+FnB7acAOuRYCsY053G92gLB1HzcQ/u FgPg== X-Forwarded-Encrypted: i=1; AFNElJ9YRgSpbO/T3K2SxHAZt/+0EpiN+TtfzK1nwMlBkNyMCpzz7LCQ7ImHCSlED5YDCD6qAqQd1tXJcQHvMGRFLx3t@vger.kernel.org X-Gm-Message-State: AOJu0Yy76K0C9TvMuffmaRFOujtbtActo+Io27yVyH7QS115NOr3ROpf B+4zWX9LxSwSjx3esEGbM7EtglNe/yREklcgpQ5QM/OThWAk7f3qTfrC4UUkMoOrHlv1NtEOhho bTRuyBbup+w== X-Received: from dybzy3.prod.google.com ([2002:a05:7301:e103:b0:2df:af:8fde]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:fd09:b0:2da:d4b4:c85a with SMTP id 5a478bee46e88-2e464dad10cmr17831870eec.11.1777157417586; Sat, 25 Apr 2026 15:50:17 -0700 (PDT) Date: Sat, 25 Apr 2026 15:48:57 -0700 In-Reply-To: <20260425224951.174663-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> <20260425224951.174663-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260425224951.174663-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