Commit 4550f26c authored by simonpj@microsoft.com's avatar simonpj@microsoft.com
Browse files

Improve hashing of expressions for CSE (reduces warnings about extendCSEnv)

parent e49ced85
...@@ -260,8 +260,11 @@ localiseName n = n { n_sort = Internal } ...@@ -260,8 +260,11 @@ localiseName n = n { n_sort = Internal }
%************************************************************************ %************************************************************************
\begin{code} \begin{code}
hashName :: Name -> Int hashName :: Name -> Int -- ToDo: should really be Word
hashName name = getKey (nameUnique name) hashName name = getKey (nameUnique name) + 1
-- The +1 avoids keys with lots of zeros in the ls bits, which
-- interacts badly with the cheap and cheerful multiplication in
-- hashExpr
\end{code} \end{code}
......
...@@ -1386,10 +1386,10 @@ fast_hash_expr env other = 1 ...@@ -1386,10 +1386,10 @@ fast_hash_expr env other = 1
fast_hash_type :: HashEnv -> Type -> Word32 fast_hash_type :: HashEnv -> Type -> Word32
fast_hash_type env ty fast_hash_type env ty
| Just tv <- getTyVar_maybe ty = hashVar env tv | Just tv <- getTyVar_maybe ty = hashVar env tv
| Just (tc,_) <- splitTyConApp_maybe ty | Just (tc,tys) <- splitTyConApp_maybe ty = let hash_tc = fromIntegral (hashName (tyConName tc))
= fromIntegral (hashName (tyConName tc)) in foldr (\t n -> fast_hash_type env t + n) hash_tc tys
| otherwise = 1 | otherwise = 1
extend_env :: HashEnv -> Var -> (Int, VarEnv Int) extend_env :: HashEnv -> Var -> (Int, VarEnv Int)
extend_env (n,env) b = (n+1, extendVarEnv env b n) extend_env (n,env) b = (n+1, extendVarEnv env b n)
......
...@@ -315,7 +315,9 @@ extendCSEnv (CS cs in_scope sub) expr expr' ...@@ -315,7 +315,9 @@ extendCSEnv (CS cs in_scope sub) expr expr'
= CS (addToUFM_C combine cs hash [(expr, expr')]) in_scope sub = CS (addToUFM_C combine cs hash [(expr, expr')]) in_scope sub
where where
hash = hashExpr expr hash = hashExpr expr
combine old new = WARN( result `lengthExceeds` 4, text "extendCSEnv: long list:" <+> ppr result ) combine old new = WARN( result `lengthExceeds` 4, ((text "extendCSEnv: long list (length" <+> int (length result) <> comma
<+> text "hash code" <+> text (show hash) <> char ')')
$$ nest 4 (ppr result)) )
result result
where where
result = new ++ old result = new ++ old
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment