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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA607CCA479 for ; Sat, 18 Jun 2022 00:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236843AbiFRAJs (ORCPT ); Fri, 17 Jun 2022 20:09:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236023AbiFRAJm (ORCPT ); Fri, 17 Jun 2022 20:09:42 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A277754BED for ; Fri, 17 Jun 2022 17:09:41 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 20-20020a630114000000b00408e3bb6343so2895426pgb.6 for ; Fri, 17 Jun 2022 17:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=NN/VHTjMvFFwWljT35WfwKFzjyPlcfkcYjTW8hvHQro=; b=P5meH7puDld5c33SdRf6FPcHZdYF7HnRYNUFCr0OEwXUZfr6CZ10tqhnpPC+coUu4z LJ4cwOE5EfmyYql8OTUXJOE8rUThK9sCYten4lZBXWokeP51vO6gHxxklg5eaBHcwp1g dDqC4EX0gur+K/7fN/y0D6M/4IOW4NGhvX2DX18eYwLoiYp6zaSlNkzJDbX0uT4g3awk zqQELnQY7oh40vWB6s1afNMGnE4dKa+9RYFjb3rEcH75pK0V0Prvr2cyUa/+UiunHe/+ 53flx/l3X5vpjNoVNMWmZo+ITOI/ogRZWYoJ9774MBlB8tKvtV6D/ilkR+MK/A3U6Hw9 geKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=NN/VHTjMvFFwWljT35WfwKFzjyPlcfkcYjTW8hvHQro=; b=LJEKWezAStX+IUVJk+g66IoDFXPoe7kzJuq84ffEm1fh1qVVDAtLjI/PstB6hNvhoI lB/KYQN2E8IxFlwmj0okGC01E0rjjoLtzytz6MPdHqrJ19hwHCnL+AN/geYRt9oPRVa6 j8jVu6cAggt3pX3laUDHwT3knMIVaZxLy9rum2L8IvzxJQHqIno87po30vbIhoBOWv3F 47LXb7m6PkVIYeB+zGwcDuZFkc6/pv+OTL6OfFzFv0EOEZG1eL4RpA4pRXKMEHccJcFt Z6hMAUMMRAJ5MEjjXpDPeacAfkdBd6exsRngAvQaZdLP5/c9T5a8qOAHmqqBkbl+SsBU gQLw== X-Gm-Message-State: AJIora/46sd6jVDs9qNwtj5NzlWvyHBwk0YUnDYg76j8TA8F8fQuY7lr 1lB60AzXilyPBb+67eksykVRsCCiYE7j X-Google-Smtp-Source: AGRyM1um+Fa/QqqI1CT+wNfhFLqkbp7WsmH7G9koY5QKIihb+m2b+HSCiKAVMLJO4mO46AL9weHu/em7mYCz X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:c89f:8969:c05d:79b6]) (user=irogers job=sendgmr) by 2002:a63:e010:0:b0:401:afc3:5557 with SMTP id e16-20020a63e010000000b00401afc35557mr11371383pgh.133.1655510980865; Fri, 17 Jun 2022 17:09:40 -0700 (PDT) Date: Fri, 17 Jun 2022 17:09:06 -0700 In-Reply-To: <20220618000907.433350-1-irogers@google.com> Message-Id: <20220618000907.433350-4-irogers@google.com> Mime-Version: 1.0 References: <20220618000907.433350-1-irogers@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH v6 3/4] perf jevents: Switch build to use jevents.py From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , Kan Liang , Andi Kleen , Zhengjun Xing , Felix Fietkau , Qi Liu , Like Xu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Nick Forrington , Kajol Jain , James Clark , Andrew Kilroy , "Paul A . Clarke" , Will Deacon , Mathieu Poirier , ananth.narayan@amd.com, ravi.bangoria@amd.com, santosh.shukla@amd.com, sandipan.das@amd.com, Caleb Biggers , Perry Taylor , Kshipra Bopardikar Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Generate pmu-events.c using jevents.py rather than the binary built from jevents.c. Add a new config variable NO_JEVENTS that is set when there is no architecture json or an appropriate python interpreter isn't present. When NO_JEVENTS is defined the file pmu-events/empty-pmu-events.c is copied and used as the pmu-events.c file. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 19 +++++++++++++++++++ tools/perf/Makefile.perf | 1 + tools/perf/pmu-events/Build | 11 +++++++++-- tools/perf/pmu-events/empty-pmu-events.c | 21 +++++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 tools/perf/pmu-events/empty-pmu-events.c diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 16c1a87444b8..153c18909ff5 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -889,6 +889,25 @@ else endif endif +ifneq ($(NO_JEVENTS),1) + ifeq ($(wildcard pmu-events/arch/$(SRCARCH)/mapfile.csv),) + NO_JEVENTS := 1 + endif +endif +ifneq ($(NO_JEVENTS),1) + NO_JEVENTS := 0 + ifndef PYTHON + $(warning No python interpreter disabling jevent generation) + NO_JEVENTS := 1 + else + # jevents.py uses f-strings present in Python 3.6 released in Dec. 2016. + JEVENTS_PYTHON_GOOD := $(shell $(PYTHON) -c 'import sys;print("1" if(sys.version_info.major >= 3 and sys.version_info.minor >= 6) else "0")' 2> /dev/null) + ifneq ($(JEVENTS_PYTHON_GOOD), 1) + $(warning Python interpreter too old (older than 3.6) disabling jevent generation) + NO_JEVENTS := 1 + endif + endif +endif ifndef NO_LIBBFD ifeq ($(feature-libbfd), 1) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 1e29c8936f71..dc6b177ac1de 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -655,6 +655,7 @@ JEVENTS := $(OUTPUT)pmu-events/jevents JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o +export NO_JEVENTS export JEVENTS diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index a055dee6a46a..5e459e1c7a85 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -9,10 +9,17 @@ JSON = $(shell [ -d $(JDIR) ] && \ JDIR_TEST = pmu-events/arch/test JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \ find $(JDIR_TEST) -name '*.json') +JEVENTS_PY = pmu-events/jevents.py # # Locate/process JSON files in pmu-events/arch/ # directory and create tables in pmu-events.c. # -$(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) + +ifeq ($(NO_JEVENTS),1) +$(OUTPUT)pmu-events/pmu-events.c: pmu-events/empty-pmu-events.c + $(Q)cp $< $@ +else +$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS_PY) + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(SRCARCH) pmu-events/arch $@ +endif diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c new file mode 100644 index 000000000000..08fee615e015 --- /dev/null +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * An empty pmu-events.c file used when there is no architecture json files in + * arch or when the jevents.py script cannot be run. + */ +#include "pmu-events/pmu-events.h" + +const struct pmu_events_map pmu_events_map[] = { + { + .cpuid = 0, + .version = 0, + .type = 0, + .table = 0, + }, +}; + +const struct pmu_sys_events pmu_sys_event_tables[] = { + { + .table = 0 + }, +}; -- 2.36.1.476.g0c4daa206d-goog