add support for global layout optimization for multiple functions

Author: vidsinghal

gibbon-compiler/examples/layout_bench/layout1ManyFuncsProducerConsumerOpt.ans

@@ -21,7 +21,7 @@ filterByKeywordInTagList keyword blogs = case blogs of
                                             Layout1 header id author date content tags rst -> let present = searchBlogTags keyword tags
                                                                                                 in if present then 
                                                                                                      let newRst  = filterByKeywordInTagList keyword rst
-                                                                                                      in Layout1 header id author date content tags newRst
+                                                                                                      in Layout4 tags content newRst header id author date
                                                                                                    else filterByKeywordInTagList keyword rst 
 
 

gibbon-compiler/examples/layout_bench/layout1ManyFuncsProducerConsumerOpt.hs renamed to gibbon-compiler/examples/layout_bench/manyFuncs.hs

@@ -0,0 +1 @@
+(Layout4  ->i  ->i  ->i (TagList (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Nil_v_1132))))))))))))  ->i (Content (Plain (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector)  ->r (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))))))))))))))))))))))))))))))))))))))))))))))))))))) (Layout4  ->i  ->i  ->i (TagList (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Nil_v_1132))))))))))))  ->i (Content (Plain (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))))))))))))))))))))))))))))))))))))))))))))))))))))) (End)  ->i  ->i  ->i (Header Vector)  ->i  ->i  ->i (ID 9)  ->i  ->i  ->i (Author Vector)  ->i  ->i  ->i (Date Vector))  ->i  ->i  ->i (Header Vector)  ->i  ->i  ->i (ID 8)  ->i  ->i  ->i (Author Vector)  ->i  ->i  ->i (Date Vector))'#()

gibbon-compiler/examples/layout_bench/manyFuncsGlobal.ans

@@ -0,0 +1 @@
+(Layout4  ->i  ->i  ->i (TagList (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Nil_v_1132))))))))))))  ->i (Content (Plain (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))))))))))))))))))))))))))))))))))))))))))))))))))))) (Layout4  ->i  ->i  ->i (TagList (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Cons_v_1132 Vector (Nil_v_1132))))))))))))  ->i (Content (Plain (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector)  ->r (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131 (Emph (Cons_v_1131 (Emph (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))) (Nil_v_1131))) (Cons_v_1131  ->i (Str Vector) (Cons_v_1131  ->i (Str Vector) (Nil_v_1131))))))))))))))))))))))))))))))))))))))))))))))))))))) (End)  ->i  ->i  ->i (Header Vector)  ->i  ->i  ->i (ID 9)  ->i  ->i  ->i (Author Vector)  ->i  ->i  ->i (Date Vector))  ->i  ->i  ->i (Header Vector)  ->i  ->i  ->i (ID 8)  ->i  ->i  ->i (Author Vector)  ->i  ->i  ->i (Date Vector))'#()

gibbon-compiler/examples/layout_bench/manyFuncsLocal.ans

@@ -92,7 +92,7 @@ import           Gibbon.Passes.Codegen        (codegenProg)
 import           Gibbon.Passes.Fusion2        (fusion2)
 import Gibbon.Passes.CalculateBounds          (inferRegSize)
 import           Gibbon.Pretty
-import Gibbon.Passes.OptimizeADTLayout (optimizeADTLayout)
+import Gibbon.Passes.OptimizeADTLayout (locallyOptimizeDataConLayout, globallyOptimizeDataConLayout)
 
 
 
@@ -599,7 +599,8 @@ passes config@Config{dynflags} l0 = do
           no_rcopies = gopt Opt_No_RemoveCopies dynflags
           parallel   = gopt Opt_Parallel dynflags
           should_fuse = gopt Opt_Fusion dynflags
