diff options
author | Simon Marlow <marlowsd@gmail.com> | 2013-02-18 14:34:26 +0000 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2013-10-25 08:22:44 +0100 |
commit | 2f5db98e90cf0cff1a11971c85f108a7480528ed (patch) | |
tree | 7228a8360db8824c2dbdec42b7db338db5c6013d /compiler/codeGen | |
parent | 45eaeee3d7f5ef2efbc72769ebe6b988a867692a (diff) | |
download | haskell-2f5db98e90cf0cff1a11971c85f108a7480528ed.tar.gz |
Implement shortcuts for slow calls that would require PAPs (#6084)
Diffstat (limited to 'compiler/codeGen')
-rw-r--r-- | compiler/codeGen/StgCmmLayout.hs | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs index 84ff21b3d0..84736429bc 100644 --- a/compiler/codeGen/StgCmmLayout.hs +++ b/compiler/codeGen/StgCmmLayout.hs @@ -176,16 +176,52 @@ directCall conv lbl arity stg_args slowCall :: CmmExpr -> [StgArg] -> FCode ReturnKind -- (slowCall fun args) applies fun to args, returning the results to Sequel slowCall fun stg_args - = do { dflags <- getDynFlags - ; argsreps <- getArgRepsAmodes stg_args - ; let (rts_fun, arity) = slowCallPattern (map fst argsreps) - ; r <- direct_call "slow_call" NativeNodeCall + = do dflags <- getDynFlags + argsreps <- getArgRepsAmodes stg_args + let (rts_fun, arity) = slowCallPattern (map fst argsreps) + + (r, slow_code) <- getCodeR $ do + r <- direct_call "slow_call" NativeNodeCall (mkRtsApFastLabel rts_fun) arity ((P,Just fun):argsreps) - ; emitComment $ mkFastString ("slow_call for " ++ + emitComment $ mkFastString ("slow_call for " ++ showSDoc dflags (ppr fun) ++ " with pat " ++ unpackFS rts_fun) - ; return r - } + return r + + let n_args = length stg_args + if n_args > arity && optLevel dflags >= 2 + then do + fast_code <- getCode $ + emitCall (NativeNodeCall, NativeReturn) + (entryCode dflags (closureInfoPtr dflags fun)) + (nonVArgs ((P,Just fun):argsreps)) + + slow_lbl <- newLabelC + fast_lbl <- newLabelC + is_tagged_lbl <- newLabelC + end_lbl <- newLabelC + + funv <- (CmmReg . CmmLocal) `fmap` assignTemp fun + + let correct_arity = cmmEqWord dflags (funInfoArity dflags funv) + (mkIntExpr dflags n_args) + + pprTrace "fast call" (int n_args) $ return () + + emit (mkCbranch (cmmIsTagged dflags funv) is_tagged_lbl slow_lbl + <*> mkLabel is_tagged_lbl + <*> mkCbranch correct_arity fast_lbl slow_lbl + <*> mkLabel fast_lbl + <*> fast_code + <*> mkBranch end_lbl + <*> mkLabel slow_lbl + <*> slow_code + <*> mkLabel end_lbl) + return r + + else do + emit slow_code + return r -------------- |