summaryrefslogtreecommitdiff
path: root/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge RtsLabelInfo.Rts* with RtsLabelInfo.Rts*FSBen.Lippmeier@anu.edu.au2009-10-1821-257/+215
|
* Fix the buildIan Lynagh2009-11-061-1/+1
|
* Accept any non-space characters in a header file (#3624)Simon Marlow2009-11-061-1/+3
| | | | | | The FFI spec doesn't say exactly which characters may occur in a header file, so to be on the safe side we'll accept anything that isn't a space.
* Be a tiny bit keener to inline in the RHS of a letsimonpj@microsoft.com2009-11-053-17/+36
| | | | Seee Note [RHS of lets] in CoreUnfold
* Another refactoring on the shape of an Unfoldingsimonpj@microsoft.com2009-11-0510-112/+110
| | | | | | I found that a compulsory unfolding was getting dropped on the floor, so I took that as a hint to tidy up the data type so that it won't happen again. No big change in functionality.
* Add notes to cmm-notes, following conversation with John Diassimonpj@microsoft.com2009-11-051-0/+15
|
* Fix Trac #3640, plus associated refactoringsimonpj@microsoft.com2009-11-057-201/+182
| | | | | | | | | | | | | In fixing this bug (to do with record puns), I had the usual rush of blood to the head, and I did quite a bit of refactoring in the way that duplicate/shadowed names are reported. I think the result is shorter as well as clearer. In one place I found it convenient for the renamer to use the ErrCtxt carried in the monad. (The renamer used not to have such a context, but years ago the typechecker and renamer monads became one, so now it does.) So now it's availble if you want it in future.
* Comments onlysimonpj@microsoft.com2009-11-052-1/+5
|
* Improve error reporting when there's an error inside a spliced expressionsimonpj@microsoft.com2009-11-051-6/+13
| | | | | | | | | | | | If an error occurs in *spliced* code, it can be tricky to understand what is going on. With this patch, in - epxressions - types we give a helpful indicator that it's in the result of a splice. For declarations it's harder, because they get type-checked in a group with other non-spliced decls, so I have not made the same improvement. But it's still better than it was.
* Update layout of error message slightlysimonpj@microsoft.com2009-11-051-1/+1
|
* Nuke the -finline-if-enough-args flagsimonpj@microsoft.com2009-11-052-4/+1
| | | | | By default INLINE functions only inline when they are given enough arguments, so the flag isn't needed
* Comment onlysimonpj@microsoft.com2009-11-041-1/+1
|
* Comments and layout only, relating to Roman's inlining-and-conlike patchsimonpj@microsoft.com2009-11-052-66/+81
|
* Comments only, relating to Roman's new built-in rule for seqsimonpj@microsoft.com2009-11-052-20/+46
|
* Add a (DEBUG-only) warning for top-level error thunks with uninformative ↵simonpj@microsoft.com2009-11-031-5/+14
| | | | | | | | | | | strictness info In the past I've seen this in an interface file foo = error "urk" but *without* a bottoming strictness info on 'foo'. This WARN just checks (non-fatally) for the bad case, so that we can track it down easily
* Comment onlysimonpj@microsoft.com2009-11-031-0/+1
|
* Add builtin rule to eliminate unnecessary casts in seqRoman Leshchinskiy2009-11-042-4/+27
| | | | | | | | | | | | | The patch adds this rule: seq (x `cast` co) y = seq x y This is subject to the usual treatment of seq rules. It also makes them match more often: it will rewrite seq (f x `cast` co) y = seq (f x) y and allow a seq rule for f to match.
* Consider variables with conlike unfoldings interestingRoman Leshchinskiy2009-11-044-34/+67
| | | | | | | | | | | | | In this expression: let x = f (g e1) in e2 the simplifier will inline f if it thinks that (g e1) is an interesting argument. Until now, this was essentially the case if g was a data constructor - we'd inline f in the hope that it will inspect and hence eliminate the constructor application. This patch extends this mechanism to CONLIKE functions. We consider (g e1) interesting if g is CONLIKE and inline f in the hope that this will allow rewrite rules to match.
* Tweak simpleOptExpr, so that it respects nested INLINE pragmassimonpj@microsoft.com2009-11-031-0/+21
|
* #3604: treat TH with -dynamic in the same way as -profSimon Marlow2009-11-041-1/+10
| | | | | | | | That is, you have to build the library/program without -dynamic first, to get plain object files, and then build it again with -dynamic. I still need to check whether any changes to Cabal are required to make this work.
* Finish #3439: -ticky implies -debug at link time; the ticky "way" has goneSimon Marlow2009-11-044-16/+13
| | | | | | To get ticky profiling you still have to compile with -ticky (for those modules that you want to profile), but you can link with either -debug or -ticky.
* add '-' to the chars allowed in C header file namesSimon Marlow2009-11-041-1/+1
|
* Minor change to captalisation in error message onlysimonpj@microsoft.com2009-11-021-1/+1
|
* Comments onlysimonpj@microsoft.com2009-11-021-4/+4
|
* Make the arity warning a bit more informative (DEBUG only)simonpj@microsoft.com2009-11-021-1/+1
|
* Improve error message for malformed LANGUAGE pragmasimonpj@microsoft.com2009-10-301-2/+5
|
* Minor refactoringsimonpj@microsoft.com2009-10-306-20/+16
| | | | MkCore.mkCoreTupTy moves to TysWiredIn, where it is called mkBoxedTupleTy
* Turn an ASSERT into a WARNsimonpj@microsoft.com2009-10-302-10/+13
| | | | | This is to do with SPECIALISE pragmas in instance declarations, which I need to think more about
* Be less noisy in a debug trace (Arity decrease)simonpj@microsoft.com2009-10-301-1/+1
|
* Fix build with DEBUG onsimonpj@microsoft.com2009-10-301-1/+2
|
* Cure an assert failure by gathering the right set of free variablessimonpj@microsoft.com2009-10-302-5/+11
|
* Fix the build with GHC 6.8Ian Lynagh2009-10-301-0/+4
|
* Improve coercion optimisationsimonpj@microsoft.com2009-10-302-4/+6
| | | | | | | * Remove trace from optCoercion * Use simplCoercion for type arguments in the Simplifier (because they might be coercions)
* Deprecate the ImpredicativeTypes featuresimonpj@microsoft.com2009-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | GHC has had an experimental implementation of impredicative polymorphism for a year or two now (flag -XImpredicativeTypes). But a) The implementation is ridiculously complicated, and the complexity is pervasive (in the type checker) rather than localized. I'm very unhappy about this, especially as we add more stuff to the type checker for type families. b) The specification (type system) is well-defined [1], but is also pretty complicated, and it's just too hard to predict which programs will typecheck and which will not. So it's time for a re-think. I propose to deprecate it in 6.12, and remove it altogether in 6.14. We may by then have something else to put in its place. (There is no lack of candidates [2,3,4]!) [1] http://research.microsoft.com/en-us/um/people/simonpj/papers/boxy/ [2] http://research.microsoft.com/en-us/um/people/crusso/qml/ [3] http://research.microsoft.com/en-us/um/people/daan/pubs.html [4] http://gallium.inria.fr/~remy/mlf/
* Fix Trac #3626: TH should reject unboxed tuplessimonpj@microsoft.com2009-10-301-1/+3
| | | | This was just a missing test in DsMeta
* fix and enable coercion optimizationtom.schrijvers@cs.kuleuven.be2009-10-281-7/+17
|
* Don't dump Core after every simplifier iteration with -dverbose-core2coreRoman Leshchinskiy2009-10-302-6/+10
| | | | This just restores the behaviour from before the inline patch.
* Adapt vectoriser to new inlining mechanismRoman Leshchinskiy2009-10-304-126/+202
|
* Use packByTag instead of pack in the vectoriserRoman Leshchinskiy2009-10-304-13/+31
|
* The Big INLINE Patch: totally reorganise way that INLINE pragmas worksimonpj@microsoft.com2009-10-2967-2357/+3294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has been a long time in gestation and has, as a result, accumulated some extra bits and bobs that are only loosely related. I separated the bits that are easy to split off, but the rest comes as one big patch, I'm afraid. Note that: * It comes together with a patch to the 'base' library * Interface file formats change slightly, so you need to recompile all libraries The patch is mainly giant tidy-up, driven in part by the particular stresses of the Data Parallel Haskell project. I don't expect a big performance win for random programs. Still, here are the nofib results, relative to the state of affairs without the patch Program Size Allocs Runtime Elapsed -------------------------------------------------------------------------------- Min -12.7% -14.5% -17.5% -17.8% Max +4.7% +10.9% +9.1% +8.4% Geometric Mean +0.9% -0.1% -5.6% -7.3% The +10.9% allocation outlier is rewrite, which happens to have a very delicate optimisation opportunity involving an interaction of CSE and inlining (see nofib/Simon-nofib-notes). The fact that the 'before' case found the optimisation is somewhat accidental. Runtimes seem to go down, but I never kno wwhether to really trust this number. Binary sizes wobble a bit, but nothing drastic. The Main Ideas are as follows. InlineRules ~~~~~~~~~~~ When you say {-# INLINE f #-} f x = <rhs> you intend that calls (f e) are replaced by <rhs>[e/x] So we should capture (\x.<rhs>) in the Unfolding of 'f', and never meddle with it. Meanwhile, we can optimise <rhs> to our heart's content, leaving the original unfolding intact in Unfolding of 'f'. So the representation of an Unfolding has changed quite a bit (see CoreSyn). An INLINE pragma gives rise to an InlineRule unfolding. Moreover, it's only used when 'f' is applied to the specified number of arguments; that is, the number of argument on the LHS of the '=' sign in the original source definition. For example, (.) is now defined in the libraries like this {-# INLINE (.) #-} (.) f g = \x -> f (g x) so that it'll inline when applied to two arguments. If 'x' appeared on the left, thus (.) f g x = f (g x) it'd only inline when applied to three arguments. This slightly-experimental change was requested by Roman, but it seems to make sense. Other associated changes * Moving the deck chairs in DsBinds, which processes the INLINE pragmas * In the old system an INLINE pragma made the RHS look like (Note InlineMe <rhs>) The Note switched off optimisation in <rhs>. But it was quite fragile in corner cases. The new system is more robust, I believe. In any case, the InlineMe note has disappeared * The workerInfo of an Id has also been combined into its Unfolding, so it's no longer a separate field of the IdInfo. * Many changes in CoreUnfold, esp in callSiteInline, which is the critical function that decides which function to inline. Lots of comments added! * exprIsConApp_maybe has moved to CoreUnfold, since it's so strongly associated with "does this expression unfold to a constructor application". It can now do some limited beta reduction too, which Roman found was an important. Instance declarations ~~~~~~~~~~~~~~~~~~~~~ It's always been tricky to get the dfuns generated from instance declarations to work out well. This is particularly important in the Data Parallel Haskell project, and I'm now on my fourth attempt, more or less. There is a detailed description in TcInstDcls, particularly in Note [How instance declarations are translated]. Roughly speaking we now generate a top-level helper function for every method definition in an instance declaration, so that the dfun takes a particularly stylised form: dfun a d1 d2 = MkD (op1 a d1 d2) (op2 a d1 d2) ...etc... In fact, it's *so* stylised that we never need to unfold a dfun. Instead ClassOps have a special rewrite rule that allows us to short-cut dictionary selection. Suppose dfun :: Ord a -> Ord [a] d :: Ord a Then compare (dfun a d) --> compare_list a d in one rewrite, without first inlining the 'compare' selector and the body of the dfun. To support this a) ClassOps have a BuiltInRule (see MkId.dictSelRule) b) DFuns have a special form of unfolding (CoreSyn.DFunUnfolding) which is exploited in CoreUnfold.exprIsConApp_maybe Implmenting all this required a root-and-branch rework of TcInstDcls and bits of TcClassDcl. Default methods ~~~~~~~~~~~~~~~ If you give an INLINE pragma to a default method, it should be just as if you'd written out that code in each instance declaration, including the INLINE pragma. I think that it now *is* so. As a result, library code can be simpler; less duplication. The CONLIKE pragma ~~~~~~~~~~~~~~~~~~ In the DPH project, Roman found cases where he had p n k = let x = replicate n k in ...(f x)...(g x).... {-# RULE f (replicate x) = f_rep x #-} Normally the RULE would not fire, because doing so involves (in effect) duplicating the redex (replicate n k). A new experimental modifier to the INLINE pragma, {-# INLINE CONLIKE replicate #-}, allows you to tell GHC to be prepared to duplicate a call of this function if it allows a RULE to fire. See Note [CONLIKE pragma] in BasicTypes Join points ~~~~~~~~~~~ See Note [Case binders and join points] in Simplify Other refactoring ~~~~~~~~~~~~~~~~~ * I moved endPass from CoreLint to CoreMonad, with associated jigglings * Better pretty-printing of Core * The top-level RULES (ones that are not rules for locally-defined things) are now substituted on every simplifier iteration. I'm not sure how we got away without doing this before. This entails a bit more plumbing in SimplCore. * The necessary stuff to serialise and deserialise the new info across interface files. * Something about bottoming floats in SetLevels Note [Bottoming floats] * substUnfolding has moved from SimplEnv to CoreSubs, where it belongs -------------------------------------------------------------------------------- Program Size Allocs Runtime Elapsed -------------------------------------------------------------------------------- anna +2.4% -0.5% 0.16 0.17 ansi +2.6% -0.1% 0.00 0.00 atom -3.8% -0.0% -1.0% -2.5% awards +3.0% +0.7% 0.00 0.00 banner +3.3% -0.0% 0.00 0.00 bernouilli +2.7% +0.0% -4.6% -6.9% boyer +2.6% +0.0% 0.06 0.07 boyer2 +4.4% +0.2% 0.01 0.01 bspt +3.2% +9.6% 0.02 0.02 cacheprof +1.4% -1.0% -12.2% -13.6% calendar +2.7% -1.7% 0.00 0.00 cichelli +3.7% -0.0% 0.13 0.14 circsim +3.3% +0.0% -2.3% -9.9% clausify +2.7% +0.0% 0.05 0.06 comp_lab_zift +2.6% -0.3% -7.2% -7.9% compress +3.3% +0.0% -8.5% -9.6% compress2 +3.6% +0.0% -15.1% -17.8% constraints +2.7% -0.6% -10.0% -10.7% cryptarithm1 +4.5% +0.0% -4.7% -5.7% cryptarithm2 +4.3% -14.5% 0.02 0.02 cse +4.4% -0.0% 0.00 0.00 eliza +2.8% -0.1% 0.00 0.00 event +2.6% -0.0% -4.9% -4.4% exp3_8 +2.8% +0.0% -4.5% -9.5% expert +2.7% +0.3% 0.00 0.00 fem -2.0% +0.6% 0.04 0.04 fft -6.0% +1.8% 0.05 0.06 fft2 -4.8% +2.7% 0.13 0.14 fibheaps +2.6% -0.6% 0.05 0.05 fish +4.1% +0.0% 0.03 0.04 fluid -2.1% -0.2% 0.01 0.01 fulsom -4.8% +9.2% +9.1% +8.4% gamteb -7.1% -1.3% 0.10 0.11 gcd +2.7% +0.0% 0.05 0.05 gen_regexps +3.9% -0.0% 0.00 0.00 genfft +2.7% -0.1% 0.05 0.06 gg -2.7% -0.1% 0.02 0.02 grep +3.2% -0.0% 0.00 0.00 hidden -0.5% +0.0% -11.9% -13.3% hpg -3.0% -1.8% +0.0% -2.4% ida +2.6% -1.2% 0.17 -9.0% infer +1.7% -0.8% 0.08 0.09 integer +2.5% -0.0% -2.6% -2.2% integrate -5.0% +0.0% -1.3% -2.9% knights +4.3% -1.5% 0.01 0.01 lcss +2.5% -0.1% -7.5% -9.4% life +4.2% +0.0% -3.1% -3.3% lift +2.4% -3.2% 0.00 0.00 listcompr +4.0% -1.6% 0.16 0.17 listcopy +4.0% -1.4% 0.17 0.18 maillist +4.1% +0.1% 0.09 0.14 mandel +2.9% +0.0% 0.11 0.12 mandel2 +4.7% +0.0% 0.01 0.01 minimax +3.8% -0.0% 0.00 0.00 mkhprog +3.2% -4.2% 0.00 0.00 multiplier +2.5% -0.4% +0.7% -1.3% nucleic2 -9.3% +0.0% 0.10 0.10 para +2.9% +0.1% -0.7% -1.2% paraffins -10.4% +0.0% 0.20 -1.9% parser +3.1% -0.0% 0.05 0.05 parstof +1.9% -0.0% 0.00 0.01 pic -2.8% -0.8% 0.01 0.02 power +2.1% +0.1% -8.5% -9.0% pretty -12.7% +0.1% 0.00 0.00 primes +2.8% +0.0% 0.11 0.11 primetest +2.5% -0.0% -2.1% -3.1% prolog +3.2% -7.2% 0.00 0.00 puzzle +4.1% +0.0% -3.5% -8.0% queens +2.8% +0.0% 0.03 0.03 reptile +2.2% -2.2% 0.02 0.02 rewrite +3.1% +10.9% 0.03 0.03 rfib -5.2% +0.2% 0.03 0.03 rsa +2.6% +0.0% 0.05 0.06 scc +4.6% +0.4% 0.00 0.00 sched +2.7% +0.1% 0.03 0.03 scs -2.6% -0.9% -9.6% -11.6% simple -4.0% +0.4% -14.6% -14.9% solid -5.6% -0.6% -9.3% -14.3% sorting +3.8% +0.0% 0.00 0.00 sphere -3.6% +8.5% 0.15 0.16 symalg -1.3% +0.2% 0.03 0.03 tak +2.7% +0.0% 0.02 0.02 transform +2.0% -2.9% -8.0% -8.8% treejoin +3.1% +0.0% -17.5% -17.8% typecheck +2.9% -0.3% -4.6% -6.6% veritas +3.9% -0.3% 0.00 0.00 wang -6.2% +0.0% 0.18 -9.8% wave4main -10.3% +2.6% -2.1% -2.3% wheel-sieve1 +2.7% -0.0% +0.3% -0.6% wheel-sieve2 +2.7% +0.0% -3.7% -7.5% x2n1 -4.1% +0.1% 0.03 0.04 -------------------------------------------------------------------------------- Min -12.7% -14.5% -17.5% -17.8% Max +4.7% +10.9% +9.1% +8.4% Geometric Mean +0.9% -0.1% -5.6% -7.3%
* Comments and -ddump-tc-trace wibbles onlysimonpj@microsoft.com2009-10-291-4/+6
|
* White space onlysimonpj@microsoft.com2009-10-291-2/+4
|
* Comments and variable naming onlysimonpj@microsoft.com2009-10-291-3/+3
|
* Add static flag -funfolding-dict-discount (plus layout changes)simonpj@microsoft.com2009-10-291-9/+11
|
* Tidy up pretty-printing (use ppUnless)simonpj@microsoft.com2009-10-292-3/+3
|
* A small refactoring in the code for desugaring explicit listssimonpj@microsoft.com2009-10-291-13/+23
|
* White space layout onlysimonpj@microsoft.com2009-10-291-2/+2
|
* Make `consBag` infixr, and `snocBag` infixlsimonpj@microsoft.com2009-10-291-0/+3
|
* Add Outputable.blankLine and use itsimonpj@microsoft.com2009-10-2912-42/+45
|
* Comments onlysimonpj@microsoft.com2009-10-291-1/+1
|
View Lorry Controller Status