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 EEADBFF885A for ; Tue, 28 Apr 2026 07:19:41 +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=C9Nvv9Y40wG9He55sBt49+kw6Z VBuCaJcx3lHeV4qPk3zqxMSWBEMmDL5Mfm/GFxu+kVJXHgPpKavoCdOFXZsOZDf1xBKztu62bsiyV XfjrzOv3QUhqW1ROyb+o6OE92AlQ7DGU5a4IdwHCB3LRXa0Mi15Vn0XcSI8wl81zl1f9/Zqx3M9Ui uo4mAQEy3nqGJr+lu6I8UBJy/E41PrQ/EEKf2NT1NugMpnnwyyOyau+ryooGp+aoBT9wlP3EWLM9L Sq/iG/6mreCjr8Be5inCUNew3xw8uG3FN1qHkix/6RSUzfs566o/f0XtUIt88Gw3kFDIXj3iGqm0+ 59GnTlsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wHcjI-00000000gOD-0ELI; Tue, 28 Apr 2026 07:19:36 +0000 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wHcjA-00000000gJ0-40Uc for linux-arm-kernel@lists.infradead.org; Tue, 28 Apr 2026 07:19:30 +0000 Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-35fbb5779e8so11759690a91.3 for ; Tue, 28 Apr 2026 00:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777360767; x=1777965567; 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=sYqT+1FDzOn2SvPDpT5Ffh/pwVWKI9OSkNeOI2J7ZFp+GdQ/CsVNU9Q29rlvohFafZ EU6gZSdXGT90ei5BFHtW/aqQ2J/pK2YhdRhS48fzKPLC9vBTmi6/G1oJXLLNBRfTCths bmzZwEL/qP3YBVWIOreshcJWsfm2ESC0/pczgAeUFG+kWrsfcTxRjUbhJkAsYrGZ+H38 5rE8dOC+RVx56xlwh5HqviyYvKHxio0XJD6KVJnFunkHoPc/S4Ily9tDa+YF2DVZjVQ3 udxOg0kAmQ1qS0oYDvcnGMU4Xj+UhXI1BxVjh8up9oe2jeFlY0ixjwowPYiQ8oUdQJnx eprQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777360767; x=1777965567; 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=Z/hjsxWSZTj9yhprKD/eAiocoSNB6mX1N4gZcODw9YmAHPpaawWR0dS7WY4f8TdH8O mN7jN/QqccN7IsleLH83TSIprIFwreqhbMc/D8VTyO+xuRs6ZssJMrjG9tuShxjnnN0B yCTMGsAqaM9E+FTYxeyuUVGfWvizzkgbYLtGz41Zw8tXNc2q9XneQxN9j5/J2cNz1DaU k5daUMaik08lcz9VGXStiE25wgks5rLXRt0xl9f5+j+oU8rI3xnCIfOMInwA3yu0+a46 +bsDmX6+bfMheH+sD5wZih3Vh9V8shkGTz51oqSR1WY4rW2+TQS+dFU/5NC9Fi2UvOHg GFlg== X-Forwarded-Encrypted: i=1; AFNElJ8rxiaMA0I0qQkNAs0pxsxZpzt03NJ8xVp5eiz6sz1G1e5H59bkmR5r/nCDjk3b8Fcbe82XaIIvJXiJ2GJZQ23j@lists.infradead.org X-Gm-Message-State: AOJu0Yxf7iuWq+akij/RZRkiLF1AD1yIcs+HLJ2/wl0DposOKD7jDB+H D4UoJHnauyOMT5btezfo9/ssZYOFAUvo3jbr6iAjzSgaQ1xHAFk7Hfq0Tz9TBCL4LcqPrCk3OkA 9EwxAFSkIgg== X-Received: from pgjf17.prod.google.com ([2002:a63:dc51:0:b0:c76:651e:6d72]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7351:b0:3a2:cc5f:2187 with SMTP id adf61e73a8af0-3a39c24c919mr2365748637.28.1777360767081; Tue, 28 Apr 2026 00:19:27 -0700 (PDT) Date: Tue, 28 Apr 2026 00:18:09 -0700 In-Reply-To: <20260428071903.1886173-1-irogers@google.com> Mime-Version: 1.0 References: <20260425224951.174663-1-irogers@google.com> <20260428071903.1886173-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260428071903.1886173-5-irogers@google.com> Subject: [PATCH v8 04/58] perf script: Sort includes and add missed explicit dependencies From: Ian Rogers To: acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com, 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-20260428_001928_994294_F7DFCF62 X-CRM114-Status: GOOD ( 11.37 ) 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