Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 38A0528469E for ; Thu, 28 Aug 2025 06:42:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756363365; cv=none; b=TnSsxin2iHhZG3aukTwbYRlqb5v053QlEP/gqj+8VapK4GbHKCNh1/7W8SSZl/knVGTlD/dnGzGUwhuLNqxuB5nhjReu6m/pE2wwq6NYuQzfapwPEBWzDoo7oj/JDi7bdQ//8UO90/uD2uhp7hds9uiuopvz1wqniy/3mSX2tMo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756363365; c=relaxed/simple; bh=YBplE78pEpp6hU7/jyM3np9oxxFa+EtSg2fUc2vnjwQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=M298cPRy/dTLKHSSPfyMEs3IdMJZFbzxZskW35TMw8C1nUnMXTFGfzY3SUmsliOVq/w76vFzDLHKPeRUZTBkXKD3OuH0j7zw4Y2dB4bItfQJVFOi2BZ/F2DeByNaX/jBsBIguX88yXn6oKmOh1WGwF7VB5m/s3NeaVwvNLOrG68= 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=lv8LMZml; arc=none smtp.client-ip=209.85.214.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="lv8LMZml" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-24895637fe1so6840665ad.2 for ; Wed, 27 Aug 2025 23:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756363363; x=1756968163; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=o5P4wbRk3WzIuDkNqdxL6ucud/WqubVoGAHoa+p4USc=; b=lv8LMZml6wWWIg4l5Pzoh84/QqfdxtxlrSWdOKVh+VHJBmA5rKy6eASWdIdOPlvItg t4gx8VMczWbMz9xXuLGNvNZtcK/hu27OcJADgAx5+lpBJt9223ugKqWTlW2tvlL543ZP EJIBaIHEZmiHskY9S8MAjumfpQsCOar5dzRXlfWKNVSF7tqPt6g+o0GoNmRXWi1vJUkG nnCT5XdoSC4HOfGr5mRqO4tZpVd9czmdKvI0R6fsEZhzw83uRFkjr3843HMLuVyDqsA9 2VLqNmi/xtdAvT1Lr57kgNvdFnrgmEhto9/L5uMO8CGd3CJQDpJm4VTJAIG/t8hnY32Y PWCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756363363; x=1756968163; h=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=o5P4wbRk3WzIuDkNqdxL6ucud/WqubVoGAHoa+p4USc=; b=PPNG16xhBrdp90CCfhs+4R6A/vGbozHQWoWGMnK8CiLLoJK3cH8oBT3iGJ5b88DPOh Cioo5WCS0owb9+3UeN8oDMq+L4lppFEt2msHswDFSF8XoJ5B1zWRvuttxHFlAFqGewra ttrLZ6E62AtWHIhA0B01W1I3kzTNYj5mr8VZNVaNtn2TfWmAtnBBTN3/dxqPo08jr7rg tMdXgkqqRI8PWkvhxl/eeHBGK8O6iYJOVfAuD8devnz+2q0vkTZUapgNEvDYP/8a6vEd FR2ShDaujEO4FUM9jOHzOYbG8dpNuOXsGtf8Mx6unKozONoD0gwOWJyxcg7lgXWIrS6p aF7A== X-Forwarded-Encrypted: i=1; AJvYcCWvjuzoIVZ3nExlrbvLzMfOWODK+jxYnkNynFTWwT/eAwbLFrN2UYOrNw8KnOFDLbjVnKI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/QWxWfyBf1OPY0qlmAyKnN1ZhrIg3DvPSclt1jxLLLQllN4yI Pc5+RBhrBFCajAzXSvW9d3zpm/NOTjx4khjHDUVroExzdSnrANVVrraWjC7izMKjIbGcyDkbSIc qCSClW6KRsw== X-Google-Smtp-Source: AGHT+IEtDIAN4LqeEwVNhr+0Z3i/+Oas5qZUUnpoH+a/t/nBC73cE3gPd0rHMZQqlkRHTH0Gxckx23sTX2+f X-Received: from plbkk14.prod.google.com ([2002:a17:903:70e:b0:246:8f38:a4de]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a87:b0:248:db40:daf0 with SMTP id d9443c01a7336-248db40e31emr14370165ad.31.1756363363439; Wed, 27 Aug 2025 23:42:43 -0700 (PDT) Date: Wed, 27 Aug 2025 23:42:22 -0700 In-Reply-To: <20250828064231.1762997-1-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250828064231.1762997-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250828064231.1762997-5-irogers@google.com> Subject: [PATCH v1 04/13] perf jevents: Support copying the source json files to OUTPUT From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan Content-Type: text/plain; charset="UTF-8" The jevents command expects all json files to be organized under a single directory. When generating json files from scripts (to reduce laborious copy and paste in the json) we don't want to generate the json into the source directory if there is an OUTPUT directory specified. This change adds a GEN_JSON for this case where the GEN_JSON copies the JSON files to OUTPUT, only when OUTPUT is specified. The Makefile.perf clean code is updated to clean up this directory when present. This patch is part of: https://lore.kernel.org/lkml/20240926173554.404411-12-irogers@google.com/ which was similarly adding support for generating json in scripts for the consumption of jevents.py. Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 21 ++++++++++++++++----- tools/perf/pmu-events/Build | 18 ++++++++++++------ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index e2150acc2c13..cc1635335586 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1272,9 +1272,24 @@ endif # CONFIG_PERF_BPF_SKEL bpf-skel-clean: $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKEL_OUT)/vmlinux.h +pmu-events-clean: +ifeq ($(OUTPUT),) + $(call QUIET_CLEAN, pmu-events) $(RM) \ + pmu-events/pmu-events.c \ + pmu-events/metric_test.log \ + pmu-events/test-empty-pmu-events.c \ + pmu-events/empty-pmu-events.log +else # When an OUTPUT directory is present, clean up the copied pmu-events/arch directory. + $(call QUIET_CLEAN, pmu-events) $(RM) -r $(OUTPUT)pmu-events/arch \ + $(OUTPUT)pmu-events/pmu-events.c \ + $(OUTPUT)pmu-events/metric_test.log \ + $(OUTPUT)pmu-events/test-empty-pmu-events.c \ + $(OUTPUT)pmu-events/empty-pmu-events.log +endif + clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean \ arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean \ - tests-coresight-targets-clean + tests-coresight-targets-clean pmu-events-clean $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive \ $(OUTPUT)perf-iostat $(LANG_BINDINGS) $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '*.a' -delete -o \ @@ -1287,10 +1302,6 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $( $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c \ $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \ - $(OUTPUT)pmu-events/pmu-events.c \ - $(OUTPUT)pmu-events/test-empty-pmu-events.c \ - $(OUTPUT)pmu-events/empty-pmu-events.log \ - $(OUTPUT)pmu-events/metric_test.log \ $(OUTPUT)$(fadvise_advice_array) \ $(OUTPUT)$(fsconfig_arrays) \ $(OUTPUT)$(fsmount_arrays) \ diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 32f387d48908..1503a16e662a 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -1,7 +1,6 @@ pmu-events-y += pmu-events.o JDIR = pmu-events/arch/$(SRCARCH) -JSON = $(shell [ -d $(JDIR) ] && \ - find $(JDIR) -name '*.json' -o -name 'mapfile.csv') +JSON = $(shell find pmu-events/arch -name *.json -o -name *.csv) JDIR_TEST = pmu-events/arch/test JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \ find $(JDIR_TEST) -name '*.json') @@ -29,13 +28,20 @@ $(PMU_EVENTS_C): $(EMPTY_PMU_EVENTS_C) $(call rule_mkdir) $(Q)$(call echo-cmd,gen)cp $< $@ else +# Copy checked-in json for generation. +$(OUTPUT)pmu-events/arch/%: pmu-events/arch/% + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)cp $< $@ + +GEN_JSON = $(patsubst %,$(OUTPUT)%,$(JSON)) + $(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY) $(call rule_mkdir) $(Q)$(call echo-cmd,test)$(PYTHON) $< 2> $@ || (cat $@ && false) -$(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) +$(TEST_EMPTY_PMU_EVENTS_C): $(GEN_JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) none none pmu-events/arch $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) none none $(OUTPUT)pmu-events/arch $@ $(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C) $(call rule_mkdir) @@ -63,10 +69,10 @@ $(OUTPUT)%.pylint_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)pylint "$<" > $@ || (cat $@ && rm $@ && false) -$(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) \ +$(PMU_EVENTS_C): $(GEN_JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) \ $(EMPTY_PMU_EVENTS_TEST_LOG) $(PMU_EVENTS_MYPY_TEST_LOGS) $(PMU_EVENTS_PYLINT_TEST_LOGS) $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS_MODEL) pmu-events/arch $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS_MODEL) $(OUTPUT)pmu-events/arch $@ endif # pmu-events.c file is generated in the OUTPUT directory so it needs a -- 2.51.0.268.g9569e192d0-goog