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 5E742C433EF for ; Wed, 15 Jun 2022 03:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345854AbiFODE6 (ORCPT ); Tue, 14 Jun 2022 23:04:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345851AbiFODE5 (ORCPT ); Tue, 14 Jun 2022 23:04:57 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B30C4B841; Tue, 14 Jun 2022 20:04:56 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id e11so10227477pfj.5; Tue, 14 Jun 2022 20:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7yoT7zq18bqvdkWqsn6vbtgdFlKRuz6YfdEN439ThqA=; b=OCFQE5BJ4YOlSAX+Ul0ptcTIYbUbD8RBEtLI1x5JDfi9w/4r8jqW2QRR9NxZ023KU5 EwzqPKo2k+vYegQUrhkVzi7PLe/ruKytZWexGgd/9MJciqKWcaKLUaNn6vyOzZmuVVtG 3lu5kjYXe85t8D5is9k4NlitFzrMCcv5AIXPqevbFYetrolNvF01CJpiEuPmOKD1u1uA LiJTBPFhlguLZN0hhFuzPCS62tLwvFjZFzTtPpZ8SBqNOSg5pxIMteqxU+Pz4hFpkdyi TH7wVFSlAfkSc+ecisHH+Wmnvv2hOnwMt/mjxyp69RTDpHFyXktQp9LAUuE4WLBdUZMj DCbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7yoT7zq18bqvdkWqsn6vbtgdFlKRuz6YfdEN439ThqA=; b=lQjIu7VgSlPdeVxCPTdPZCng7So5zu0DHNqbKgeXpZDiLON9LrukrObqSB/KG1KO/U EeV/nhMZIZKfhrX1146TbLCmKTv5U87fAaErGhmLgYLpYolhnBX81knHMWODFTkVuyem qZ9g3fDlp7XQzTmJF29/SQlrKQwGJ0aBloB93f0B0VUVRM6Lm4Sx4gy4g71d1LhuB+j0 4Z0x+FQsxcJiF9NDytgctqZ93nTjto/5v9dvTWHH1txQuJYuJ+kKHctd17E6/tOGVDGk g/LjSsBO/4TMZYk1EXYuMcaORfHI4JzHev1MG5OzEVx6E7u3N0dgn3n8Y/SrH3Y5bUkR evsA== X-Gm-Message-State: AOAM530Oi8ceLOnD3jTchmoU/yoLvaGfLha/0DuqWE+wQfuEmocmx+KS 5a56sPWlvMHVZ1Zhoc+tQZA= X-Google-Smtp-Source: ABdhPJwV1OEoTZsGN3fdQ9LVZxt0l9u3qORSvbRIqjar3CeAKlPcAZN3xwiWrQ9+0KDOyP4AVnQ4Bw== X-Received: by 2002:a63:b105:0:b0:3fd:a875:d16 with SMTP id r5-20020a63b105000000b003fda8750d16mr7003074pgf.209.1655262295424; Tue, 14 Jun 2022 20:04:55 -0700 (PDT) Received: from rpi400.lan (c-73-70-190-118.hsd1.ca.comcast.net. [73.70.190.118]) by smtp.gmail.com with ESMTPSA id v17-20020a62c311000000b0050dc762816asm8333342pfg.68.2022.06.14.20.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jun 2022 20:04:51 -0700 (PDT) From: Ian Rogers X-Google-Original-From: Ian Rogers Received: by rpi400.lan (Postfix, from userid 1001) id EF16D2FC69A; Tue, 14 Jun 2022 20:04:48 -0700 (PDT) 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 Subject: [PATCH v4 3/4] perf jevents: Switch build to use jevents.py Date: Tue, 14 Jun 2022 20:04:37 -0700 Message-Id: <20220615030438.51477-4-irogers@google.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220615030438.51477-1-irogers@google.com> References: <20220615030438.51477-1-irogers@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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..feaaffcfde86 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")') + 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.34.1