Simon Marlow [Thu, 3 Dec 2009 08:59:30 +0000 (08:59 +0000)]
Fix profiling build
simonpj@microsoft.com [Wed, 2 Dec 2009 17:42:56 +0000 (17:42 +0000)]
More work on the simplifier's inlining strategies
This patch collects a small raft of related changes
* Arrange that during
(a) rule matching and
(b) uses of exprIsConApp_maybe
we "look through" unfoldings only if they are active
in the phase. Doing this for (a) required a bit of
extra plumbing in the rule matching code, but I think
it's worth it.
One wrinkle is that even if inlining is off (in the 'gentle'
phase of simplification) during rule matching we want to
"look through" things with inlinings.
See SimplUtils.activeUnfInRule.
This fixes a long-standing bug, where things that were
supposed to be (say) NOINLINE, could still be poked into
via exprIsConApp_maybe.
* In the above cases, also check for (non-rule) loop breakers;
we never look through these. This fixes a bug that could make
the simplifier diverge (and did for Roman).
Test = simplCore/should_compile/dfun-loop
* Try harder not to choose a DFun as a loop breaker. This is
just a small adjustment in the OccurAnal scoring function
* In the scoring function in OccurAnal, look at the InlineRule
unfolding (if there is one) not the actual RHS, beause the
former is what'll be inlined.
* Make the application of any function to dictionary arguments
CONLIKE. Thus (f d1 d2) is CONLIKE.
Encapsulated in CoreUtils.isExpandableApp
Reason: see Note [Expandable overloadings] in CoreUtils
* Make case expressions seem slightly smaller in CoreUnfold.
This reverses an unexpected consequences of charging for
alternatives.
Refactorings
~~~~~~~~~~~~
* Signficantly refactor the data type for Unfolding (again).
The result is much nicer.
* Add type synonym BasicTypes.CompilerPhase = Int
and use it
Many of the files touched by this patch are simply knock-on
consequences of these two refactorings.
simonpj@microsoft.com [Mon, 30 Nov 2009 17:52:04 +0000 (17:52 +0000)]
Fix Trac #3100: reifyType
A type without any leading foralls may still have constraints
eg: ?x::Int => Int -> Int
But reifyType was failing in this case.
Merge to 6.12.
simonpj@microsoft.com [Mon, 30 Nov 2009 17:44:41 +0000 (17:44 +0000)]
Fix Trac #3102: pre-matching polytypes
When *pre-matching* two types
forall a. C1 => t1 ~ forall a. C2 => t2
we were matching t1~t2, but totally ignoring C1,C2
That's utterly wrong when pre-matching
(?p::Int) => String ~ a
because we emerge with a:=String!
All this is part of the impredicative story, which is about
to go away, but still.
Worth merging this to 6.12
Simon Marlow [Wed, 2 Dec 2009 14:45:49 +0000 (14:45 +0000)]
threadStackUnderflow: put the new TSO on the mut list if necessary
Simon Marlow [Wed, 2 Dec 2009 13:41:21 +0000 (13:41 +0000)]
don't sanity check the whole stack when switching interp<->compiled
Simon Marlow [Wed, 2 Dec 2009 13:40:41 +0000 (13:40 +0000)]
fix to sanity checking for ThreadRelocated TSOs
Simon Marlow [Wed, 2 Dec 2009 13:40:20 +0000 (13:40 +0000)]
sanity check the top stack frame, not the whole stack
Simon Marlow [Tue, 1 Dec 2009 16:03:21 +0000 (16:03 +0000)]
Make allocatePinned use local storage, and other refactorings
This is a batch of refactoring to remove some of the GC's global
state, as we move towards CPU-local GC.
- allocateLocal() now allocates large objects into the local
nursery, rather than taking a global lock and allocating
then in gen 0 step 0.
- allocatePinned() was still allocating from global storage and
taking a lock each time, now it uses local storage.
(mallocForeignPtrBytes should be faster with -threaded).
- We had a gen 0 step 0, distinct from the nurseries, which are
stored in a separate nurseries[] array. This is slightly strange.
I removed the g0s0 global that pointed to gen 0 step 0, and
removed all uses of it. I think now we don't use gen 0 step 0 at
all, except possibly when there is only one generation. Possibly
more tidying up is needed here.
- I removed the global allocate() function, and renamed
allocateLocal() to allocate().
- the alloc_blocks global is gone. MAYBE_GC() and
doYouWantToGC() now check the local nursery only.
Simon Marlow [Tue, 1 Dec 2009 12:28:01 +0000 (12:28 +0000)]
Free full_prog_argv at exit, closing a memory leak
Simon Marlow [Tue, 1 Dec 2009 11:34:48 +0000 (11:34 +0000)]
free cap->saved_mut_lists too
fixes some memory leakage at shutdown
Simon Marlow [Tue, 1 Dec 2009 11:33:52 +0000 (11:33 +0000)]
exitScheduler: move boundTaskExiting call outside #ifdef THREADED_RTS
Fixes a little leaked memory at shutdown in non-threaded RTS
Ian Lynagh [Tue, 1 Dec 2009 19:05:44 +0000 (19:05 +0000)]
Use dlltool from the in-tree mingw installation
We only use dlltool on Windows, and this way we don't require that
the user has it installed.
Ian Lynagh [Tue, 1 Dec 2009 15:01:49 +0000 (15:01 +0000)]
Fix Commentary link in the HACKING file; trac #3706
Ian Lynagh [Tue, 1 Dec 2009 17:33:39 +0000 (17:33 +0000)]
Add an entry fo the ghci command :run to the user guide
Ian Lynagh [Tue, 1 Dec 2009 17:05:50 +0000 (17:05 +0000)]
Fix typo in docs
Ian Lynagh [Tue, 1 Dec 2009 13:36:09 +0000 (13:36 +0000)]
Delay expansion of some makefile variables until they are available
Ian Lynagh [Tue, 1 Dec 2009 13:11:23 +0000 (13:11 +0000)]
Call $(SED) rather than sed
Ian Lynagh [Tue, 1 Dec 2009 13:07:41 +0000 (13:07 +0000)]
Look for sed as gsed first
Solaris's sed apparently doesn't understand [:space:]
Ian Lynagh [Tue, 1 Dec 2009 12:59:27 +0000 (12:59 +0000)]
Avoid running empty for loops; fixes trac #3683
Solaris's sh gives
/bin/sh: syntax error at line 1: `;' unexpected
when faced with something like
for x in ; do ...; done
Patch from Christian Maeder.
Simon Marlow [Tue, 1 Dec 2009 15:42:54 +0000 (15:42 +0000)]
Fix PS file generation
(the image doesn't work, but at least db2latex doesn't fall over)
Simon Marlow [Mon, 30 Nov 2009 15:18:36 +0000 (15:18 +0000)]
Implement a new heap-tuning option: -H
-H alone causes the RTS to use a larger nursery, but without exceeding
the amount of memory that the application is already using. It trades
off GC time against locality: the default setting is to use a
fixed-size 512k nursery, but this is sometimes worse than using a very
large nursery despite the worse locality.
Not all programs get faster, but some programs that use large heaps do
much better with -H. e.g. this helps a lot with #3061 (binary-trees),
though not as much as specifying -H<large>. Typically using -H<large>
is better than plain -H, because the runtime doesn't know ahead of
time how much memory you want to use.
Should -H be on by default? I'm not sure, it makes some programs go
slower, but others go faster.
Simon Marlow [Sun, 29 Nov 2009 16:42:51 +0000 (16:42 +0000)]
Store a destination step in the block descriptor
At the moment, this just saves a memory reference in the GC inner loop
(worth a percent or two of GC time). Later, it will hopefully let me
experiment with partial steps, and simplifying the generation/step
infrastructure.
Simon Marlow [Mon, 30 Nov 2009 13:27:03 +0000 (13:27 +0000)]
Fix the prof_scc.png image in the profiling section (#3694)
Simon Marlow [Mon, 30 Nov 2009 12:20:40 +0000 (12:20 +0000)]
document 'recache' command in the help output (#3684)
Simon Marlow [Mon, 30 Nov 2009 11:23:27 +0000 (11:23 +0000)]
Check whether the main function is actually exported (#414)
Simon Marlow [Mon, 30 Nov 2009 11:26:05 +0000 (11:26 +0000)]
Avoid using non-standard GNU tar option --force-local
Matthias Kilian [Sun, 15 Nov 2009 17:54:05 +0000 (17:54 +0000)]
Reorder ALL_RTS_LIBS
ALL_RTS_LIBS is (ab)used for linking ghc when BootingFromHc=Yes,
which needs libHSrtsmain.a before libHSrts.a.
Ian Lynagh [Sun, 29 Nov 2009 16:55:34 +0000 (16:55 +0000)]
Update dependencies
Ian Lynagh [Sun, 29 Nov 2009 16:51:41 +0000 (16:51 +0000)]
Follow Cabal changes
Ian Lynagh [Sun, 29 Nov 2009 16:30:44 +0000 (16:30 +0000)]
Tweak layout to work with alternative layout rule
Ian Lynagh [Sun, 29 Nov 2009 15:54:54 +0000 (15:54 +0000)]
Tweak the alternative layout rule: {} contains commas
Ian Lynagh [Sun, 29 Nov 2009 15:39:33 +0000 (15:39 +0000)]
Correct the advanceSrcLoc calculation for tabs
It was off-by-one
Ian Lynagh [Sun, 29 Nov 2009 15:23:23 +0000 (15:23 +0000)]
Tweak alternative layout rule
Ian Lynagh [Sun, 29 Nov 2009 14:58:40 +0000 (14:58 +0000)]
Make the alternative layout rule cope with file pragmas
Ian Lynagh [Sun, 29 Nov 2009 03:10:29 +0000 (03:10 +0000)]
Give more informative error messages
We used to just get
ghc: panic! (the 'impossible' happened)
(GHC version 6.13.
20091128 for x86_64-unknown-linux):
too few bytes. Failed reading at byte position 32753
with no indication of what was being parsed.
Ian Lynagh [Sat, 28 Nov 2009 15:12:04 +0000 (15:12 +0000)]
Teach advanceSrcLoc about tab characters
Ian Lynagh [Sat, 28 Nov 2009 15:07:31 +0000 (15:07 +0000)]
Whitespace only
Ian Lynagh [Fri, 27 Nov 2009 22:40:50 +0000 (22:40 +0000)]
Columns now start at 1, as lines already did
Also corrected a couple of line 0's to line 1
Ian Lynagh [Fri, 27 Nov 2009 15:01:01 +0000 (15:01 +0000)]
Remove configure tests on tarballs that no longer exist
Ian Lynagh [Fri, 27 Nov 2009 01:19:32 +0000 (01:19 +0000)]
Implement non-decreasing do indentation in the alternative layout rule
Simon Marlow [Wed, 25 Nov 2009 15:36:49 +0000 (15:36 +0000)]
add docs for Unicode entities in #2978
Simon Marlow [Fri, 18 Sep 2009 13:03:33 +0000 (13:03 +0000)]
Apply patch from #2978: add more Unicode syntax
Simon Marlow [Wed, 25 Nov 2009 14:17:30 +0000 (14:17 +0000)]
Use UTF-8 explicitly for InstalledPackageInfo
So ghc-pkg register/update takes input in UTF-8, and ghc-pkg dump
outputs in UTF-8. Textual package config files in the package DB are
assumed to be in UTF-8.
simonpj@microsoft.com [Thu, 26 Nov 2009 16:32:41 +0000 (16:32 +0000)]
Comments only, esp about RecStmts
Ian Lynagh [Wed, 25 Nov 2009 23:19:01 +0000 (23:19 +0000)]
Fix a bug in alternative layout rule
Ian Lynagh [Wed, 25 Nov 2009 23:06:16 +0000 (23:06 +0000)]
Fix a bug in alternative layout
And make the code simpler in the process!
Ian Lynagh [Wed, 25 Nov 2009 20:58:09 +0000 (20:58 +0000)]
Bug fix for alternative layout rule
Ian Lynagh [Wed, 25 Nov 2009 19:38:54 +0000 (19:38 +0000)]
Tweak alternative layout rule
Ian Lynagh [Wed, 25 Nov 2009 18:24:21 +0000 (18:24 +0000)]
Add unboxed parentheses to the alternative layout rule
Ian Lynagh [Wed, 25 Nov 2009 17:18:15 +0000 (17:18 +0000)]
Tweak the warning suppression flags used in Lexer
Ian Lynagh [Wed, 25 Nov 2009 17:16:56 +0000 (17:16 +0000)]
Implement the alternative layout rule
Caution: Largely untested
Ian Lynagh [Tue, 24 Nov 2009 23:37:26 +0000 (23:37 +0000)]
Fix some warning in Lexer
Simon Marlow [Wed, 25 Nov 2009 12:59:17 +0000 (12:59 +0000)]
threadStackOverflow: check whether stack squeezing released some stack (#3677)
In a stack overflow situation, stack squeezing may reduce the stack
size, but we don't know whether it has been reduced enough for the
stack check to succeed if we try again. Fortunately stack squeezing
is idempotent, so all we need to do is record whether *any* squeezing
happened. If we are at the stack's absolute -K limit, and stack
squeezing happened, then we try running the thread again.
We also want to avoid enlarging the stack if squeezing has already
released some of it. However, we don't want to get into a
pathalogical situation where a thread has a nearly full stack (near
its current limit, but not near the absolute -K limit), keeps
allocating a little bit, squeezing removes a little bit, and then it
runs again. So to avoid this, if we squeezed *and* there is still
less than BLOCK_SIZE_W words free, then we enlarge the stack anyway.
Simon Marlow [Wed, 25 Nov 2009 10:49:54 +0000 (10:49 +0000)]
add a comment to TSO_MARKED
Roman Leshchinskiy [Wed, 25 Nov 2009 11:59:53 +0000 (11:59 +0000)]
Pass --no-user-package-conf to ghc-pkg in bindisttest
David Waern [Tue, 24 Nov 2009 21:03:08 +0000 (21:03 +0000)]
Add a note saying what Haddock relies on about Instance.is_dfun
Ian Lynagh [Tue, 24 Nov 2009 01:13:13 +0000 (01:13 +0000)]
Treat () as an enumeration tycon
This fixes deriving Ord (), which previously failed with
ghc-stage1: panic! (the 'impossible' happened)
(GHC version 6.13.
20091123 for x86_64-unknown-linux):
TcGenDeriv:mk_FunBind
Ian Lynagh [Tue, 24 Nov 2009 00:32:21 +0000 (00:32 +0000)]
Whitespace only
Ian Lynagh [Mon, 23 Nov 2009 20:03:08 +0000 (20:03 +0000)]
inline has moved to GHC.Magic
Ian Lynagh [Fri, 20 Nov 2009 15:39:53 +0000 (15:39 +0000)]
Use the ghc-perl tarball on Windows, instead of the msys one
Ian Lynagh [Fri, 20 Nov 2009 22:38:30 +0000 (22:38 +0000)]
Install perl on Windows
simonpj@microsoft.com [Fri, 20 Nov 2009 16:19:11 +0000 (16:19 +0000)]
Remove cprAnalysis directory from hs-source-dirs
Ian Lynagh [Fri, 20 Nov 2009 12:56:56 +0000 (12:56 +0000)]
Remove -fasm from mk/validate-settings.mk
Makes it easier to do unregisterised validate runs
Ian Lynagh [Fri, 20 Nov 2009 12:53:42 +0000 (12:53 +0000)]
Fix some dependencies in bindists
We can't depend on sources in a bindist, because we don't have the sources.
Ian Lynagh [Thu, 19 Nov 2009 16:05:27 +0000 (16:05 +0000)]
Add a rule to allow us to sdist libraries easily
Simon Marlow [Thu, 19 Nov 2009 14:24:22 +0000 (14:24 +0000)]
Check upper/lower bounds on various RTS flags (#3633)
Also, make K mean 1024 rather than 1000, in RTS flags (similarly for M
and G). The main reason I want to change it is that otherwise this
might be confusing:
exp3_8: error in RTS option -H4k: size outside allowed range (4096 -
18446744073709551615)
And I think the original reason for using 1000 instead of 1024,
worries about direct-mapped caches, is not an issue in this context
(even if you can find a direct-mapped cache these days).
Simon Marlow [Thu, 19 Nov 2009 14:01:43 +0000 (14:01 +0000)]
define HS_WORD_MAX
Simon Marlow [Thu, 19 Nov 2009 13:52:30 +0000 (13:52 +0000)]
Print the prog name in errorBelch() even if prog_argv is not set yet
This means we get the prog name in error messages from the flag parser
Roman Leshchinskiy [Thu, 12 Nov 2009 07:04:55 +0000 (07:04 +0000)]
Remove dead code
simonpj@microsoft.com [Thu, 19 Nov 2009 15:43:47 +0000 (15:43 +0000)]
Remove the (very) old strictness analyser
I finally got tired of the #ifdef OLD_STRICTNESS stuff. I had been
keeping it around in the hope of doing old-to-new comparisions, but
have failed to do so for many years, so I don't think it's going to
happen. This patch deletes the clutter.
simonpj@microsoft.com [Thu, 19 Nov 2009 13:27:11 +0000 (13:27 +0000)]
Make INLINE warning more precise
simonpj@microsoft.com [Thu, 19 Nov 2009 12:57:11 +0000 (12:57 +0000)]
Implement -fexpose-all-unfoldings, and fix a non-termination bug
The -fexpose-all-unfoldings flag arranges to put unfoldings for *everything*
in the interface file. Of course, this makes the file a lot bigger, but
it also makes it complete, and that's great for supercompilation; or indeed
any whole-program work.
Consequences:
* Interface files need to record loop-breaker-hood. (Previously,
loop breakers were never exposed, so that info wasn't necessary.)
Hence a small interface file format change.
* When inlining, must check loop-breaker-hood. (Previously, loop
breakers didn't have an unfolding at all, so no need to check.)
* Ditto in exprIsConApp_maybe. Roman actually tripped this bug,
because a DFun, which had an unfolding, was also a loop breaker
* TidyPgm.tidyIdInfo must be careful to preserve loop-breaker-hood
So Id.idUnfolding checks for loop-breaker-hood and returns NoUnfolding
if so. When you want the unfolding regardless of loop-breaker-hood,
use Id.realIdUnfolding.
I have not documented the flag yet, because it's experimental. Nor
have I tested it thoroughly. But with the flag off (the normal case)
everything should work.
simonpj@microsoft.com [Thu, 19 Nov 2009 12:45:24 +0000 (12:45 +0000)]
Re-implement the binder-swap stuff in OccurAnal
This is a pretty big patch, but it has a very local effect.
It affects only the binder-swap mechanism in OccurAnal, which
was not working well becuase it's more subtle than I'd realised
(See Note [getProxies is subtle]). I think this does a much
better job.
simonpj@microsoft.com [Thu, 19 Nov 2009 12:41:27 +0000 (12:41 +0000)]
Try harder not to make DFuns into loop breakers
See Note [DFuns should not be loop breakers]
simonpj@microsoft.com [Tue, 17 Nov 2009 13:23:08 +0000 (13:23 +0000)]
Extend the GHCi FAQ slightly
Ian Lynagh [Thu, 19 Nov 2009 14:49:27 +0000 (14:49 +0000)]
Add gnutar to the list of names we use when looking for GNU tar
Ian Lynagh [Thu, 19 Nov 2009 14:08:11 +0000 (14:08 +0000)]
Add support for the man page to the new build system
simonpj@microsoft.com [Thu, 19 Nov 2009 12:37:04 +0000 (12:37 +0000)]
Refactor case-merging and identical-alternative optimisations
These two optimisations were originally done by SimplUtils.mkCase
*after* all the pieces have been simplified. Some while ago I
moved them *before*, so they were done by SimplUtils.prepareAlts.
It think the reason was that I couldn't rely on the dead-binder
information on OutIds, and that info is useful in these optimisations.
However,
(a) Other changes (notably moving case-binder-swap to OccurAnal)
have meant that dead-binder information is accurate in
OutIds
(b) When there is a cascade of case-merges, they happen in
one sweep if you do it after, but in many sweeps if you
do it before. Reason: doing it after means you are looking
at nice simplified Core.
simonpj@microsoft.com [Thu, 19 Nov 2009 11:57:36 +0000 (11:57 +0000)]
Fix a nasty infelicity in the size computation of CoreUnfold
The size computation was treating gigantic case expressions as
practically free, which they really aren't. It was exacerbated by
recent decisions to charge 0 for naked variables and constructors, so
the RHS of the case might look free too. A good example was
Foreign.C.Error.errnoToIOError, which hsa lots of join points
that were getting inlined way to vigorously, so we had:
*** Simplifier Phase 2 [main]:
Result size = 2983
*** Core Linted result of Simplifier mode 2 [main], iteration 1 out of 4:
Result size = 640327
*** Core Linted result of Simplifier mode 2 [main], iteration 2 out of 4:
Result size = 1659
Notice that gigantic intermediate!
This patch adds a small charge for each *alternative*. Of course,
that'll also mean that there's a bit less inling of things involving
case expressions.
simonpj@microsoft.com [Thu, 19 Nov 2009 11:51:22 +0000 (11:51 +0000)]
Comments and white space only
Roman Leshchinskiy [Thu, 19 Nov 2009 10:26:39 +0000 (10:26 +0000)]
Fix splitAppTys
Ben.Lippmeier@anu.edu.au [Thu, 19 Nov 2009 00:02:39 +0000 (00:02 +0000)]
Windows DLLs: Slurp across the actually static version of libffi
Ben.Lippmeier@anu.edu.au [Wed, 18 Nov 2009 11:05:48 +0000 (11:05 +0000)]
Windows DLLs: Don't rely on stg/DLL.h being included in RtsAPI.h
Ben.Lippmeier@anu.edu.au [Wed, 18 Nov 2009 11:05:25 +0000 (11:05 +0000)]
Fix warnings about unused imports
Ben.Lippmeier@anu.edu.au [Wed, 18 Nov 2009 09:01:05 +0000 (09:01 +0000)]
Windows DLLs: stifle more warnings about auto imported symbols
Ben.Lippmeier@anu.edu.au [Wed, 18 Nov 2009 05:15:26 +0000 (05:15 +0000)]
Windows DLLs: stifle warnings about symbols being auto imported from DLLs
Ben.Lippmeier@anu.edu.au [Wed, 18 Nov 2009 04:39:01 +0000 (04:39 +0000)]
Windows DLLs: add #ifdefery to turn off DLL import of libffi when building statically.
Ben.Lippmeier@anu.edu.au [Tue, 17 Nov 2009 05:06:48 +0000 (05:06 +0000)]
Windows DLLs: disable extra shutdownHaskell() when unloading the RTS DLL
Ben.Lippmeier@anu.edu.au [Tue, 17 Nov 2009 04:38:51 +0000 (04:38 +0000)]
Windows DLLs: remove dup symbol from def file
Ben.Lippmeier@anu.edu.au [Tue, 17 Nov 2009 04:37:16 +0000 (04:37 +0000)]
Use opt_PIC not #defined __PIC__ in compiler source.
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:32:40 +0000 (06:32 +0000)]
Windows DLLs: CHARLIKE_closure and INTLIKE_closure aren't defined in this way.
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:31:57 +0000 (06:31 +0000)]
If a comment says "Is this correct?", it's not.
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:30:46 +0000 (06:30 +0000)]
Windows DLLs: gmp is in the integer-gmp package now.
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:15:59 +0000 (06:15 +0000)]
Use DLL aware runIO_closure instead of base_GHCziTopHandler_runIO_closure directly
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:14:45 +0000 (06:14 +0000)]
RTS also uses runSparks_closure from base
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:11:09 +0000 (06:11 +0000)]
Provide extralibs when linking Windows DLLs
Ben.Lippmeier@anu.edu.au [Sat, 14 Nov 2009 06:04:55 +0000 (06:04 +0000)]
Don't share low valued Int and Char closures with Windows DLLs
Ben.Lippmeier@anu.edu.au [Wed, 11 Nov 2009 01:48:21 +0000 (01:48 +0000)]
Windows DLLs: use one import lib for each DLL the RTS needs.
Ben.Lippmeier@anu.edu.au [Tue, 10 Nov 2009 05:12:57 +0000 (05:12 +0000)]
Add autoconf code to locate dlltool on Windows