Fix some iterate TODO's in layout pass

Author: vidsinghal

gibbon-compiler/src/Gibbon/Passes/AccessPatternsAnalysis.hs

@@ -84,7 +84,7 @@ getGreedyOrder edges fieldLength =
                   completeOrder = P.foldl (\lst val -> if S.member val (S.fromList lst) then lst
                                                  else lst ++ [val]
                                     ) partial_order [0 .. (fieldLength - 1)]
-                in dbgTraceIt (sdoc (edges, completeOrder)) P.map P.toInteger completeOrder
+                in P.map P.toInteger completeOrder --dbgTraceIt (sdoc (edges, completeOrder)) P.map P.toInteger completeOrder
 
 greedyOrderOfVertices :: [((Integer, Integer), Integer)] -> [Int]
 greedyOrderOfVertices ee = let     edges' = P.map (\((a, b), c) -> ((P.fromIntegral a, P.fromIntegral b), P.fromIntegral c)) ee
@@ -244,7 +244,7 @@ freeVarsInOrder exp =
           var_list = L.concat var_list_list
        in var_list
     ProjE i e -> error "freeVarsInOrder: TODO ProjE"
-    TimeIt e ty b -> error "freeVarsInOrder: TODO TimeIt"
+    TimeIt e ty b -> freeVarsInOrder e
     WithArenaE v e -> error "freeVarsInOrder: TODO WithArenaE"
     SpawnE f locs args -> error "freeVarsInOrder: TODO SpawnE"
     SyncE -> error "freeVarsInOrder: TODO SyncE"

gibbon-compiler/src/Gibbon/Passes/OptimizeADTLayout.hs

@@ -165,7 +165,7 @@ dataConsInFunBody funBody = case funBody of
             IfE a b c -> S.unions $ [dataConsInFunBody a] ++ [dataConsInFunBody b] ++ [dataConsInFunBody c]
             MkProdE xs -> S.unions $ P.map dataConsInFunBody xs
             ProjE i e -> error "getGeneratedVariable: TODO ProjE"
-            TimeIt e ty b -> error "getGeneratedVariable: TODO TimeIt"
+            TimeIt e ty b -> dataConsInFunBody e
             WithArenaE v e -> error "getGeneratedVariable: TODO WithArenaE"
             SpawnE f locs args -> error "getGeneratedVariable: TODO SpawnE"
             SyncE -> error "getGeneratedVariable: TODO SyncE"
@@ -611,7 +611,7 @@ changeCallNameInRecFunction
           IfE a b c -> IfE (fixExp a) (fixExp b) (fixExp c)
           MkProdE xs -> MkProdE (P.map fixExp xs)
           ProjE i e -> error "getExpTyEnv: TODO ProjE"
-          TimeIt e ty b -> error "getExpTyEnv: TODO TimeIt"
+          TimeIt e ty b -> TimeIt (fixExp e) ty b
           WithArenaE v e -> error "getExpTyEnv: TODO WithArenaE"
           SpawnE f locs args -> error "getExpTyEnv: TODO SpawnE"
           SyncE -> error "getExpTyEnv: TODO SyncE"
@@ -1497,7 +1497,8 @@ reOrderLetExpHelper (Just var) letExpOrder expr = fst $ run letExpOrder expr
           MkProdE xs -> let (xs', releasedBinds) = lambdaHandleExpList xs letExpOrder'
                           in (MkProdE xs', releasedBinds)
           ProjE {} -> error "reOrderLetExpHelper: TODO ProjE"
-          TimeIt {} -> error "reOrderLetExpHelper: TODO TimeIt"
+          TimeIt e ty b -> let (e', releasedBinds) = run letExpOrder' e  
+                         in (TimeIt e' ty b, releasedBinds)
           WithArenaE {} -> error "reOrderLetExpHelper: TODO WithArenaE"
           SpawnE {} -> error "reOrderLetExpHelper: TODO SpawnE"
           SyncE -> error "reOrderLetExpHelper: TODO SyncE"