February 2014 - ghc-devs

[PATCH] rts: unrust 'libbfd' debug symbols parser
by slyich＠gmail.com 16 Feb '14

16 Feb '14

From: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- configure.ac | 3 ++- rts/Printer.c | 10 ++++++++-- rts/RtsStartup.c | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e7fbc7f..e47979c 100644 --- a/configure.ac +++ b/configure.ac @@ -801,7 +801,8 @@ fi dnl ** check whether this machine has BFD and libiberty installed (used for debugging) dnl the order of these tests matters: bfd needs libiberty AC_CHECK_LIB(iberty, xmalloc) -AC_CHECK_LIB(bfd, bfd_uncompress_section_contents) +dnl 'bfd_init' is a rare non-macro in libbfd +AC_CHECK_LIB(bfd, bfd_init) dnl ################################################################ dnl Check for libraries diff --git a/rts/Printer.c b/rts/Printer.c index ca9ca49..ce02b02 100644 --- a/rts/Printer.c +++ b/rts/Printer.c @@ -48,6 +48,9 @@ void printPtr( StgPtr p ) raw = lookupGHCName(p); if (raw != NULL) { printZcoded(raw); + /* it can be just a C symbol, like 'stg_returnToStackTop' */ + debugBelch("<%s>", raw); + debugBelch("[%p]", p); } else { debugBelch("%p", p); } @@ -794,7 +797,7 @@ static void printZcoded( const char *raw ) disabling this for now. */ #ifdef USING_LIBBFD - +#include "../mk/config.h" /* silly BFD's requirement */ #include <bfd.h> /* Fairly ad-hoc piece of code that seems to filter out a lot of @@ -863,7 +866,10 @@ extern void DEBUG_LoadSymbols( char *name ) for( i = 0; i != number_of_symbols; ++i ) { symbol_info info; bfd_get_symbol_info(abfd,symbol_table[i],&info); - /*debugBelch("\t%c\t0x%x \t%s\n",info.type,(nat)info.value,info.name); */ + if (0) + { + debugBelch("\t%c\t0x%x \t%s\n",info.type,(nat)info.value,info.name); + } if (isReal(info.type, info.name)) { num_real_syms += 1; } diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c index aa7306f..5bdef94 100644 --- a/rts/RtsStartup.c +++ b/rts/RtsStartup.c @@ -19,6 +19,7 @@ #include "RtsFlags.h" #include "RtsUtils.h" #include "Prelude.h" +#include "Printer.h" /* DEBUG_LoadSymbols */ #include "Schedule.h" /* initScheduler */ #include "Stats.h" /* initStats */ #include "STM.h" /* initSTM */ @@ -162,6 +163,11 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config) rts_config.rts_opts_enabled, rts_config.rts_opts, rts_config.rts_hs_main); } +#ifdef DEBUG + /* load debugging symbols */ + DEBUG_LoadSymbols((*argv)[0]); +#endif /* DEBUG */ + /* Initialise the stats department, phase 1 */ initStats1(); -- 1.8.5.2

2 1

[PATCH] includes/stg/SMP.h: use 'NOSMP' instead of never defined 'WITHSMP'
by slyich＠gmail.com 16 Feb '14

16 Feb '14

