From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH 7/8] sim: mips: hoist "multi" igen rules up to common builds
Date: Sun, 25 Dec 2022 14:28:51 -0500 [thread overview]
Message-ID: <20221225192852.1940-7-vapier@gentoo.org> (raw)
In-Reply-To: <20221225192852.1940-1-vapier@gentoo.org>
Since these are the last mips igen rules, we can clean up a number of
bits in the local Makefile.in.
---
sim/Makefile.in | 156 ++++++++++++++++++++++++++++++++++--------
sim/configure | 18 ++++-
sim/mips/Makefile.in | 124 ---------------------------------
sim/mips/acinclude.m4 | 1 +
sim/mips/local.mk | 102 +++++++++++++++++++++++++++
5 files changed, 248 insertions(+), 153 deletions(-)
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 15016f94375d..eb20977c5cc6 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -4,8 +4,6 @@
## COMMON_PRE_CONFIG_FRAG
SIM_MIPS_GEN = @SIM_MIPS_GEN@
-SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@
-SIM_MIPS_MULTI_SRC = @SIM_MIPS_MULTI_SRC@
SIM_MIPS_MULTI_OBJ = @SIM_MIPS_MULTI_OBJ@
arch = mips
@@ -57,126 +55,4 @@ SIM_EXTRA_CFLAGS = @SIM_MIPS_SUBTARGET@
SIM_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1
SIM_FLOAT = -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=@SIM_MIPS_FPU_BITSIZE@
-SIM_EXTRA_CLEAN = clean-extra
-
-all: $(SIM_$(SIM_MIPS_GEN)_ALL)
-
## COMMON_POST_CONFIG_FRAG
-
-IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-all
-IGEN_INSN=$(srcdir)/mips.igen
-IGEN_DC=$(srcdir)/mips.dc
-M16_DC=$(srcdir)/m16.dc
-MICROMIPS32_DC=$(srcdir)/micromips.dc
-MICROMIPS16_DC=$(srcdir)/micromips16.dc
-IGEN_INCLUDE=\
- $(srcdir)/micromipsdsp.igen \
- $(srcdir)/micromips.igen \
- $(srcdir)/m16.igen \
- $(srcdir)/m16e.igen \
- $(srcdir)/mdmx.igen \
- $(srcdir)/mips3d.igen \
- $(srcdir)/sb1.igen \
- $(srcdir)/tx.igen \
- $(srcdir)/vr.igen \
- $(srcdir)/dsp.igen \
- $(srcdir)/dsp2.igen \
- $(srcdir)/mips3264r2.igen \
- $(srcdir)/mips3264r6.igen \
-
-SIM_SINGLE_ALL =
-SIM_M16_ALL =
-SIM_MULTI_ALL = tmp-multi
-
-BUILT_SRC_FROM_MULTI = $(SIM_MIPS_MULTI_SRC)
-
-$(BUILT_SRC_FROM_MULTI): tmp-multi
-tmp-multi: tmp-mach-multi tmp-run-multi
-tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
- for t in $(SIM_MIPS_MULTI_IGEN_CONFIGS); do \
- p=`echo $${t} | sed -e 's/:.*//'` ; \
- m=`echo $${t} | sed -e 's/.*:\(.*\):.*/\1/'` ; \
- f=`echo $${t} | sed -e 's/.*://'` ; \
- case $${p} in \
- micromips16*) e="-B 16 -H 15 -o $(MICROMIPS16_DC) -F 16" ;; \
- micromips32* | micromips64*) \
- e="-B 32 -H 31 -o $(MICROMIPS32_DC) -F $${f}" ;; \
- micromips_m32*) \
- e="-B 32 -H 31 -o $(IGEN_DC) -F $${f}"; \
- m="mips32r2,mips3d,mdmx,dsp,dsp2,smartmips" ;; \
- micromips_m64*) \
- e="-B 32 -H 31 -o $(IGEN_DC) -F $${f}"; \
- m="mips64r2,mips3d,mdmx,dsp,dsp2,smartmips" ;; \
- m16*) e="-B 16 -H 15 -o $(M16_DC) -F 16" ;; \
- *) e="-B 32 -H 31 -o $(IGEN_DC) -F $${f}" ;; \
- esac; \
- $(IGEN_RUN) \
- $(IGEN_TRACE) \
- $${e} \
- -I $(srcdir) \
- -Werror \
- -Wnodiscard \
- -M $${m} \
- -G gen-direct-access \
- -G gen-zero-r0 \
- -i $(IGEN_INSN) \
- -P $${p}_ \
- -x \
- -n $${p}_icache.h -hc $${p}_icache.h \
- -n $${p}_icache.c -c $${p}_icache.c \
- -n $${p}_semantics.h -hs $${p}_semantics.h \
- -n $${p}_semantics.c -s $${p}_semantics.c \
- -n $${p}_idecode.h -hd $${p}_idecode.h \
- -n $${p}_idecode.c -d $${p}_idecode.c \
- -n $${p}_model.h -hm $${p}_model.h \
- -n $${p}_model.c -m $${p}_model.c \
- -n $${p}_support.h -hf $${p}_support.h \
- -n $${p}_support.c -f $${p}_support.c \
- -n $${p}_engine.h -he $${p}_engine.h \
- -n $${p}_engine.c -e $${p}_engine.c \
- || exit; \
- done
- $(SILENCE) touch $@
-tmp-run-multi: $(srcdir)/m16run.c $(srcdir)/micromipsrun.c
- for t in $(SIM_MIPS_MULTI_IGEN_CONFIGS); do \
- case $${t} in \
- m16*) \
- m=`echo $${t} | sed -e 's/^m16//' -e 's/:.*//'`; \
- sed < $(srcdir)/m16run.c > tmp-run \
- -e "s/^sim_/m16$${m}_/" \
- -e "/include/s/sim-engine/m16$${m}_engine/" \
- -e "s/m16_/m16$${m}_/" \
- -e "s/m32_/m32$${m}_/" ; \
- $(SHELL) $(srcdir)/../../move-if-change tmp-run \
- m16$${m}_run.c ; \
- ;;\
- micromips32*) \
- m=`echo $${t} | sed -e 's/^micromips32//' -e 's/:.*//'`; \
- sed < $(srcdir)/micromipsrun.c > tmp-run \
- -e "s/^sim_/micromips32$${m}_/" \
- -e "/include/s/sim-engine/micromips32$${m}_engine/" \
- -e "s/micromips16_/micromips16$${m}_/" \
- -e "s/micromips32_/micromips32$${m}_/" \
- -e "s/m32_/m32$${m}_/" ; \
- $(SHELL) $(srcdir)/../../move-if-change tmp-run \
- micromips$${m}_run.c ; \
- ;;\
- micromips64*) \
- m=`echo $${t} | sed -e 's/^micromips64//' -e 's/:.*//'`; \
- sed < $(srcdir)/micromipsrun.c > tmp-run \
- -e "s/^sim_/micromips64$${m}_/" \
- -e "/include/s/sim-engine/micromips64$${m}_engine/" \
- -e "s/micromips16_/micromips16$${m}_/" \
- -e "s/micromips32_/micromips64$${m}_/" \
- -e "s/m32_/m64$${m}_/" ; \
- $(SHELL) $(srcdir)/../../move-if-change tmp-run \
- micromips$${m}_run.c ; \
- ;;\
- esac \
- done
- $(SILENCE) touch $@
-
-clean-extra:
- rm -f $(BUILT_SRC_FROM_MULTI)
- rm -f tmp-*
- rm -f micromips16*.o micromips32*.o m16*.o m32*.o
diff --git a/sim/mips/acinclude.m4 b/sim/mips/acinclude.m4
index efabd27e66b3..cb53334ff78d 100644
--- a/sim/mips/acinclude.m4
+++ b/sim/mips/acinclude.m4
@@ -335,3 +335,4 @@ AC_SUBST(SIM_MIPS_MULTI_SRC)
AC_SUBST(SIM_MIPS_MULTI_OBJ)
AM_CONDITIONAL([SIM_MIPS_GEN_MODE_SINGLE], [test "$SIM_MIPS_GEN" = "SINGLE"])
AM_CONDITIONAL([SIM_MIPS_GEN_MODE_M16], [test "$SIM_MIPS_GEN" = "M16"])
+AM_CONDITIONAL([SIM_MIPS_GEN_MODE_MULTI], [test "$SIM_MIPS_GEN" = "MULTI"])
diff --git a/sim/mips/local.mk b/sim/mips/local.mk
index b6e482e0fdac..9a0a5b598450 100644
--- a/sim/mips/local.mk
+++ b/sim/mips/local.mk
@@ -81,6 +81,12 @@ if SIM_MIPS_GEN_MODE_M16
%D%/stamp-gen-mode-m16-m16 \
%D%/stamp-gen-mode-m16-m32
endif
+if SIM_MIPS_GEN_MODE_MULTI
+%C%_BUILD_OUTPUTS += \
+ $(SIM_MIPS_MULTI_SRC) \
+ %D%/stamp-gen-mode-multi-igen \
+ %D%/stamp-gen-mode-multi-run
+endif
## This makes sure build tools are available before building the arch-subdirs.
SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
@@ -89,6 +95,7 @@ $(%C%_BUILT_SRC_FROM_IGEN_ITABLE): %D%/stamp-igen-itable
$(%C%_BUILT_SRC_FROM_GEN_MODE_SINGLE): %D%/stamp-gen-mode-single
$(%C%_BUILT_SRC_FROM_GEN_MODE_M16_M16): %D%/stamp-gen-mode-m16-m16
$(%C%_BUILT_SRC_FROM_GEN_MODE_M16_M32): %D%/stamp-gen-mode-m16-m32
+$(SIM_MIPS_MULTI_SRC): %D%/stamp-gen-mode-multi-igen %D%/stamp-gen-mode-multi-run
%C%_IGEN_TRACE = # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-all
%C%_IGEN_INSN = $(srcdir)/%D%/mips.igen
@@ -108,6 +115,8 @@ $(%C%_BUILT_SRC_FROM_GEN_MODE_M16_M32): %D%/stamp-gen-mode-m16-m32
%D%/vr.igen
%C%_IGEN_DC = $(srcdir)/%D%/mips.dc
%C%_M16_DC = $(srcdir)/%D%/m16.dc
+%C%_MICROMIPS32_DC = $(srcdir)/%D%/micromips.dc
+%C%_MICROMIPS16_DC = $(srcdir)/%D%/micromips16.dc
## NB: Since these can be built by a number of generators, care
## must be taken to ensure that they are only dependant on
@@ -211,6 +220,99 @@ $(%C%_BUILT_SRC_FROM_GEN_MODE_M16_M32): %D%/stamp-gen-mode-m16-m32
-n m32_support.c -f %D%/m32_support.c
$(AM_V_at)touch $@
+%D%/stamp-gen-mode-multi-igen: $(%C%_IGEN_INSN) $(%C%_IGEN_INSN_INC) $(%C%_IGEN_DC) $(%C%_M16_DC) $(%C%_MICROMIPS32_DC) $(%C%_MICROMIPS16_DC) $(IGEN)
+ $(AM_V_GEN)\
+ for t in $(SIM_MIPS_MULTI_IGEN_CONFIGS); do \
+ p=`echo $${t} | sed -e 's/:.*//'` ; \
+ m=`echo $${t} | sed -e 's/.*:\(.*\):.*/\1/'` ; \
+ f=`echo $${t} | sed -e 's/.*://'` ; \
+ case $${p} in \
+ micromips16*) \
+ e="-B 16 -H 15 -o $(%C%_MICROMIPS16_DC) -F 16" ;; \
+ micromips32* | micromips64*) \
+ e="-B 32 -H 31 -o $(%C%_MICROMIPS32_DC) -F $${f}" ;; \
+ micromips_m32*) \
+ e="-B 32 -H 31 -o $(%C%_IGEN_DC) -F $${f}"; \
+ m="mips32r2,mips3d,mdmx,dsp,dsp2,smartmips" ;; \
+ micromips_m64*) \
+ e="-B 32 -H 31 -o $(%C%_IGEN_DC) -F $${f}"; \
+ m="mips64r2,mips3d,mdmx,dsp,dsp2,smartmips" ;; \
+ m16*) \
+ e="-B 16 -H 15 -o $(%C%_M16_DC) -F 16" ;; \
+ *) \
+ e="-B 32 -H 31 -o $(%C%_IGEN_DC) -F $${f}" ;; \
+ esac; \
+ $(IGEN_RUN) \
+ $(%C%_IGEN_TRACE) \
+ $${e} \
+ -I $(srcdir)/%D% \
+ -Werror \
+ -Wnodiscard \
+ -M $${m} \
+ -G gen-direct-access \
+ -G gen-zero-r0 \
+ -i $(%C%_IGEN_INSN) \
+ -P $${p}_ \
+ -x \
+ -n $${p}_icache.h -hc %D%/$${p}_icache.h \
+ -n $${p}_icache.c -c %D%/$${p}_icache.c \
+ -n $${p}_semantics.h -hs %D%/$${p}_semantics.h \
+ -n $${p}_semantics.c -s %D%/$${p}_semantics.c \
+ -n $${p}_idecode.h -hd %D%/$${p}_idecode.h \
+ -n $${p}_idecode.c -d %D%/$${p}_idecode.c \
+ -n $${p}_model.h -hm %D%/$${p}_model.h \
+ -n $${p}_model.c -m %D%/$${p}_model.c \
+ -n $${p}_support.h -hf %D%/$${p}_support.h \
+ -n $${p}_support.c -f %D%/$${p}_support.c \
+ -n $${p}_engine.h -he %D%/$${p}_engine.h \
+ -n $${p}_engine.c -e %D%/$${p}_engine.c \
+ || exit; \
+ done
+ $(AM_V_at)touch $@
+
+%D%/stamp-gen-mode-multi-run: %D%/m16run.c %D%/micromipsrun.c
+ $(AM_V_GEN)\
+ for t in $(SIM_MIPS_MULTI_IGEN_CONFIGS); do \
+ case $${t} in \
+ m16*) \
+ m=`echo $${t} | sed -e 's/^m16//' -e 's/:.*//'`; \
+ o=%D%/m16$${m}_run.c; \
+ sed < $(srcdir)/%D%/m16run.c > $$o.tmp \
+ -e "s/^sim_/m16$${m}_/" \
+ -e "/include/s/sim-engine/m16$${m}_engine/" \
+ -e "s/m16_/m16$${m}_/" \
+ -e "s/m32_/m32$${m}_/" \
+ || exit 1; \
+ $(SHELL) $(srcroot)/move-if-change $$o.tmp $$o; \
+ ;;\
+ micromips32*) \
+ m=`echo $${t} | sed -e 's/^micromips32//' -e 's/:.*//'`; \
+ o=%D%/micromips$${m}_run.c; \
+ sed < $(srcdir)/%D%/micromipsrun.c > $$o.tmp \
+ -e "s/^sim_/micromips32$${m}_/" \
+ -e "/include/s/sim-engine/micromips32$${m}_engine/" \
+ -e "s/micromips16_/micromips16$${m}_/" \
+ -e "s/micromips32_/micromips32$${m}_/" \
+ -e "s/m32_/m32$${m}_/" \
+ || exit 1; \
+ $(SHELL) $(srcroot)/move-if-change $$o.tmp $$o; \
+ ;;\
+ micromips64*) \
+ m=`echo $${t} | sed -e 's/^micromips64//' -e 's/:.*//'`; \
+ o=%D%/micromips$${m}_run.c; \
+ sed < $(srcdir)/%D%/micromipsrun.c > $$o.tmp \
+ -e "s/^sim_/micromips64$${m}_/" \
+ -e "/include/s/sim-engine/micromips64$${m}_engine/" \
+ -e "s/micromips16_/micromips16$${m}_/" \
+ -e "s/micromips32_/micromips64$${m}_/" \
+ -e "s/m32_/m64$${m}_/" \
+ || exit 1; \
+ $(SHELL) $(srcroot)/move-if-change $$o.tmp $$o; \
+ ;;\
+ esac \
+ done
+ $(AM_V_at)touch $@
+
MOSTLYCLEANFILES += $(%C%_BUILD_OUTPUTS)
## These are created by mips/acinclude.m4 during configure time.
DISTCLEANFILES += %D%/multi-include.h %D%/multi-run.c
--
2.39.0
next prev parent reply other threads:[~2022-12-25 19:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-25 7:28 [PATCH] sim: mips: drop unused micromips igen logic Mike Frysinger
2022-12-25 19:28 ` [PATCH 1/8] sim: mips: rename multi_flags to igen_itable_flags Mike Frysinger
2022-12-25 19:28 ` [PATCH 2/8] sim: mips: unify itable generation (a bit) Mike Frysinger
2022-12-25 19:28 ` [PATCH 3/8] sim: mips: hoist itable igen rules up to common builds Mike Frysinger
2022-12-25 19:28 ` [PATCH 4/8] sim: mips: rename "igen" generation mode to "single" Mike Frysinger
2022-12-25 19:28 ` [PATCH 5/8] sim: mips: hoist "single" igen rules up to common builds Mike Frysinger
2022-12-25 19:28 ` [PATCH 6/8] sim: mips: hoist "m16" " Mike Frysinger
2022-12-25 19:28 ` Mike Frysinger [this message]
2022-12-25 19:28 ` [PATCH 8/8] sim: build: clean up unused codegen logic Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221225192852.1940-7-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).