Hoist BoundsChecking

Author: vidsinghal

gibbon-compiler/examples/simple_tests/list.hs

@@ -35,10 +35,11 @@ sumList lst = case lst of
 
 gibbon_main = let 
 		lst = mkList 20000
-                lst' = iterate (add1 lst)
-                -- _ = printPacked lst'
+                --lst' = iterate (add1 lst)
+                _ = printPacked lst
+                _ = printsym (quote "NEWLINE")
                 --(val, lst'') = fieldDep lst' 
-	       in sumList lst' --() --printPacked lst' --val --sumList lst'
+	       in sumList lst --() --printPacked lst' --val --sumList lst'
 
 
 

gibbon-compiler/gibbon.cabal

@@ -93,7 +93,7 @@ library
                        Gibbon.Passes.RearrangeFree
                        Gibbon.Passes.Codegen
                        Gibbon.Passes.CalculateBounds
-                       Gibbon.Passes.CorrectLocExprs
+                       Gibbon.Passes.HoistExpressions
                        Gibbon.Passes.ReorderLetExprs
                        Gibbon.Passes.AddCastInstructions
 
@@ -181,6 +181,7 @@ test-suite test-gibbon
                        InferLocations
                        Unariser
                        InferRegionScope
+                       HoistBoundsCheck
                        AddRAN
                        L1.Typecheck
                        L1.Interp

gibbon-compiler/src/Gibbon/Compiler.hs

@@ -94,7 +94,7 @@ import           Gibbon.Passes.RearrangeFree  (rearrangeFree)
 import           Gibbon.Passes.Codegen        (codegenProg)
 import           Gibbon.Passes.AddCastInstructions (addCasts)
 import           Gibbon.Passes.Fusion2        (fusion2)
-import           Gibbon.Passes.CorrectLocExprs (delayExpr)
+import           Gibbon.Passes.HoistExpressions (hoistBoundsCheckProg)
 import           Gibbon.Passes.ReorderLetExprs (reorderLetExprs)
 import           Gibbon.Pretty
 import           Gibbon.L1.GenSML
@@ -836,7 +836,7 @@ Also see Note [Adding dummy traversals] and Note [Adding random access nodes].
               -- typechecker doesn't know how to handle.
               -- l2' <- go "threadRegions"    threadRegions l2'
               l2' <- go "threadRegions2" threadRegions2 l2'
-              l2' <- go "delayExprs"  delayExpr l2'
+              l2' <- go "hoistBoundsCheck" hoistBoundsCheckProg l2'
 
               -- L2 -> L3
               -- TODO: Compose L3.TcM with (ReaderT Config)

gibbon-compiler/src/Gibbon/NewL2/Syntax.hs

@@ -568,7 +568,7 @@ depList = L.map (\(a,b) -> (a,a,b)) . M.toList . go M.empty
 allFreeVars :: Exp2 -> S.Set FreeVarsTy
 allFreeVars ex =
   case ex of
-    AppE _ locs args -> S.fromList (map (fromLocVarToFreeVarsTy . toLocVar) locs) `S.union` (S.unions (map allFreeVars args))
+    AppE _ locs args -> S.fromList (map (fromLocArgToFreeVarsTy) locs) `S.union` (S.unions (map allFreeVars args))
     PrimAppE _ args -> (S.unions (map allFreeVars args))
     LetE (v,locs,_,rhs) bod -> (S.fromList (map (fromLocVarToFreeVarsTy . toLocVar) locs) `S.union` (allFreeVars rhs) `S.union` (allFreeVars bod))
                                `S.difference` S.singleton (fromVarToFreeVarsTy v)