From: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- includes/stg/SMP.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index 01663dd..8d819c7 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -154,7 +154,7 @@ xchg(StgPtr p, StgWord w) : "r" (w), "r" (p) : "memory" ); -#elif !defined(WITHSMP) +#elif defined(NOSMP) result = *p; *p = w; #else @@ -225,7 +225,7 @@ cas(StgVolatilePtr p, StgWord o, StgWord n) : "cc","memory"); return result; -#elif !defined(WITHSMP) +#elif defined(NOSMP) StgWord result; result = *p; if (result == o) { @@ -313,7 +313,7 @@ write_barrier(void) { __asm__ __volatile__ ("" : : : "memory"); #elif arm_HOST_ARCH && !defined(arm_HOST_ARCH_PRE_ARMv7) __asm__ __volatile__ ("dmb st" : : : "memory"); -#elif !defined(WITHSMP) +#elif defined(NOSMP) return; #else #error memory barriers unimplemented on this architecture @@ -332,7 +332,7 @@ store_load_barrier(void) { __asm__ __volatile__ ("membar #StoreLoad" : : : "memory"); #elif arm_HOST_ARCH && !defined(arm_HOST_ARCH_PRE_ARMv7) __asm__ __volatile__ ("dmb" : : : "memory"); -#elif !defined(WITHSMP) +#elif defined(NOSMP) return; #else #error memory barriers unimplemented on this architecture @@ -352,7 +352,7 @@ load_load_barrier(void) { __asm__ __volatile__ ("" : : : "memory"); #elif arm_HOST_ARCH && !defined(arm_HOST_ARCH_PRE_ARMv7) __asm__ __volatile__ ("dmb" : : : "memory"); -#elif !defined(WITHSMP) +#elif defined(NOSMP) return; #else #error memory barriers unimplemented on this architecture -- 1.8.5.2

3 2

[PATCH] compiler/ghc.mk: restore GhcHcOpts variable handling
by slyich＠gmail.com 16 Feb '14

16 Feb '14

From: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- compiler/ghc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 4977e28..d902b7f 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -667,9 +667,9 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci compiler_stage3_CONFIGURE_OPTS += --disable-library-for-ghci # after build-package, because that sets compiler_stage1_HC_OPTS: -compiler_stage1_HC_OPTS += $(GhcStage1HcOpts) -compiler_stage2_HC_OPTS += $(GhcStage2HcOpts) -compiler_stage3_HC_OPTS += $(GhcStage3HcOpts) +compiler_stage1_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) +compiler_stage2_HC_OPTS += $(GhcHcOpts) $(GhcStage2HcOpts) +compiler_stage3_HC_OPTS += $(GhcHcOpts) $(GhcStage3HcOpts) ifneq "$(BINDIST)" "YES" -- 1.8.5.2

2 1

Overlapping names in GHC: ConLike
by Joachim Breitner 15 Feb '14

15 Feb '14

Hi, while reading some code I noticed that we use the term “ConLike” for two different things: From Haskell up to the desugarer, this is a data type to treat data constructors and pattern synonyms together; afterwards, in the world of Core, ConLike is an attribute of expression (exprIsConLik) similar to exprIsHNF. The former use is newer, introduced by the pattern synonym patch. In the long run, there is a risk of confusion, maybe we should rename ConLike module and data type. Any suggestions for a good name? Greetings, Joachim -- Joachim “nomeata” Breitner mail(a)joachim-breitner.de • http://www.joachim-breitner.de/ Jabber: nomeata(a)joachim-breitner.de • GPG-Key: 0x4743206C Debian Developer: nomeata(a)debian.org

3 3

RC2 status
by Austin Seipp 14 Feb '14

14 Feb '14

