From: keller@cse.unsw.edu.au <unknown>
Date: Mon, 29 Nov 2010 23:10:43 +0000 (+0000)
Subject: vectScalarLam handles int, float, and double now
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=f0c2b5e857841103e5431b698a9eb853aea399b0

vectScalarLam handles int, float, and double now
---

diff --git a/compiler/vectorise/Vectorise/Exp.hs b/compiler/vectorise/Vectorise/Exp.hs
index d00b040..4e07086 100644
--- a/compiler/vectorise/Vectorise/Exp.hs
+++ b/compiler/vectorise/Vectorise/Exp.hs
@@ -203,7 +203,11 @@ vectScalarLam args body
 
     is_scalar vs (Var v)     = v `elemVarSet` vs
     is_scalar _ e@(Lit _)    = is_scalar_ty $ exprType e
-    is_scalar vs (App e1 e2) = is_scalar vs e1 && is_scalar vs e2
+    
+    is_scalar _ (App (Var v) (Lit lit)) 
+       | Just con <- isDataConId_maybe v = con `elem` [intDataCon, floatDataCon, doubleDataCon]
+
+    is_scalar vs (App e1 e2) = is_scalar vs e1 && is_scalar vs e2    
     is_scalar vs (Let (NonRec b letExpr) body) 
                              = is_scalar vs letExpr && is_scalar (extendVarSet vs b) body
     is_scalar vs (Let (Rec bnds) body) 
@@ -214,7 +218,7 @@ vectScalarLam args body
 	                           in is_scalar_ty ty &&
                                   is_scalar vs' e   &&
                                   (all (is_scalar_alt vs') alts)
-
+                                    
     is_scalar _ e            = False
 
     is_scalar_alt vs (_, bs, e)