From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id B3BE23858D39 for ; Mon, 2 Jan 2023 04:32:16 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 076CF340CA7; Mon, 2 Jan 2023 04:32:16 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/9] sim: bpf: hoist cgen rules to top-level Date: Sun, 1 Jan 2023 23:32:02 -0500 Message-Id: <20230102043209.21542-2-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102043209.21542-1-vapier@gentoo.org> References: <20230102043209.21542-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- sim/Makefile.in | 25 +++++++++++++ sim/bpf/Makefile.in | 90 --------------------------------------------- sim/bpf/local.mk | 37 +++++++++++++++++++ 3 files changed, 62 insertions(+), 90 deletions(-) diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in index 7a17de8d4758..2732a0e6071e 100644 --- a/sim/bpf/Makefile.in +++ b/sim/bpf/Makefile.in @@ -33,8 +33,6 @@ SIM_OBJS = \ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=64 -SIM_EXTRA_CLEAN = bpf-clean - ## COMMON_POST_CONFIG_FRAG # Dependencies for binaries from CGEN generated source @@ -61,91 +59,3 @@ sem-be.o: sem-be.c $(POSTCOMPILE) arch = bpf - -CGEN_COMMON_DEPS = \ - $(CGEN_READ_SCM) \ - $(srcdir)/../../cpu/bpf.cpu \ - $(srcdir)/../../cpu/bpf.opc \ - Makefile - -stamp-arch: $(CGEN_COMMON_DEPS) $(CGEN_ARCH_SCM) - $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) \ - mach=bpf cpu=bpfbf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-scache" - $(SILENCE) touch $@ -$(srcdir)/arch.h $(srcdir)/arch.c $(srcdir)/cpuall.h: $(CGEN_MAINT) stamp-arch - @true - -stamp-cpu: $(CGEN_COMMON_DEPS) $(CGEN_CPU_SCM) - $(MAKE) cgen-cpu $(CGEN_FLAGS_TO_PASS) \ - isa=ebpfle,ebpfbe cpu=bpfbf mach=bpf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-multiple-isa with-scache" - rm -f $(srcdir)/model.c - $(SILENCE) touch $@ -$(srcdir)/cpu.h $(srcdir)/cpu.c $(srcdir)/model.c: $(CGEN_MAINT) stamp-cpu - @true - -# We need to generate a group of files per ISA. -# For eBPF little-endian: -# defs-le.h -# sem-le.c, decode-le.c, decode-le.h -# $(objdir)/mloop-le.c $(objdir)/eng-le.h -# For eBPF big-endian: -# defs-be.h -# sem-be.c, decode-be.c, decode-be.h -# $(objdir)/mloop-be.c $(objdir)/eng-le.h -# -# The rules below take care of that. - -stamp-defs-le: $(CGEN_COMMON_DEPS) $(CGEN_CPU_SCM) - $(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \ - isa=ebpfle cpu=bpfbf mach=bpf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-scache" \ - SUFFIX="-le" - $(SILENCE) touch $@ -$(srcdir)/defs-le.h: $(CGEN_MAINT) stamp-defs-le - @true - - -stamp-defs-be: $(CGEN_COMMON_DEPS) $(CGEN_CPU_SCM) - $(MAKE) cgen-defs $(CGEN_FLAGS_TO_PASS) \ - isa=ebpfbe cpu=bpfbf mach=bpf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-scache" \ - SUFFIX="-be" - $(SILENCE) touch $@ -$(srcdir)/defs-be.h: $(CGEN_MAINT) stamp-defs-be - @true - -stamp-decode-le: $(CGEN_COMMON_DEPS) $(CGEN_CPU_SCM) $(GEN_DECODE_SCM) - $(MAKE) cgen-decode $(CGEN_FLAGS_TO_PASS) \ - isa=ebpfle cpu=bpfbf mach=bpf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-scache" \ - SUFFIX="-le" \ - EXTRAFILES="$(CGEN_CPU_SEM)" - $(SILENCE) touch $@ -$(srcdir)/sem-le.c $(srcdir)/decode-le.c $(srcdir)/decode-le.h: \ - $(CGEN_MAINT) stamp-decode-le - @true - - -stamp-decode-be: $(CGEN_COMMON_DEPS) $(CGEN_CPU_SCM) $(GEN_DECODE_SCM) - $(MAKE) cgen-decode $(CGEN_FLAGS_TO_PASS) \ - isa=ebpfbe cpu=bpfbf mach=bpf \ - archfile=$(srcdir)/../../cpu/bpf.cpu \ - FLAGS="with-scache" \ - SUFFIX="-be" \ - EXTRAFILES="$(CGEN_CPU_SEM)" - $(SILENCE) touch $@ -$(srcdir)/sem-be.c $(srcdir)/decode-be.c $(srcdir)/decode-be.h: \ - $(CGEN_MAINT) stamp-decode-be - @true - -.PHONY = bpf-clean - -bpf-clean: - rm -f stamp-arch stamp-cpu stamp-decode stamp-defs diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk index 7382f6163bc2..fabf77ec67bd 100644 --- a/sim/bpf/local.mk +++ b/sim/bpf/local.mk @@ -55,3 +55,40 @@ SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS) $(AM_V_at)touch $@ MOSTLYCLEANFILES += $(%C%_BUILD_OUTPUTS) + +%D%/cgen-arch: + $(AM_V_GEN)mach=bpf cpu=bpfbf FLAGS="with-scache"; $(CGEN_GEN_ARCH) +%D%/arch.h %D%/arch.c %D%/cpuall.h: @CGEN_MAINT@ %D%/cgen-arch + +%D%/cgen-cpu: + $(AM_V_GEN)isa=ebpfle,ebpfbe cpu=bpfbf mach=bpf FLAGS="with-multiple-isa with-scache"; $(CGEN_GEN_CPU) + $(AM_V_at)rm -f $(srcdir)/%D%/model.c +%D%/cpu.h %D%/cpu.c %D%/model.c: @CGEN_MAINT@ %D%/cgen-cpu + +## We need to generate a group of files per ISA. +## For eBPF little-endian: +## defs-le.h +## sem-le.c, decode-le.c, decode-le.h +## $(objdir)/mloop-le.c $(objdir)/eng-le.h +## For eBPF big-endian: +## defs-be.h +## sem-be.c, decode-be.c, decode-be.h +## $(objdir)/mloop-be.c $(objdir)/eng-le.h +## +## The rules below take care of that. + +%D%/cgen-defs-le: + $(AM_V_GEN)isa=ebpfle cpu=bpfbf mach=bpf FLAGS="with-scache" SUFFIX="-le"; $(CGEN_GEN_DEFS) +%D%/defs-le.h: @CGEN_MAINT@ %D%/cgen-defs-le + +%D%/cgen-defs-be: + $(AM_V_GEN)isa=ebpfbe cpu=bpfbf mach=bpf FLAGS="with-scache" SUFFIX="-be"; $(CGEN_GEN_DEFS) +%D%/defs-be.h: @CGEN_MAINT@ %D%/cgen-defs-be + +%D%/cgen-decode-le: + $(AM_V_GEN)isa=ebpfle cpu=bpfbf mach=bpf FLAGS="with-scache" SUFFIX="-le" EXTRAFILES="$(CGEN_CPU_SEM)"; $(CGEN_GEN_DECODE) +%D%/sem-le.c %D%/decode-le.c %D%/decode-le.h: @CGEN_MAINT@ %D%/cgen-decode-vle + +%D%/cgen-decode-be: + $(AM_V_GEN)isa=ebpfbe cpu=bpfbf mach=bpf FLAGS="with-scache" SUFFIX="-be" EXTRAFILES="$(CGEN_CPU_SEM)"; $(CGEN_GEN_DECODE) +%D%/sem-be.c %D%/decode-be.c %D%/decode-be.h: @CGEN_MAINT@ %D%/cgen-decode-be -- 2.39.0