Hello all! I'm sure some of you are wondering about RC2. Please take a look at this page, which gives the basic overview: https://ghc.haskell.org/trac/ghc/wiki/Status/GHC-7.8/RC1 This currently lists all the active tickets filed against RC1. It lists several categories, but the only one really relevant is 'new' for those reading. Most of the bugs in 'new' will be fixed shortly. I will then merge them (and a lot of others) to 7.8 shortly. This includes #8735, #8736, #8760, and #8770 (and also #8719 and #8748 in 'patch' status.) After talking with Simon, I will also cook up a fix for #8754. So it's closer than it looks! There are two outliers: * #8745 & #8773 - After Richard and Joachim hashed out the details (fairly quickly,) it seems this will go into 7.8 as well. Richard - I suspect you will likely commit #8773 soon? Afterwords, I can still take care of #8745 to enable GND for SafeHaskell, and these can both be merged. Quite easy. * #8696 - this one is the main blocker for RC2. And after I'm done brushing the other stuff up, it will be my main focus as I haven't had time to think about it closely. Reid Barton has already been fantastically helpful with his test case and thoughtful analysis, and perhaps someone else would look. I'd really appreciate extra eyes to help diagnose a possible fix or even a patch - the human parallelism could certainly help. So that's it: most of these are very basic, and I expect to be done with many quite soon. The last bit here is the sticky one, so I encourage people to look if they have a chance, please! Finally, a quick note: https://ghc.haskell.org/trac/ghc/wiki/Status/GHC-7.8/RC1 has content which is generated dynamically. You can automatically make another ticket appear there by: * Setting the version to '7.8.1-rc1'. * Setting the milestone to '7.8.1'. This will make sure it's clearly on my radar. The bugs have slowed down however, which is a good thing: so I imagine this is quite representative of the final ones. Let me know if there are any questions or more importantly if I've missed anything. -- Regards, Austin Seipp, Haskell Consultant Well-Typed LLP, http://www.well-typed.com/

3 2

Re: [commit: ghc] master: Simplify Control Flow Optimisations Cmm pass (99c3ed8)
by Simon Marlow 13 Feb '14

13 Feb '14

