Simon Marlow [Tue, 28 Feb 2006 16:37:24 +0000 (16:37 +0000)]
takeMVar/putMVar were missing some write barriers when modifying a TSO
This relates to the recent introduction of clean/dirty TSOs, and the
consqeuent write barriers required. We were missing some write
barriers in the takeMVar/putMVar family of primops, when performing
the take/put directly on another TSO.
Fixes #705, and probably some test failures.
Simon Marlow [Tue, 28 Feb 2006 15:36:40 +0000 (15:36 +0000)]
A better x86_64 register mapping, with more argument registers.
Now that we can handle using C argument registers as global registers,
extend the x86_64 register mapping. We now have 5 integer argument
registers, 4 float, and 2 double (all caller-saves). This results in a
reasonable speedup on x86_64.
Simon Marlow [Tue, 28 Feb 2006 15:31:34 +0000 (15:31 +0000)]
filter the messages generated by gcc
Eliminate things like "warning: call-clobbered register used as global
register variable", which is an non-suppressible warning from gcc.
Simon Marlow [Tue, 28 Feb 2006 15:29:42 +0000 (15:29 +0000)]
Allow C argument regs to be used as global regs (R1, R2, etc.)
The problem here was that we generated C calls with expressions
involving R1 etc. as parameters. When some of the R registers are
also C argument registers, both GCC and the native code generator
generate incorrect code. The hacky workaround is to assign
problematic arguments to temporaries first; fortunately this works
with both GCC and the NCG, but we have to be careful not to undo this
with later optimisations (see changes to CmmOpt).
Simon Marlow [Tue, 28 Feb 2006 15:25:24 +0000 (15:25 +0000)]
pass arguments to unknown function calls in registers
We now have more stg_ap entry points: stg_ap_*_fast, which take
arguments in registers according to the platform calling convention.
This is faster if the function being called is evaluated and has the
right arity, which is the common case (see the eval/apply paper for
measurements).
We still need the stg_ap_*_info entry points for stack-based
application, such as an overflows when a function is applied to too
many argumnets. The stg_ap_*_fast functions actually just check for
an evaluated function, and if they don't find one, push the args on
the stack and invoke stg_ap_*_info. (this might be slightly slower in
some cases, but not the common case).
Simon Marlow [Tue, 28 Feb 2006 15:18:15 +0000 (15:18 +0000)]
fix live register annotations on foreign calls
fix one incorrect case, and made several more accurate
simonpj@microsoft.com [Tue, 28 Feb 2006 13:31:57 +0000 (13:31 +0000)]
Simplify the IdInfo before any RHSs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Simplfy (i.e. substitute) the IdInfo of a recursive group of Ids
before looking at the RHSs of *any* of them. That way, the rules
are available throughout the letrec, which means we don't have to
be careful about function to put first.
Before, we just simplified the IdInfo of f before looking at f's RHS,
but that's not so good when f and g both have RULES, and both rules
mention the other.
This change makes things simpler, but shouldn't change performance.
simonpj@microsoft.com [Tue, 28 Feb 2006 11:45:02 +0000 (11:45 +0000)]
Add floating-point symbols to the list
Simon Marlow [Mon, 27 Feb 2006 15:38:28 +0000 (15:38 +0000)]
slightly better dependencies for GenApply.hs
Simon Marlow [Mon, 27 Feb 2006 15:28:22 +0000 (15:28 +0000)]
x86_64: include .type and .size directives in the output, for valgrind
kr.angelov@gmail.com [Wed, 22 Feb 2006 20:29:12 +0000 (20:29 +0000)]
The initStablePtrTable should be called before ACQUIRE_LOCK(&stable_mutex)
kr.angelov@gmail.com [Wed, 22 Feb 2006 20:17:21 +0000 (20:17 +0000)]
support LOCK_DEBUG for Windows
Simon Marlow [Mon, 27 Feb 2006 11:11:03 +0000 (11:11 +0000)]
mmap() errors on Darwin: use errorBelch/exit instead of barf()
The most likely cause is out-of-memory, not an RTS error.
Simon Marlow [Mon, 27 Feb 2006 10:59:39 +0000 (10:59 +0000)]
remove empty .SECONDARY target
This works around a problem with recent versions of GNU make that take
a long time when all targets are declared intermediate with
.SECONDARY. See
https://savannah.gnu.org/bugs/?func=detailitem&item_id=15584
for discussion of the GNU make issue.
claus.reinke@talk21.com [Sat, 25 Feb 2006 21:59:45 +0000 (21:59 +0000)]
these tables have four columns, not three
Lemmih [Sun, 26 Feb 2006 12:04:07 +0000 (12:04 +0000)]
Remove comment about imports and exports not being in the renamer result.
wolfgang.thaller@gmx.net [Sat, 25 Feb 2006 22:59:20 +0000 (22:59 +0000)]
NCG: fix mkRegRegMoveInstr for x86-64
wolfgang.thaller@gmx.net [Sat, 25 Feb 2006 03:39:54 +0000 (03:39 +0000)]
NCG: Fix Typo in Register Allocator Loop Patch
Fix previous patch "NCG: Handle loops in register allocator"
Of course, I broke it when correcting a style problem just before committing.
wolfgang.thaller@gmx.net [Sat, 25 Feb 2006 03:14:34 +0000 (03:14 +0000)]
NCG: Handle loops in register allocator
Fill in the missing parts in the register allocator so that it can
handle loops.
*) The register allocator now runs in the UniqSuppy monad, as it needs
to be able to generate unique labels for fixup code blocks.
*) A few functions have been added to RegAllocInfo:
mkRegRegMoveInstr -- generates a good old move instruction
mkBranchInstr -- used to be MachCodeGen.genBranch
patchJump -- Change the destination of a jump
*) The register allocator now makes sure that only one spill slot is used
for each temporary, even if it is spilled and reloaded several times.
This obviates the need for memory-to-memory moves in fixup code.
LIMITATIONS:
*) The case where the fixup code needs to cyclically permute a group of
registers is currently unhandled. This will need more work once we come
accross code where this actually happens.
*) Register allocation for code with loop is probably very inefficient
(both at compile-time and at run-time).
*) We still cannot compile the RTS via NCG, for various other reasons.
Lemmih [Fri, 24 Feb 2006 22:37:04 +0000 (22:37 +0000)]
Oops, I got a little trigger happy while trimming package.conf.in.
Lemmih [Fri, 24 Feb 2006 21:50:20 +0000 (21:50 +0000)]
Prettify parts of RnNames. No change of functionality.
Lemmih [Fri, 24 Feb 2006 21:27:48 +0000 (21:27 +0000)]
Remove duplicate code from RnNames.
Lemmih [Fri, 24 Feb 2006 20:37:27 +0000 (20:37 +0000)]
Remove non-existing modules from package.conf.in
Lemmih [Fri, 24 Feb 2006 16:54:09 +0000 (16:54 +0000)]
Remove some unused bindings frm RnNames.
Lemmih [Fri, 24 Feb 2006 15:47:04 +0000 (15:47 +0000)]
Rather large refactoring of RnNames.
This restructoring makes the renamed export and import lists
available in IDE mode.
Simon Marlow [Fri, 24 Feb 2006 14:41:26 +0000 (14:41 +0000)]
add file to go with "extract some of the generic..." patch
Simon Marlow [Fri, 24 Feb 2006 14:30:51 +0000 (14:30 +0000)]
oops, undo accidental addition of package-time settings
Simon Marlow [Fri, 24 Feb 2006 12:46:08 +0000 (12:46 +0000)]
turn off a trace
Simon Marlow [Fri, 24 Feb 2006 12:43:49 +0000 (12:43 +0000)]
add instance Outputable CLabel
Simon Marlow [Fri, 24 Feb 2006 12:40:33 +0000 (12:40 +0000)]
-O2 implies -optc-O2 now
Simon Marlow [Fri, 24 Feb 2006 11:17:53 +0000 (11:17 +0000)]
extract some of the generic C-- optimisations from the NCG
Simon Marlow [Thu, 23 Feb 2006 15:51:20 +0000 (15:51 +0000)]
lag/drag/void: add an extra assertion, and some commentary
Simon Marlow [Thu, 23 Feb 2006 15:50:46 +0000 (15:50 +0000)]
lag/drag/void profiling fix
We were searching the wrong part of the heap for dead objects, this
was broken by recent changes to the step structure: from-space is now
in step->old_blocks, not step->blocks. Fortunately some assertions in
ProfHeap picked up the problem.
Simon Marlow [Thu, 23 Feb 2006 15:48:59 +0000 (15:48 +0000)]
add (trivial) support for STM objects in lag/drag/void profiling
Simon Marlow [Thu, 23 Feb 2006 15:09:04 +0000 (15:09 +0000)]
bugfix for LDV profiling on 64-bit platforms
There was an integer overflow in the definition of LDV_RECORD_CREATE
when StgWord is 64 bits.
Simon Marlow [Thu, 23 Feb 2006 14:45:37 +0000 (14:45 +0000)]
warning fix
Simon Marlow [Thu, 23 Feb 2006 14:30:13 +0000 (14:30 +0000)]
further fix for floating point primitives
simonpj@microsoft.com [Thu, 23 Feb 2006 14:21:01 +0000 (14:21 +0000)]
Comment wibbles
simonpj@microsoft.com [Thu, 23 Feb 2006 13:41:54 +0000 (13:41 +0000)]
Wibbles to instance validity checking
simonpj@microsoft.com [Thu, 23 Feb 2006 13:01:04 +0000 (13:01 +0000)]
Fix comment
simonpj@microsoft.com [Thu, 23 Feb 2006 13:00:29 +0000 (13:00 +0000)]
Improve error reporting for type-improvement errors
simonpj@microsoft.com [Thu, 23 Feb 2006 12:59:58 +0000 (12:59 +0000)]
Reject polytypes in instance declarations (for now anyway)
simonpj@microsoft.com [Fri, 10 Feb 2006 10:40:28 +0000 (10:40 +0000)]
Remove duplicate comment
Lemmih [Wed, 22 Feb 2006 17:36:48 +0000 (17:36 +0000)]
Add renamed fixities to HsGroup.
Simon Marlow [Wed, 22 Feb 2006 16:38:27 +0000 (16:38 +0000)]
oops, initialize atomic_modify_mutvar_mutex
Simon Marlow [Wed, 22 Feb 2006 16:07:33 +0000 (16:07 +0000)]
check black holes before doing GC in scheduleDoHeapProfile()
fixes #687, see comment for details.
Simon Marlow [Wed, 22 Feb 2006 14:18:36 +0000 (14:18 +0000)]
fix for ASSIGN_BaseReg() in the unregisterised way
Simon Marlow [Wed, 22 Feb 2006 14:07:19 +0000 (14:07 +0000)]
floating-point fix for x86_64
For 32-bit float primtives like sinFloat#, we currently call the
double versions of the C library functions (sin(), cos() etc.). It
seems more correct to call the float versions (sinf(), cosf() etc.).
This makes a difference on x86_64, I'm not entirely sure why, but this
way at least generates more consistent results and avoids extra
promotion/demotion instructions when calling these primitives.
Simon Marlow [Tue, 21 Feb 2006 16:37:11 +0000 (16:37 +0000)]
fix a deadlock in atomicModifyMutVar#
atomicModifyMutVar# was re-using the storage manager mutex (sm_mutex)
to get its atomicity guarantee in SMP mode. But recently the addition
of a call to dirty_MUT_VAR() to implement the read barrier lead to a
rare deadlock case, because dirty_MUT_VAR() very occasionally needs to
allocate a new block to chain on the mutable list, which requires
sm_mutex.
Simon Marlow [Tue, 21 Feb 2006 16:33:08 +0000 (16:33 +0000)]
warning fix
Lemmih [Tue, 21 Feb 2006 10:51:47 +0000 (10:51 +0000)]
Mention the 'Encoding' module in package.conf.in
Ross Paterson [Mon, 13 Feb 2006 16:10:44 +0000 (16:10 +0000)]
Loosen the rules for instance declarations (Part 3)
Relax the restrictions on derived instances in the same way, so we
can write
data MinHeap h a = H a (h a) deriving (Show)
kr.angelov@gmail.com [Sun, 12 Feb 2006 09:50:19 +0000 (09:50 +0000)]
If we don't have libreadline then we need some dummy definition for complete* functions.
wolfgang.thaller@gmx.net [Sun, 12 Feb 2006 03:47:36 +0000 (03:47 +0000)]
SMP bugfix: reload capability from task->cap after scheduleDoGC
wolfgang.thaller@gmx.net [Sun, 12 Feb 2006 03:33:52 +0000 (03:33 +0000)]
SMP support (xchg(), cas() and mb()) for PowerPC
Lemmih [Fri, 10 Feb 2006 18:13:19 +0000 (18:13 +0000)]
Bugfix in completion code for :set and :unset.
Lemmih [Fri, 10 Feb 2006 17:17:28 +0000 (17:17 +0000)]
Completion for :set, :unset and :undef.
Simon Marlow [Fri, 10 Feb 2006 15:32:36 +0000 (15:32 +0000)]
oops, forgot some more SMP->THREADED_RTS conversions
Simon Marlow [Fri, 10 Feb 2006 12:35:52 +0000 (12:35 +0000)]
fix test for REG_BaseReg (it's spelled REG_Base)
Duncan Coutts [Thu, 9 Feb 2006 09:32:04 +0000 (09:32 +0000)]
Change CVS for _darcs in dirs to prune during make dist
Simon Marlow [Fri, 10 Feb 2006 12:00:21 +0000 (12:00 +0000)]
fix for dirty_MUT_VAR: don't try to recordMutableCap in gen 0
Simon Marlow [Fri, 10 Feb 2006 11:21:11 +0000 (11:21 +0000)]
STM fix from Tim Harris
Fixes assertion failures with STM and -debug. Tim says:
Sorry, it's a problem in how nested transactions are handled in
non-SMP builds. It'll bite when trying to commit a nested transaction
which has read from a TVar but not updated it.
The call to validate_and_acquire_ownership in
stmCommitNestedTransaction should be the same as that in
stmCommitNestedTransaction, i.e.:
result = validate_and_acquire_ownership(trec, (!use_read_phase), TRUE);
Simon Marlow [Thu, 9 Feb 2006 12:30:56 +0000 (12:30 +0000)]
improvement to the deadlock detection
When the RTS is idle, as detected by the timer signal, instead of
prodding capabilities from the signal handler (which is not guaranteed
to work - pthread_cond_signal() can't be called from signal handlers),
create a new thread to do it.
Lemmih [Fri, 10 Feb 2006 09:46:01 +0000 (09:46 +0000)]
Simplify the -B handling. The interface to the ghc library has changed slightly.
simonpj@microsoft.com [Thu, 9 Feb 2006 17:53:28 +0000 (17:53 +0000)]
Fix desugaring of unboxed tuples
This patch is a slightly-unsatisfactory fix to desugaring unboxed
tuples; it fixes ds057 which has been failing for some time.
Unsatisfactory because rather ad hoc -- but that applies to lots
of the unboxed tuple stuff.
Simon Marlow [Thu, 9 Feb 2006 16:22:47 +0000 (16:22 +0000)]
x86_64: fix case of out-of-range operands to leaq
Simon Marlow [Thu, 9 Feb 2006 15:44:49 +0000 (15:44 +0000)]
Merge the smp and threaded RTS ways
Now, the threaded RTS also includes SMP support. The -smp flag is a
synonym for -threaded. The performance implications of this are small
to negligible, and it results in a code cleanup and reduces the number
of combinations we have to test.
Simon Marlow [Thu, 9 Feb 2006 15:04:20 +0000 (15:04 +0000)]
change dirty_MUT_VAR() to use recordMutableCap()
rather than recordMutableGen(), the former works better in SMP
Simon Marlow [Thu, 9 Feb 2006 12:30:56 +0000 (12:30 +0000)]
improvement to the deadlock detection
When the RTS is idle, as detected by the timer signal, instead of
prodding capabilities from the signal handler (which is not guaranteed
to work - pthread_cond_signal() can't be called from signal handlers),
create a new thread to do it.
simonpj@microsoft.com [Thu, 9 Feb 2006 12:42:08 +0000 (12:42 +0000)]
Fix typo
simonpj@microsoft.com [Thu, 9 Feb 2006 11:35:31 +0000 (11:35 +0000)]
Fix instance rules for functional dependencies
GHC 6.4 implements a rather relaxed version of the Coverage Condition
which is actually too relaxed: the compiler can get into an infinite loop
as a result.
This commit fixes the problem (see Note [Coverage condition] in FunDeps.lhs)
and documents the change.
I also took the opportunity to add documentation about functional dependencies,
taken from the Hugs manual with kind permission of Mark Jones
Simon Marlow [Thu, 9 Feb 2006 10:50:58 +0000 (10:50 +0000)]
fix for the unregisterised way
We always assign to BaseReg on return from resumeThread(), but in
cases where BaseReg is not an lvalue (eg. unreg) we need to disable
this assigment. See comments for more details.
Simon Marlow [Thu, 9 Feb 2006 10:48:15 +0000 (10:48 +0000)]
prof/smp combination probably doesn't work, disable it
Simon Marlow [Thu, 9 Feb 2006 10:25:40 +0000 (10:25 +0000)]
tiny panic msg fix
simonpj@microsoft.com [Thu, 9 Feb 2006 10:21:29 +0000 (10:21 +0000)]
Loosen the rules for instance declarations (Part 2)
Tidying up to Ross's patch, plus adding documenation for it.
Ross Paterson [Mon, 6 Feb 2006 11:16:51 +0000 (11:16 +0000)]
relaxed instance termination test
With -fglasgow-exts but not -fallow-undecidable-instances, GHC 6.4
requires that instances be of the following form:
(1) each assertion in the context must constrain distinct variables
mentioned in the head, and
(2) at least one argument of the head must be a non-variable type.
This patch replaces these rules with the requirement that each assertion
in the context satisfy
(1) no variable has more occurrences in the assertion than in the head, and
(2) the assertion has fewer constructors and variables (taken together
and counting repetitions) than the head.
This allows all instances permitted by the old rule, plus such instances as
instance C a
instance Show (s a) => Show (Sized s a)
instance (Eq a, Show b) => C2 a b
instance C2 Int a => C3 Bool [a]
instance C2 Int a => C3 [a] b
instance C4 a a => C4 [a] [a]
but still ensures that under any substitution assertions in the context
will be smaller than the head, so context reduction must terminate.
This is probably the best we can do if we consider each instance in
isolation.
simonpj@microsoft.com [Thu, 9 Feb 2006 09:37:04 +0000 (09:37 +0000)]
Fix CPP failure by adding space before hASH_TBL_SIZE
Simon Marlow [Wed, 8 Feb 2006 17:07:44 +0000 (17:07 +0000)]
an LDV profiling fix (might just fix ASSERTIONs, I'm not sure)
simonpj@microsoft.com [Wed, 8 Feb 2006 15:44:12 +0000 (15:44 +0000)]
Do type refinement in TcIface
This commit fixes a bug in 6.4.1 and the HEAD. Consider this code,
recorded **in an interface file**
\(x::a) -> case y of
MkT -> case x of { True -> ... }
(where MkT forces a=Bool)
In the "case x" we need to know x's type, because we use that
to find which module to look for "True" in. x's type comes from
the envt, so we must refine the envt.
The alternative would be to record more info with an IfaceCase,
but that would change the interface file format.
(This stuff will go away when we have proper coercions.)
simonpj@microsoft.com [Wed, 8 Feb 2006 15:43:43 +0000 (15:43 +0000)]
Add mapOccEnv
simonpj@microsoft.com [Wed, 8 Feb 2006 15:07:01 +0000 (15:07 +0000)]
A little more debug printing
simonpj@microsoft.com [Wed, 8 Feb 2006 15:03:57 +0000 (15:03 +0000)]
Show types of case result when debug is on
Simon Marlow [Wed, 8 Feb 2006 15:32:59 +0000 (15:32 +0000)]
fix installation of binary dist when the PS docs aren't present
Fixes #660
Simon Marlow [Wed, 8 Feb 2006 14:54:51 +0000 (14:54 +0000)]
fix a bug in closure_sizeW_()
Simon Marlow [Wed, 8 Feb 2006 14:33:48 +0000 (14:33 +0000)]
make the smp way RTS-only, normal libraries now work with -smp
We had to bite the bullet here and add an extra word to every thunk,
to enable running ordinary libraries on SMP. Otherwise, we would have
needed to ship an extra set of libraries with GHC 6.6 in addition to
the two sets we already ship (normal + profiled), and all Cabal
packages would have to be compiled for SMP too. We decided it best
just to take the hit now, making SMP easily accessible to everyone in
GHC 6.6.
Incedentally, although this increases allocation by around 12% on
average, the performance hit is around 5%, and much less if your inner
loop doesn't use any laziness.
Simon Marlow [Wed, 8 Feb 2006 13:10:18 +0000 (13:10 +0000)]
add -dfaststring-stats to dump some stats about the FastString hash table
Simon Marlow [Tue, 7 Feb 2006 13:23:23 +0000 (13:23 +0000)]
fix a warning
Simon Marlow [Tue, 7 Feb 2006 11:11:11 +0000 (11:11 +0000)]
catch up with changes to Distribution.ParseUtils.ParseResult
simonpj@microsoft.com [Tue, 7 Feb 2006 17:12:54 +0000 (17:12 +0000)]
Wibble to type signature
simonpj@microsoft.com [Tue, 7 Feb 2006 08:51:37 +0000 (08:51 +0000)]
Empty forall should disable implicit quantification
simonpj@microsoft.com [Mon, 6 Feb 2006 11:20:31 +0000 (11:20 +0000)]
Remove unused constructor in SourceTypeCtxt
Simon Marlow [Mon, 6 Feb 2006 12:26:54 +0000 (12:26 +0000)]
Basic completion in GHCi
This patch adds completion support to GHCi when readline is being
used. Completion of identifiers (in scope only, but including
qualified identifiers) in expressions is provided. Also, completion
of commands (:cmd), and special completion for certain commands
(eg. module names for the :module command) are also provided.
simonpj@microsoft.com [Mon, 6 Feb 2006 10:17:30 +0000 (10:17 +0000)]
Improve error report for pattern guards
simonpj@microsoft.com [Fri, 3 Feb 2006 17:51:08 +0000 (17:51 +0000)]
Add bang patterns
This commit adds bang-patterns,
enabled by -fglasgow-exts or -fbang-patterns
diabled by -fno-bang-patterns
The idea is described here
http://haskell.galois.com/cgi-bin/haskell-prime/trac.cgi/wiki/BangPatterns
simonpj@microsoft.com [Fri, 3 Feb 2006 17:46:27 +0000 (17:46 +0000)]
Add Bag.anyBag (analogous to List.any)
simonpj@microsoft.com [Thu, 2 Feb 2006 13:04:09 +0000 (13:04 +0000)]
Deal correctly with lazy patterns and GADTs
simonpj@microsoft.com [Thu, 2 Feb 2006 12:44:05 +0000 (12:44 +0000)]
Record the type in TuplePat (necessary for GADTs)
We must record the type of a TuplePat after typechecking, just like a ConPatOut,
so that desugaring works correctly for GADTs. See comments with the declaration
of HsPat.TuplePat, and test gadt15
simonpj@microsoft.com [Thu, 2 Feb 2006 12:43:27 +0000 (12:43 +0000)]
Improve error reporting in Core Lint
Simon Marlow [Thu, 2 Feb 2006 12:43:59 +0000 (12:43 +0000)]
don't clean ghc-inplace when cleaning stages other than 1
simonpj@microsoft.com [Wed, 1 Feb 2006 17:03:32 +0000 (17:03 +0000)]
Improve error reporting in typechecker