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 45F1DC433EF for ; Thu, 16 Jun 2022 04:49:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358703AbiFPEtM (ORCPT ); Thu, 16 Jun 2022 00:49:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358582AbiFPEse (ORCPT ); Thu, 16 Jun 2022 00:48:34 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F28A925585 for ; Wed, 15 Jun 2022 21:48:32 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-30c2f3431b4so3108747b3.21 for ; Wed, 15 Jun 2022 21:48:32 -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=XnsufOX4pFAHaQ8yhxidBAVkzRDc8gtJXHCY8utKwhxGCV/u9VmI00AWzNAUUASC9C K/fkr7oROHn17oAu2j2GrM1LcxgMIxravKQKVfY66dIv8NFKhP6M6Z/tOwuykEThdCsy mJ6OyrN+trBC9rjc1cz5D9ater2G55YMJ9ftjS4faaPv3/fs8vhzbaOu5R03+NM/ty36 ChcOLPw6tCSJed3Fbt3BkSj5NRJWPLdm8kgMFzEqd1wtRbcbPBDbdpKEJieqzwrBIEPj eLFJtYypUcfvXI1iQujJw2F9ae+Zw826kV7YTcwlWmBbwdYG00HbzgHZQkxVJGibbpCb Ql+A== 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=JHoG0ixTBnSXrDJTrIKdORKS4HMtVLm2AGji65/Wh9umZOtAvbNdAuNhV42F1t/bPO q9OQ/2BqPVY1ko0P+em0vep6RODwyYwANrFIMyGvlai3EsExiFpHCx4OkdzbSC11Po9F mDnDEeAl5Gd70GAzSHHjE1jadJGxFo3ZZ3kiawa6UHXylPEu6XE8it6fMiOwTGZevjMK 1QDsl12vRiRpT+q7UorHN0fXUomlG8ZwnG0XlA9cZlY8OB9sKecvSUU8J3fa7g2nfJLS edpjqC7kB9RC2u2ASW/DCdxES0PlvsWslVfOcoQpaEJfj2/IFBnoedKhFAsfvCxo1xKW nwwQ== X-Gm-Message-State: AJIora9Pt5MNqEGWugonZFzLu7/IHHfW1eH7jvmi1ygKFYXrJI7MUnoN JQFwfTK/dadUJQHjxsOxXH9moZdiUTFR X-Google-Smtp-Source: AGRyM1tQP8vRqlMlN6tMgqshD1cuEiQiLFOsFP4mZYjU5YNuivKbDLaJ2HG6JDQD0zaetxMwYBRgpbt7S038 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:8a8e:cef:df61:163d]) (user=irogers job=sendgmr) by 2002:a25:c547:0:b0:664:6ba2:2da7 with SMTP id v68-20020a25c547000000b006646ba22da7mr3317198ybe.188.1655354912195; Wed, 15 Jun 2022 21:48:32 -0700 (PDT) Date: Wed, 15 Jun 2022 21:48:05 -0700 In-Reply-To: <20220616044806.47770-1-irogers@google.com> Message-Id: <20220616044806.47770-4-irogers@google.com> Mime-Version: 1.0 References: <20220616044806.47770-1-irogers@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH v5 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-kernel@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