Hi Jan - I'm not sure I agree that the case you removed was superfluous. There are two cases we want to replace a branch to a block with the contents of the block itself: (1) when the block is referenced only once (2) when the block is small enough The case you removed was (2). Now, as it happens right now (2) was not doing anything interesting because our definition of "small enough" is "a single branch", but it could in theory be more liberal. There used to be a function called "okToDuplicate" (removed in one of your earlier patches) that made this decision, and our intention was to experiment with extending this to allow duplication of code in some cases. Shortcutting a branch might be ok if the block only contains a single instruction, for example, because then the total number of instructions executed is the same (and there are one fewer branches). Cheers, Simon On 01/02/2014 19:04, git(a)git.haskell.org wrote: > Repository : ssh://git@git.haskell.org/ghc > > On branch : master > Link : http://ghc.haskell.org/trac/ghc/changeset/99c3ed81ac53629771b00a0abbe37c989… > >> --------------------------------------------------------------- > > commit 99c3ed81ac53629771b00a0abbe37c989ea45cd6 > Author: Jan Stolarek <jan.stolarek(a)p.lodz.pl> > Date: Sat Feb 1 18:00:48 2014 +0100 > > Simplify Control Flow Optimisations Cmm pass > > It turns out that one of the cases in the optimization pass was > a special case of another. I remove that specialization since it > does not have impact on compilation time, and the resulting Cmm > is identical. > > >> --------------------------------------------------------------- > > 99c3ed81ac53629771b00a0abbe37c989ea45cd6 > compiler/cmm/CmmContFlowOpt.hs | 37 +++++++++---------------------------- > 1 file changed, 9 insertions(+), 28 deletions(-) > > diff --git a/compiler/cmm/CmmContFlowOpt.hs b/compiler/cmm/CmmContFlowOpt.hs > index 52b95a9..4b8ce6f 100644 > --- a/compiler/cmm/CmmContFlowOpt.hs > +++ b/compiler/cmm/CmmContFlowOpt.hs > @@ -46,25 +46,20 @@ import Prelude hiding (succ, unzip, zip) > -- Note [Control-flow optimisations] > -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -- > --- This optimisation does four things: > +-- This optimisation does three things: > -- > -- - If a block finishes in an unconditonal branch to another block > -- and that is the only jump to that block we concatenate the > -- destination block at the end of the current one. > -- > --- - If a block finishes in an unconditional branch, we may be able > --- to shortcut the destination block. > --- > -- - If a block finishes in a call whose continuation block is a > -- goto, then we can shortcut the destination, making the > -- continuation block the destination of the goto - but see Note > -- [Shortcut call returns]. > -- > --- - For block finishing in conditional branch we try to invert the > --- condition and shortcut destination of alternatives. > --- > -- - For any block that is not a call we try to shortcut the > --- destination(s). > +-- destination(s). Additionally, if a block ends with a > +-- conditional branch we try to invert the condition. > -- > -- Blocks are processed using postorder DFS traversal. A side effect > -- of determining traversal order with a graph search is elimination > @@ -204,11 +199,8 @@ blockConcat splitting_procs g@CmmGraph { g_entry = entry_id } > -- (2) remove b' from the map of blocks > -- (3) remove information about b' from predecessors map > -- > - -- This guard must be first so that we always eliminate blocks that have > - -- only one predecessor. If we had a target block that is both > - -- shorcutable and has only one predecessor and attempted to shortcut it > - -- first we would make that block unreachable but would not remove it > - -- from the graph. > + -- Since we know that the block has only one predecessor we call > + -- mapDelete directly instead of calling decPreds. > -- > -- Note that we always maintain an up-to-date list of predecessors, so > -- we can ignore the contents of shortcut_map > @@ -221,20 +213,6 @@ blockConcat splitting_procs g@CmmGraph { g_entry = entry_id } > , mapDelete b' backEdges ) > > -- If: > - -- (1) current block ends with unconditional branch to b' and > - -- (2) we can shortcut block b' > - -- Then: > - -- (1) concatenate b' at the end of current block, effectively > - -- changing target of uncondtional jump from b' to dest > - -- (2) increase number of predecessors of dest by 1 > - -- (3) decrease number of predecessors of b' by 1 > - | CmmBranch b' <- last > - , Just blk' <- mapLookup b' blocks > - , Just dest <- canShortcut blk' > - = ( mapInsert bid (splice head blk') blocks, shortcut_map, > - decPreds b' $ incPreds dest backEdges ) > - > - -- If: > -- (1) we are splitting proc points (see Note > -- [Shortcut call returns and proc-points]) and > -- (2) current block is a CmmCall or CmmForeignCall with > @@ -263,7 +241,10 @@ blockConcat splitting_procs g@CmmGraph { g_entry = entry_id } > -- conditional > -- (2) attempt to shortcut all destination blocks > -- (3) if new successors of a block are different from the old ones > - -- we update the of predecessors accordingly > + -- update the of predecessors accordingly > + -- > + -- A special case of this is a situation when a block ends with an > + -- unconditional jump to a block that can be shortcut. > | Nothing <- callContinuation_maybe last > = let oldSuccs = successors last > newSuccs = successors swapcond_last > > _______________________________________________ > ghc-commits mailing list > ghc-commits(a)haskell.org > http://www.haskell.org/mailman/listinfo/ghc-commits >

1 0

make binary-dist on Solaris 10.
by Karel Gardas 11 Feb '14

11 Feb '14

