Re: [PATCH 02/11] perf jevents: Relocate test events to cpu folder

From: John Garry
Date: Mon Aug 09 2021 - 11:46:49 EST


On 03/08/2021 09:19, John Garry wrote:
So I think we need something like this:

----->8--------

From a08df563665e9ec088b1af86ceed058497e112a4 Mon Sep 17 00:00:00 2001
From: John Garry <john.garry@xxxxxxxxxx>
Date: Tue, 3 Aug 2021 08:44:09 +0100
Subject: [PATCH] perf jevents: Make build dependency on test JSONs

Currently all JSONs and the mapfile for an arch are dependencies for
building pmu-events.c

The test JSONs are missing as a dependency, so add them.

Signed-off-by: John Garry <john.garry@xxxxxxxxxx>

diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
index 215ba30b8534..a055dee6a46a 100644
--- a/tools/perf/pmu-events/Build
+++ b/tools/perf/pmu-events/Build
@@ -6,10 +6,13 @@ pmu-events-y    += pmu-events.o
 JDIR        =  pmu-events/arch/$(SRCARCH)
 JSON        =  $(shell [ -d $(JDIR) ] &&                \
             find $(JDIR) -name '*.json' -o -name 'mapfile.csv')
+JDIR_TEST    =  pmu-events/arch/test
+JSON_TEST    =  $(shell [ -d $(JDIR_TEST) ] &&            \
+            find $(JDIR_TEST) -name '*.json')

 #
 # Locate/process JSON files in pmu-events/arch/
 # directory and create tables in pmu-events.c.
 #
-$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)
+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS)
     $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)


-----8<-----

Hi Arnaldo,

Shall I send this as a formal patch?

Thanks!