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 0E300383C9D for ; Thu, 23 Apr 2026 16:34:27 +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=1776962069; cv=none; b=FC6BgCt25u3ldLT8HmNpKSvuIY6VpbAuiyyUI/xgJU8HLCa4e27wTYGzSYJC++9Ku2h8C8Qu1zA70grmsu2hEH7ioebX/2KZKCTITMKGOBra+IKE8zY9qZYgTTuKGBneZVucyNJfD/Crmc2BdmSvhi9lq8pvPDFe91qd85jx9x8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776962069; c=relaxed/simple; bh=hrAjNolC0iaq3aSVv4WnJjdjsDXqgYkOVIUqOStvgy0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UOAlEAEYDThEqN/cM8qUlneccvlgs/udTE3Vo6UHnBOWJzP2MlsC8PlvMhpf43eaPUyOZhUadcPBiYeky+E1aYhn+ud7sAkkVkryAK/Ru4PpwRHgCCgOZxHKB0gL7qYqUeLOcWWWt2+RUjIKexL9BUfUq2SDKP5LKiV/X6HfGrI= 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=etOcQS9c; 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="etOcQS9c" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c0ba59a830so10754119eec.0 for ; Thu, 23 Apr 2026 09:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776962067; x=1777566867; 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=5m9P0eQK13hDDll4bE92a18P2ZsPdXyB9r7+GyZ44Nk=; b=etOcQS9cBE08sbpGvH28HqjU5bLtgwjshGumVMhCn/7//5qc+gF9qwkRnj/rnhG+/A GNJsueG6CRmjrKdoSRe0GzuzygVf8/1qGYCM9YKpbjhOzePPSAqg48IDhQYio1ZeFUIX Fcq6dIGjnpTFW5kVPTvzoLupP9QPMs2wyhzXCyAP95hmWlHXX/vel00CT+seR2XSo8qw cAXe9XqED3kBLNZjBb24gBm6LmnyYFIKeiK7ava9xRNkG1+XFX5Zq1hLUyS9AXlt4c7T Zd+nrtHz64PH0xc5SFCXlWLnHRevYUOAg/SJ2Gm9AorI5j6nOvvw8qM8ekmxMP9b5mlP o3cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776962067; x=1777566867; 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=5m9P0eQK13hDDll4bE92a18P2ZsPdXyB9r7+GyZ44Nk=; b=JyQW2VORuqLof2ZAgwtGPNLnBstgA+E1v+YI5+pEYnKqW6vh2U3AL0hVUjg4Ignye8 W9hqfJ6wDND/179bS6ouhzQJ7RQ21Fai1SOlIsCOJp9xKg4vESkF9x2I+Q4dhG+gsDPy NLnRsdT3gIWhCR1ElezMDwSkP46F++YU59GtLp6Eh08dypa9fdaYS5jtiaCaX0cEosVe IPl/iUEwXXFJRUwV2NPaUTspQ0Ww/QxEPsVmty4hF5DnZYVO6+qCy2VP4zOHa1UUf3dJ pomJwB36k484pmYeAQl13gNb5Qf2glYQXjb5wpVPzNlrf9u3obt1sVBzivnd37bLazWy yF+A== X-Forwarded-Encrypted: i=1; AFNElJ8vDjiDUJhI5S9z22r/KuFsvqiq170lfIP4lUowrH0ipH+fz5AKPEpKIEZpH/ipq+n/b3CNFvHsept0GbKT9yG7@vger.kernel.org X-Gm-Message-State: AOJu0YxhSNM3c04vmkaZO0Ajo2lsDILcOHoGzD/KAoo3o9Sahc+KoGvx QKEfXjp4wF9vwt3C2CXQcNVUWmd93lRiG/etD7ywsRFmx5dS93c+NOiAygTxCgHvYs+jMHPDoMO eFfTLrAnXIg== X-Received: from dycqa5.prod.google.com ([2002:a05:7300:fe45:b0:2d8:36c2:7c59]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:d17:b0:2c5:50fe:c78f with SMTP id 5a478bee46e88-2e47816b33dmr13486398eec.12.1776962066752; Thu, 23 Apr 2026 09:34:26 -0700 (PDT) Date: Thu, 23 Apr 2026 09:33:13 -0700 In-Reply-To: <20260423163406.1779809-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: <20260423161006.1762700-1-irogers@google.com> <20260423163406.1779809-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260423163406.1779809-6-irogers@google.com> Subject: [PATCH v4 05/58] perf script: Sort includes and add missed explicit dependencies From: Ian Rogers To: irogers@google.com, acme@kernel.org, adrian.hunter@intel.com, james.clark@linaro.org, leo.yan@linux.dev, namhyung@kernel.org, tmricht@linux.ibm.com Cc: 9erthalion6@gmail.com, adityab1@linux.ibm.com, alexandre.chartre@oracle.com, alice.mei.rogers@gmail.com, ankur.a.arora@oracle.com, ashelat@redhat.com, atrajeev@linux.ibm.com, blakejones@google.com, changbin.du@huawei.com, chuck.lever@oracle.com, collin.funk1@gmail.com, coresight@lists.linaro.org, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dsterba@suse.com, gautam@linux.ibm.com, howardchu95@gmail.com, john.g.garry@oracle.com, jolsa@kernel.org, jonathan.cameron@huawei.com, justinstitt@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mike.leach@arm.com, mingo@redhat.com, morbo@google.com, nathan@kernel.org, nichen@iscas.ac.cn, nick.desaulniers+lkml@gmail.com, pan.deng@intel.com, peterz@infradead.org, ravi.bangoria@amd.com, ricky.ringler@proton.me, stephen.s.brennan@oracle.com, sun.jian.kdev@gmail.com, suzuki.poulose@arm.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, terrelln@fb.com, thomas.falcon@intel.com, tianyou.li@intel.com, tycho@kernel.org, wangyang.guo@intel.com, xiaqinxin@huawei.com, yang.lee@linux.alibaba.com, yuzhuo@google.com, zhiguo.zhou@intel.com, zli94@ncsu.edu 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.rc2.533.g4f5dca5207-goog