Folks, I'm trying to kind of resurrect Solaris 10 support. Got to `make binary-dist' already but now this fails with: cd bindistprep && "/usr/sfw/bin/gtar" hcf - -T ../bindist-list | bzip2 -c > ../bindistprep/ghc-7.8.20140130-i386-unknown-solaris2.tar.bz2 /usr/sfw/bin/gtar: ghc-7.8.20140130/compiler/stage2/doc: Cannot stat: No such file or directory /usr/sfw/bin/gtar: Error exit delayed from previous errors mv bindistprep/*.tar.bz2 . I'd just like to ask here, any idea what tool is responsible for generating this doc content in compiler's stage2 dir? My idea is that some tool(s) is missing on Solaris 10, configure detects this, general build is fine then, but bindist counts with the `doc' dir populated. So just let me know into what direction I shall look... Thanks! Karel

2 2

[PATCH 2/2] use detected GNU sed on expression where Solaris' fails.
by Karel Gardas 10 Feb '14

10 Feb '14

We set SED make variable to configure detected GNU sed command for quite some time now, but surprisingly it is not used in other makefiles. Anyway, this patch fixes a real issue on Solaris 10 where distributed Sun/Oracle sed is not able to cope with required expression, but GNU sed is. The patch is minimal to lower the risk of breakage, but the other approach of fixing all occurrences of `sed' to `$(SED)' is of course also possible. --- rules/build-dependencies.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk index 79350c0..896efa8 100644 --- a/rules/build-dependencies.mk +++ b/rules/build-dependencies.mk @@ -53,7 +53,7 @@ endif # Foo.dyn_o Foo.o : Foo.hs # lines, and create corresponding hi-rule lines # <dollar>(eval <dollar>(call hi-rule,Foo.dyn_hi Foo.hi : %hi: %o Foo.hs)) - sed '/hs$$$$/ p ; \ + $(SED) '/hs$$$$/ p ; \ /hs$$$$/ s/o /hi /g ; \ /hs$$$$/ s/:/ : %hi: %o / ; \ /hs$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/ ; \ -- 1.8.1.4

1 0

[PATCH 1/2] add --with-ar and --with-ranlib configure parameters
by Karel Gardas 10 Feb '14

10 Feb '14

Both --with-ar and --with-ranlib are usable on non-GNU/Linux systems where GNU tools are usually installed (or possible to install), but not into standard location nor with standard name. Tested on Solaris 10. --- configure.ac | 15 +++++++++++++++ mk/config.mk.in | 1 + 2 files changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index e7fbc7f..244fcc0 100644 --- a/configure.ac +++ b/configure.ac @@ -486,6 +486,21 @@ FP_ARG_WITH_PATH_GNU_PROG([NM], [nm], [nm]) NmCmd="$NM" AC_SUBST([NmCmd]) +dnl ** Which ar to use? +dnl -------------------------------------------------------------- +FP_ARG_WITH_PATH_GNU_PROG([AR], [ar], [ar]) +ArCmd="$AR" +fp_prog_ar="$AR" +AC_SUBST([ArCmd]) + +dnl ** Which ranlib to use? +dnl -------------------------------------------------------------- +FP_ARG_WITH_PATH_GNU_PROG([RANLIB], [ranlib], [ranlib]) +RanlibCmd="$RANLIB" +RANLIB="$RanlibCmd" +AC_SUBST([RanlibCmd]) + + # Note: we may not have objdump on OS X, and we only need it on Windows (for DLL checks) case $HostOS_CPP in cygwin32|mingw32) diff --git a/mk/config.mk.in b/mk/config.mk.in index b3d6995..8c0eb49 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -650,6 +650,7 @@ DTRACE = @DtraceCmd@ LD = @LdCmd@ NM = @NmCmd@ +AR = @ArCmd@ OBJDUMP = @ObjdumpCmd@ LLC = @LlcCmd@ -- 1.8.1.4

1 0

[PATCH] fix compilation on Solaris 10 with GNU C 3.4.3
by Karel Gardas 10 Feb '14

10 Feb '14

This patch fixes compilation on Solaris 10 platform which provides GNU C 3.4.3 by default by removing unsupported -ftree-vectorize option. This may penalize Solaris 11, where GNU C 4.6.2 is provided but current cabal does not support OSes version detection and Solaris 10 is still supported (by Oracle) and will be at least till 2021 so let's support it too. --- primitive.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/primitive.cabal b/primitive.cabal index b819e03..666a8f2 100644 --- a/primitive.cabal +++ b/primitive.cabal @@ -44,7 +44,9 @@ Library Install-Includes: primitive-memops.h includes: primitive-memops.h c-sources: cbits/primitive-memops.c - cc-options: -O3 -ftree-vectorize -fomit-frame-pointer -Wall + cc-options: -O3 -fomit-frame-pointer -Wall + if !os(solaris) + cc-options: -ftree-vectorize if arch(i386) || arch(x86_64) cc-options: -msse2 -- 1.8.1.4

1 0