From patchwork Thu Jun 13 23:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13697612 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69ED3C27C4F for ; Thu, 13 Jun 2024 23:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DYNMPvAhzFMBQa9ETz18bM3F5BVhY/EQ+IVegcwRJ6Y=; b=gWZu/K/Ka6Upe7 3Yryf8GDFo72f9yfRsH9idx2FtCL3+G+UjD2yle629h94oTLL5dGm9jKTsacBgpiZBNYuKP22PoUn Z9yDVrQLOrSyQV0Nl3WchCQ7/EasInbibD2VV0uoqtlh8eSbqxiEpiYYNH1QFUbttEjzML43e1o3C fM28lLDLYxH0yevX7Us0pdVcySDvWe/tiKRLrIP7RiCzUTFRwwG1cF/LSfE8+IbhZi3a7tJtkQ+Im 6v0/wJBgjLS3C9uV54ikt4GfdkBRlOJEaIePjrXdv2wcXZrMhY5/doaFQmPcH0PjKxaFYJUA+bxaV Ha3b34W8GrAiJ5R63ScA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHtwL-00000000mTi-1Y3p; Thu, 13 Jun 2024 23:33:09 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHtvE-00000000ljI-46pu for linux-riscv@lists.infradead.org; Thu, 13 Jun 2024 23:32:06 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-df796aaa57dso2308960276.1 for ; Thu, 13 Jun 2024 16:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321518; x=1718926318; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=r+L2y8W9nebELrh4jjwhLDqIvkQwPnsfqcpkdzoDYes=; b=wc8tCzZnjuJ2brhV8prIdtAOXzvmGkDbcuhedKaTnpKXOvkb3oJhqehypZEIe4x+a9 OmEShL9ayDkVvm5LT4RE+9o23qDUVUPOv8vvshG/A5ly5Nzen2wqxZ0kS4MS1269kNMY V78nTUEdQINmt9bgn4kWZ0XExzWrpuH8DVhRRZ9tLRTxlNEZNmpnT9lOjbOF4xMp3GSY h4Resp8IAWlN/UGsCUN84bo9pF5qjW/uZI6dovB3vnB7BeGTbUMhTlMiZPSTisLqOOyc yv35OxgqNKceXkaeQA63BGJ2uDlSQx8tP8jfA7cBSnfoVycCdxI4f+cirS6Z2rYJ2xkM 54jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321518; x=1718926318; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r+L2y8W9nebELrh4jjwhLDqIvkQwPnsfqcpkdzoDYes=; b=u/s5d02oXRcNHBODvhgccF8Rk8BCPvPoo3T0c6y0NyK6PRzk/0H3QPsE8HDJTv9YIC pIA1ndlWp7tofXKmXc1b7z7j5iyycQY2qX6kAiJXDY03xdGHGw7z+XB9tlyM8Bw7VbCH OIupuIW7AswV7/gTSydPRZFRApsnH7K+xPcRnvOEgSghA5gCHXqdaL2Yy6njdc1V//Nm xNTNTS0QCCXyBnn0juDrhwEYm5SwN8uXRkiepX7mregqCxdL9WfkiqczSjaJgo7NOpcM GHiVm99KFCinwCkyT75t4U+X+njjU7mzwIqagMla/5zWlDSLjtwfb3QrXIA0N3odWrBh 1doQ== X-Forwarded-Encrypted: i=1; AJvYcCUd80zPzig/T8KiRtkScbxIAWEwwbkkMhhhFZjYwM0fNTNrwnWnRyajp6v1rUcC2lzpsGULZSAlg1nNo3AphNF7ALRmwuaxz0apukBPolWA X-Gm-Message-State: AOJu0YyQS5t0oeuslmyrWAkpiXShNBzMiGR5kZXXTJHeonVvGXg3g3Oh PPfpTcNV0cb9ryFWGbl2N28zmRLULw4NOB0mZQ7ppJ+u2IpWJ+Z9tx0G7Am6tKESLB8z4kRwnS1 Etqopzw== X-Google-Smtp-Source: AGHT+IEPh6V7sGbFHR3+mSLnMHVnCNCyXK9wRdgNwAVEtM+jm7kOCyEDIINjZOrKiPFf8Nvnv9P0x6gU6Ikz X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:6902:1204:b0:dfa:ff27:db1 with SMTP id 3f1490d57ef6-dff15412181mr135767276.4.1718321517470; Thu, 13 Jun 2024 16:31:57 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:22 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-9-irogers@google.com> Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 8/8] perf python: Clean up build dependencies 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , " =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= " , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240613_163201_143969_3A40D609 X-CRM114-Status: GOOD ( 14.20 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The python build now depends on libraries and doesn't use python-ext-sources except for the util/python.c dependency. Switch to just directly depending on that file and util/setup.py. This allows the removal of python-ext-sources. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 10 +----- tools/perf/util/python-ext-sources | 53 ------------------------------ 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tools/perf/util/python-ext-sources diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a1a9f09fa09..590081384882 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -380,14 +380,6 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT # Use the detected configuration -include $(OUTPUT).config-detected -ifeq ($(CONFIG_LIBTRACEEVENT),y) - PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) -else - PYTHON_EXT_SRCS := $(shell grep -v ^\#\\\|util/trace-event.c\\\|util/trace-event-parse.c util/python-ext-sources) -endif - -PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBAPI) - SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) PROGRAMS += $(OUTPUT)perf @@ -715,7 +707,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(PERFLIBS) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): util/python.c util/setup.py $(PERFLIBS) $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \ CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources deleted file mode 100644 index 1bec945f4838..000000000000 --- a/tools/perf/util/python-ext-sources +++ /dev/null @@ -1,53 +0,0 @@ -# -# List of files needed by perf python extension -# -# Each source file must be placed on its own line so that it can be -# processed by Makefile and util/setup.py accordingly. -# - -util/python.c -../lib/ctype.c -util/cap.c -util/evlist.c -util/evsel.c -util/evsel_fprintf.c -util/perf_event_attr_fprintf.c -util/cpumap.c -util/memswap.c -util/mmap.c -util/namespaces.c -../lib/bitmap.c -../lib/find_bit.c -../lib/list_sort.c -../lib/hweight.c -../lib/string.c -../lib/vsprintf.c -util/thread_map.c -util/util.c -util/cgroup.c -util/parse-branch-options.c -util/rblist.c -util/counts.c -util/print_binary.c -util/strlist.c -util/trace-event.c -util/trace-event-parse.c -../lib/rbtree.c -util/string.c -util/symbol_fprintf.c -util/units.c -util/affinity.c -util/rwsem.c -util/hashmap.c -util/perf_regs.c -util/fncache.c -util/rlimit.c -util/perf-regs-arch/perf_regs_aarch64.c -util/perf-regs-arch/perf_regs_arm.c -util/perf-regs-arch/perf_regs_csky.c -util/perf-regs-arch/perf_regs_loongarch.c -util/perf-regs-arch/perf_regs_mips.c -util/perf-regs-arch/perf_regs_powerpc.c -util/perf-regs-arch/perf_regs_riscv.c -util/perf-regs-arch/perf_regs_s390.c -util/perf-regs-arch/perf_regs_x86.c