summaryrefslogtreecommitdiff
path: root/compiler/specialise
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2018-08-01 06:42:19 -0400
committerBen Gamari <ben@smart-cactus.org>2018-08-01 06:54:23 -0400
commit1df50a0f61f320428f2e6dd07b3c9ce49c4acd31 (patch)
tree07b9441b6f64d129ed183a69516fa3392ea86a93 /compiler/specialise
parent9bd48643c917f8e38a0ddca0b6ac1777bbf66f99 (diff)
downloadhaskell-1df50a0f61f320428f2e6dd07b3c9ce49c4acd31.tar.gz
Revert "Don't inline functions with RULES too early"
This commit causes significant performance regressions: ``` bytes allocated value is too high: Expected T9872d(normal) bytes allocated: 578498120 +/-5% Lower bound T9872d(normal) bytes allocated: 549573214 Upper bound T9872d(normal) bytes allocated: 607423026 Actual T9872d(normal) bytes allocated: 677179968 Deviation T9872d(normal) bytes allocated: 17.1 % bytes allocated value is too high: Expected T9872c(normal) bytes allocated: 3096670112 +/-5% Lower bound T9872c(normal) bytes allocated: 2941836606 Upper bound T9872c(normal) bytes allocated: 3251503618 Actual T9872c(normal) bytes allocated: 3601872536 Deviation T9872c(normal) bytes allocated: 16.3 % bytes allocated value is too high: Expected T9872b(normal) bytes allocated: 3730686224 +/-5% Lower bound T9872b(normal) bytes allocated: 3544151912 Upper bound T9872b(normal) bytes allocated: 3917220536 Actual T9872b(normal) bytes allocated: 4374298272 Deviation T9872b(normal) bytes allocated: 17.3 % bytes allocated value is too high: Expected T9872a(normal) bytes allocated: 2729927408 +/-5% Lower bound T9872a(normal) bytes allocated: 2593431037 Upper bound T9872a(normal) bytes allocated: 2866423779 Actual T9872a(normal) bytes allocated: 3225788896 Deviation T9872a(normal) bytes allocated: 18.2 % ``` It's not clear that this was intentional so I'm going to revert for now. This reverts commit 2110738b280543698407924a16ac92b6d804dc36.
Diffstat (limited to 'compiler/specialise')
-rw-r--r--compiler/specialise/Rules.hs49
1 files changed, 7 insertions, 42 deletions
diff --git a/compiler/specialise/Rules.hs b/compiler/specialise/Rules.hs
index 850dba64cd..3380d02f99 100644
--- a/compiler/specialise/Rules.hs
+++ b/compiler/specialise/Rules.hs
@@ -46,8 +46,7 @@ import TysWiredIn ( anyTypeOfKind )
import Coercion
import CoreTidy ( tidyRules )
import Id
-import IdInfo ( IdInfo( ruleInfo, inlinePragInfo )
- , RuleInfo( RuleInfo ), setRuleInfo, setInlinePragInfo )
+import IdInfo ( RuleInfo( RuleInfo ) )
import Var
import VarEnv
import VarSet
@@ -56,7 +55,7 @@ import NameSet
import NameEnv
import UniqFM
import Unify ( ruleMatchTyKiX )
-import BasicTypes
+import BasicTypes ( Activation, CompilerPhase, isActive, pprRuleName )
import DynFlags ( DynFlags )
import Outputable
import FastString
@@ -291,23 +290,11 @@ addRuleInfo (RuleInfo rs1 fvs1) (RuleInfo rs2 fvs2)
= RuleInfo (rs1 ++ rs2) (fvs1 `unionDVarSet` fvs2)
addIdSpecialisations :: Id -> [CoreRule] -> Id
--- See Note [Adding specialisations to an Id]
-addIdSpecialisations id rules
- | null rules
+addIdSpecialisations id []
= id
- | otherwise
- = modifyIdInfo (add_rules . add_activation) id
- where
- add_rules, add_activation :: IdInfo -> IdInfo
- add_rules info = info `setRuleInfo` extendRuleInfo (ruleInfo info) rules
- add_activation info
- | AlwaysActive <- inlinePragmaActivation inl_prag
- = info `setInlinePragInfo` inl_prag'
- | otherwise
- = info
- where
- inl_prag = inlinePragInfo info
- inl_prag' = inl_prag `setInlinePragmaActivation` activeAfterInitial
+addIdSpecialisations id rules
+ = setIdSpecialisation id $
+ extendRuleInfo (idSpecialisation id) rules
-- | Gather all the rules for locally bound identifiers from the supplied bindings
rulesOfBinds :: [CoreBind] -> [CoreRule]
@@ -325,29 +312,7 @@ ruleIsVisible _ BuiltinRule{} = True
ruleIsVisible vis_orphs Rule { ru_orphan = orph, ru_origin = origin }
= notOrphan orph || origin `elemModuleSet` vis_orphs
-{- Note [Adding specialisations to an Id]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Suppose (Trac #15445) we have
- f,g :: Num a => a -> a
- f x = ...f (x-1).....
- g y = ...g (y-1) ....
-and we make some specialisations of 'g', either automatically, or via
-a SPECIALISE pragma. Then CSE kicks in and notices that the RHSs of
-'f' and 'g' are identical, so we get
- f x = ...f (x-1)...
- g = f
- {-# RULES g @Int _ = $sg #-}
-
-Now there is terrible danger that, in an importing module, we'll inline
-'g' before we have a chance to run its specialisation!
-
-This is admittedly a bit of an exotic case; but in general with RULES
-we want to delay inlining to give the rule a chance to fire. So we
-attach a NOINLINE[2] activation to it, to ensure it's not inlined
-right away. c.f. other uses of activeAfterInitial in the compiler
-e.g. Note [Wrapper activation] in WorkWrap, and
- Note [Activation for data constructor wrappers] in MkId
-
+{-
Note [Where rules are found]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The rules for an Id come from two places: