From e6a6f5c14691bd6b03ed8152cd2fb79124a087a7 Mon Sep 17 00:00:00 2001 From: rrt Date: Mon, 1 Oct 2001 14:34:51 +0000 Subject: [PATCH] [project @ 2001-10-01 14:34:51 by rrt] Track reality a bit. --- ghc/compiler/ilxGen/tests/build.mk | 137 ++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 68 deletions(-) diff --git a/ghc/compiler/ilxGen/tests/build.mk b/ghc/compiler/ilxGen/tests/build.mk index 7f4ab68..285fd5d 100644 --- a/ghc/compiler/ilxGen/tests/build.mk +++ b/ghc/compiler/ilxGen/tests/build.mk @@ -30,75 +30,75 @@ GhcWithIlx=YES ILXized=YES -# These are common to all the ILX ways -GHC_ILX_OPTS+=-filx -fruntime-types -DILX -DNO_BIG_TUPLES -dcore-lint +GhcHcOpts+=-DILX -DNO_BIG_TUPLES +GhcLibHcOpts+=-optI--mono -optI--add-suffix-to-assembly -optImsilxlib -optI--suffix-to-add -optI.mono # Each set of args below defines one ILX way. -ALL_WAYS+=ilx-Onot-generic -WAY_ilx-Onot-generic_NAME=ILX with Haskell Optimizer Off to run on Generic CLR -WAY_ilx-Onot-generic_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-generic_ILX2IL_OPTS=--generic -WAY_ilx-Onot-generic_ILX=YES - -ALL_WAYS+=ilx-Onot-fullgeneric-verifiable -WAY_ilx-Onot-fullgeneric-verifiable_NAME=ILX with Haskell Optimizer Off to run on Generic CLR -WAY_ilx-Onot-fullgeneric-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-fullgeneric-verifiable_ILX2IL_OPTS=--fullgeneric --verifiable -WAY_ilx-Onot-fullgeneric-verifiable_ILX=YES - -ALL_WAYS+=ilx-Onot-repgeneric-verifiable -WAY_ilx-Onot-repgeneric-verifiable_NAME=ILX with Haskell Optimizer Off to run on Generic CLR -WAY_ilx-Onot-repgeneric-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-repgeneric-verifiable_ILX2IL_OPTS=--repgeneric --verifiable -WAY_ilx-Onot-repgeneric-verifiable_ILX=YES - -ALL_WAYS+=ilx-O-generic -WAY_ilx-O-generic_NAME=ILX with Haskell Optimizer On to run on Generic CLR -WAY_ilx-O-generic_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O -WAY_ilx-O-generic_ILX2IL_OPTS=--generic -WAY_ilx-O-generic_ILX=YES - -ALL_WAYS+=ilx-Onot-mono -WAY_ilx-Onot-mono_NAME=ILX with Haskell Optimizer Off to run on V1 CLR -WAY_ilx-Onot-mono_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-mono_ILX2IL_OPTS=--mono -WAY_ilx-Onot-mono_ILX=YES - -ALL_WAYS+=ilx-Onot-mono-verifiable -WAY_ilx-Onot-mono-verifiable_NAME=ILX with Haskell Optimizer Off to run on V1 CLR, verifiable code (CURRENTLY WILL NOT RUN BECAUSE OF LACK OF HIGHER KINDED TYPE PARAMETERS BUT IS USEFUL TO FIND BUGS USING THE VERIFIER) -WAY_ilx-Onot-mono-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-mono-verifiable_ILX2IL_OPTS=--mono --verifiable -WAY_ilx-Onot-mono-verifiable_ILX=YES - -ALL_WAYS+=ilx-O-mono -WAY_ilx-O-mono_NAME=ILX with Haskell Optimizer On to run on V1 CLR -WAY_ilx-O-mono_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O -WAY_ilx-O-mono_ILX2IL_OPTS=--mono -WAY_ilx-O-mono_ILX=YES - -ALL_WAYS+=ilx-Onot-generic-traced -WAY_ilx-Onot-generic-traced_NAME=ILX with Haskell Optimizer Off to run on Generic CLR -WAY_ilx-Onot-generic-traced_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-generic-traced_ILX2IL_OPTS=--generic --traced -WAY_ilx-Onot-generic-traced_ILX=YES - -ALL_WAYS+=ilx-O-generic-traced -WAY_ilx-O-generic-traced_NAME=ILX with Haskell Optimizer On to run on Generic CLR -WAY_ilx-O-generic-traced_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O -WAY_ilx-O-generic-traced_ILX2IL_OPTS=--generic --traced -WAY_ilx-O-generic-traced_ILX=YES - -ALL_WAYS+=ilx-Onot-mono-traced -WAY_ilx-Onot-mono-traced_NAME=ILX with Haskell Optimizer Off to run on V1 CLR -WAY_ilx-Onot-mono-traced_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot -WAY_ilx-Onot-mono-traced_ILX2IL_OPTS=--mono --traced -WAY_ilx-Onot-mono-traced_ILX=YES - -ALL_WAYS+=ilx-O-mono-traced -WAY_ilx-O-mono-traced_NAME=ILX with Haskell Optimizer On to run on V1 CLR -WAY_ilx-O-mono-traced_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O -WAY_ilx-O-mono-traced_ILX2IL_OPTS=--mono --traced -WAY_ilx-O-mono-traced_ILX=YES +#ALL_WAYS+=ilx-Onot-generic +#WAY_ilx-Onot-generic_NAME=ILX with Haskell Optimizer Off to run on Generic CLR +#WAY_ilx-Onot-generic_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-generic_ILX2IL_OPTS=--generic +#WAY_ilx-Onot-generic_ILX=YES + +#ALL_WAYS+=ilx-Onot-fullgeneric-verifiable +#WAY_ilx-Onot-fullgeneric-verifiable_NAME=ILX with Haskell Optimizer Off to run on Generic CLR +#WAY_ilx-Onot-fullgeneric-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-fullgeneric-verifiable_ILX2IL_OPTS=--fullgeneric --verifiable +#WAY_ilx-Onot-fullgeneric-verifiable_ILX=YES + +#ALL_WAYS+=ilx-Onot-repgeneric-verifiable +#WAY_ilx-Onot-repgeneric-verifiable_NAME=ILX with Haskell Optimizer Off to run on Generic CLR +#WAY_ilx-Onot-repgeneric-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-repgeneric-verifiable_ILX2IL_OPTS=--repgeneric --verifiable +#WAY_ilx-Onot-repgeneric-verifiable_ILX=YES + +#ALL_WAYS+=ilx-O-generic +#WAY_ilx-O-generic_NAME=ILX with Haskell Optimizer On to run on Generic CLR +#WAY_ilx-O-generic_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O +#WAY_ilx-O-generic_ILX2IL_OPTS=--generic +#WAY_ilx-O-generic_ILX=YES + +#ALL_WAYS+=ilx-Onot-mono +#WAY_ilx-Onot-mono_NAME=ILX with Haskell Optimizer Off to run on V1 CLR +#WAY_ilx-Onot-mono_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-mono_ILX2IL_OPTS=--mono +#WAY_ilx-Onot-mono_ILX=YES + +#ALL_WAYS+=ilx-Onot-mono-verifiable +#WAY_ilx-Onot-mono-verifiable_NAME=ILX with Haskell Optimizer Off to run on V1 CLR, verifiable code (CURRENTLY WILL NOT RUN BECAUSE OF LACK OF HIGHER KINDED TYPE PARAMETERS BUT IS USEFUL TO FIND BUGS USING THE VERIFIER) +#WAY_ilx-Onot-mono-verifiable_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-mono-verifiable_ILX2IL_OPTS=--mono --verifiable +#WAY_ilx-Onot-mono-verifiable_ILX=YES + +#ALL_WAYS+=ilx-O-mono +#WAY_ilx-O-mono_NAME=ILX with Haskell Optimizer On to run on V1 CLR +#WAY_ilx-O-mono_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O +#WAY_ilx-O-mono_ILX2IL_OPTS=--mono +#WAY_ilx-O-mono_ILX=YES + +#ALL_WAYS+=ilx-Onot-generic-traced +#WAY_ilx-Onot-generic-traced_NAME=ILX with Haskell Optimizer Off to run on Generic CLR +#WAY_ilx-Onot-generic-traced_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-generic-traced_ILX2IL_OPTS=--generic --traced +#WAY_ilx-Onot-generic-traced_ILX=YES + +#ALL_WAYS+=ilx-O-generic-traced +#WAY_ilx-O-generic-traced_NAME=ILX with Haskell Optimizer On to run on Generic CLR +#WAY_ilx-O-generic-traced_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O +#WAY_ilx-O-generic-traced_ILX2IL_OPTS=--generic --traced +#WAY_ilx-O-generic-traced_ILX=YES + +#ALL_WAYS+=ilx-Onot-mono-traced +#WAY_ilx-Onot-mono-traced_NAME=ILX with Haskell Optimizer Off to run on V1 CLR +#WAY_ilx-Onot-mono-traced_HC_OPTS=-buildtag ilx-Onot $(GHC_ILX_OPTS) -Onot +#WAY_ilx-Onot-mono-traced_ILX2IL_OPTS=--mono --traced +#WAY_ilx-Onot-mono-traced_ILX=YES + +#ALL_WAYS+=ilx-O-mono-traced +#WAY_ilx-O-mono-traced_NAME=ILX with Haskell Optimizer On to run on V1 CLR +#WAY_ilx-O-mono-traced_HC_OPTS=-buildtag ilx-O $(GHC_ILX_OPTS) -O +#WAY_ilx-O-mono-traced_ILX2IL_OPTS=--mono --traced +#WAY_ilx-O-mono-traced_ILX=YES # Put a "." after the Haskell portion of the way. Way names can't contain # dots for some reason elsewhere in the Make system. But we need to be able @@ -108,7 +108,8 @@ ilx_way=$(subst ilx-Onot-,ilx-Onot.,$(subst ilx-O-,ilx-O.,$(way))) ilx2il_suffix=$(subst ilx-Onot.,.,$(subst ilx-O.,.,$(ilx_way))) hs2ilx_suffix=$(subst $(ilx2il_suffix),,$(ilx_way)) HS_ILX=$(subst $(way),$(hs2ilx_suffix),$(HS_OBJS)) -HS_IL=$(subst $(hs2ilx_suffix)_o,$(ilx_way).il,$(HS_ILX)) +#HS_IL=$(subst $(hs2ilx_suffix)_o,$(ilx_way).il,$(HS_ILX)) +HS_IL=$(subst .o,.il,$(HS_ILX)) ILVALID=C:/devel/fcom/bin/ilvalid.exe ILVERIFY=C:/devel/fcom/bin/ilverify.exe -- 1.7.10.4