-          opt_layout = gopt Opt_Layout dynflags 
+          opt_layout_local = gopt Opt_Layout_Local dynflags
+          opt_layout_global = gopt Opt_Layout_Global dynflags
           tcProg3     = L3.tcProg isPacked
       l0 <- go  "freshen"         freshNames            l0
       l0 <- goE0 "typecheck"       L0.tcProg             l0
@@ -641,11 +642,16 @@ passes config@Config{dynflags} l0 = do
               -- branches before InferLocations.
 
               -- Note: L1 -> L2
-              l1 <- if opt_layout 
+              l1 <- if opt_layout_local 
                     then do 
-                         after_layout_out <- goE1 "optimizeADTLayout" optimizeADTLayout l1
+                         after_layout_out <- goE1 "optimizeADTLayoutLocal" locallyOptimizeDataConLayout l1
                          flatten_after_opt <- goE1 "L1.flatten2" flattenL1 after_layout_out
-                         pure flatten_after_opt                        
+                         pure flatten_after_opt
+                    else if opt_layout_global
+                    then do 
+                         after_layout_out <- goE1 "optimizeADTLayoutGlobal" globallyOptimizeDataConLayout l1
+                         flatten_after_opt <- goE1 "L1.flatten2" flattenL1 after_layout_out
+                         pure flatten_after_opt
                     else return l1 
               l1 <- goE1 "copyOutOfOrderPacked" copyOutOfOrderPacked l1
               l1 <- goE1 "simplify_2"      simplifyL1             l1

gibbon-compiler/src/Gibbon/Compiler.hs

@@ -39,7 +39,8 @@ data GeneralFlag
   | Opt_GenGc              -- ^ Use the new non-generational GC.
   | Opt_NoEagerPromote     -- ^ Disable eager promotion.
   | Opt_SimpleWriteBarrier -- ^ Disables eliminate-indirection-chains optimization.
-  | Opt_Layout             -- ^ Optimize the layout of Algebraic data types
+  | Opt_Layout_Local       -- ^ Optimize the layout of Algebraic data types locally 
+  | Opt_Layout_Global      -- ^ Optimize the layout of Algebraic data types globally
   deriving (Show,Read,Eq,Ord)
 
 -- | Exactly like GHC's ddump flags.
@@ -116,7 +117,8 @@ dynflagsParser = DynFlags <$> (S.fromList <$> many gflagsParser) <*> (S.fromList
                    flag' Opt_GenGc (long "gen-gc" <> help "Use the new generational GC.") <|>
                    flag' Opt_NoEagerPromote (long "no-eager-promote" <> help "Disable eager promotion.") <|>
                    flag' Opt_SimpleWriteBarrier (long "simple-write-barrier" <> help "Disables eliminate-indirection-chains optimization.") <|>
-                   flag' Opt_Layout (long "opt-layout" <> help "Optimizes the Layout of Algebraic data types")
+                   flag' Opt_Layout_Local (long "opt-layout-local" <> help "Optimizes the Layout of Algebraic data types locally") <|>
+                   flag' Opt_Layout_Global (long "opt-layout-global" <> help "Optimizes the Layout of Algebraic data types globally")
 
 
     dflagsParser :: Parser DebugFlag

gibbon-compiler/src/Gibbon/DynFlags.hs

@@ -89,7 +89,7 @@ progToVEnv p@Prog {ddefs, fundefs, mainExp} =
            in unionEnv2s $ [expEnva, expEnvb, expEnvc]
         MkProdE xs -> unionEnv2s (L.map (getExpTyEnv env) xs)
         ProjE i e -> error "getExpTyEnv: TODO ProjE"
-        TimeIt e ty b -> error "getExpTyEnv: TODO TimeIt"
+        TimeIt e ty b -> getExpTyEnv env e
         WithArenaE v e -> error "getExpTyEnv: TODO WithArenaE"
         SpawnE f locs args -> error "getExpTyEnv: TODO SpawnE"
         SyncE -> error "getExpTyEnv: TODO SyncE"