Add dyn flag to enable layout optimization. Remove dependency from annotations

Author: vidsinghal

gibbon-compiler/examples/layout_bench/layout1ContentSearchRunPipeline.ans

@@ -1 +1 @@
-(Layout1tmp (Content (Plain (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector)  ->r (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))))))))))))))))))))))))))))))))))))))))))))))))))))) (Layout1tmp (Content (Plain (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))))))))))))))))))))))))))))))))))))))))))))))))))))) (End)  ->i (Header Vector)  ->i (ID 9)  ->i (Author Vector)  ->i (Date Vector)  ->i (TagList (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Nil_v_1063)))))))))))))  ->i (Header Vector)  ->i (ID 8)  ->i (Author Vector)  ->i (Date Vector)  ->i (TagList (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Nil_v_1063)))))))))))))'#()
+(Layout1  ->i (Header Vector)  ->i (ID 8)  ->i (Author Vector)  ->i (Date Vector) (Content (Plain (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->r  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Nil_v_1062)))))))))))))))))))))))))))))))))))))))))))))))))))))  ->i (TagList (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Nil_v_1063)))))))))))) (Layout1  ->i (Header Vector)  ->i (ID 9)  ->i (Author Vector)  ->i (Date Vector) (Content (Plain (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062 (Emph (Cons_v_1062  ->i (Str Vector) (Nil_v_1062))) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Cons_v_1062  ->i (Str Vector) (Nil_v_1062)))))))))))))))))))))))))))))))))))))))))))))))))))))  ->i (TagList (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Cons_v_1063 Vector (Nil_v_1063)))))))))))) (End)))'#()

gibbon-compiler/examples/layout_bench/layout1ContentSearchRunPipeline.hs

@@ -4,7 +4,6 @@ import GenerateLayout1
 type Text   = Vector Char
 
 emphKeywordInContent :: Text -> Blog -> Blog
-{-# ANN emphKeywordInContent Layout1 #-}
 emphKeywordInContent keyword blogs = 
    case blogs of 
       End -> End 

gibbon-compiler/src/Gibbon/Compiler.hs

@@ -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 (shuffleDataCon)
+import Gibbon.Passes.OptimizeADTLayout (optimizeADTLayout)
 
 
 
@@ -599,6 +599,7 @@ 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 
           tcProg3     = L3.tcProg isPacked
       l0 <- go  "freshen"         freshNames            l0
       l0 <- goE0 "typecheck"       L0.tcProg             l0
@@ -640,7 +641,9 @@ passes config@Config{dynflags} l0 = do
               -- branches before InferLocations.
 
               -- Note: L1 -> L2
-              l1 <- goE1 "optimizeADTLayout" shuffleDataCon l1
+              l1 <- if opt_layout 
+                    then goE1 "optimizeADTLayout" optimizeADTLayout l1
+                    else return l1 
               l1 <- goE1 "copyOutOfOrderPacked" copyOutOfOrderPacked l1
               l1 <- goE1 "simplify_2"      simplifyL1             l1
               l1 <- go "L1.typecheck"    L1.tcProg     l1

gibbon-compiler/src/Gibbon/DynFlags.hs

@@ -39,6 +39,7 @@ 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
   deriving (Show,Read,Eq,Ord)
 
 -- | Exactly like GHC's ddump flags.
@@ -114,7 +115,8 @@ dynflagsParser = DynFlags <$> (S.fromList <$> many gflagsParser) <*> (S.fromList
                    flag' Opt_PrintGcStats (long "print-gc-stats" <> short 'S' <> help "Record and print GC statistics.") <|>
                    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_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")
 
 
     dflagsParser :: Parser DebugFlag