Main pass to optimize layout when user annotates function

iu-parfunc · Sep 13, 2023 · c937d0c · c937d0c
1 parent 583a207
commit c937d0c
Show file tree

Hide file tree

Showing 5 changed files with 478 additions and 63 deletions.
diff --git a/gibbon-compiler/examples/layout_bench/layout1ContentSearchRunPipeline.hs b/gibbon-compiler/examples/layout_bench/layout1ContentSearchRunPipeline.hs
@@ -0,0 +1,22 @@
+import Basics
+import GenerateLayout1
+
+type Text   = Vector Char
+
+emphKeywordInContent :: Text -> Blog -> Blog
+{-# ANN emphKeywordInContent Layout1 #-}
+emphKeywordInContent keyword blogs = 
+   case blogs of 
+      End -> End 
+      Layout1 header id author date content tags rst -> let newContent = case content of 
+                                                                               Content block -> Content (emphasizeKeywordInBlock keyword block)
+                                                            newRst     = emphKeywordInContent keyword rst 
+                                                        in Layout1 header id author date newContent tags newRst
+
+-- main function 
+gibbon_main = 
+   let blogs = mkBlogs_layout1 2
+       keyword :: Vector Char  
+       keyword = "a"
+       newblgs = emphKeywordInContent keyword blogs
+   in printPacked newblgs
diff --git a/gibbon-compiler/src/Gibbon/Compiler.hs b/gibbon-compiler/src/Gibbon/Compiler.hs
@@ -92,6 +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)
 
 
 
@@ -639,6 +640,7 @@ passes config@Config{dynflags} l0 = do
               -- branches before InferLocations.
 
               -- Note: L1 -> L2
+              l1 <- goE1 "optimizeADTLayout" shuffleDataCon l1
               l1 <- goE1 "copyOutOfOrderPacked" copyOutOfOrderPacked l1
               l1 <- goE1 "simplify_2"      simplifyL1             l1
               l1 <- go "L1.typecheck"    L1.tcProg     l1

diff --git a/gibbon-compiler/src/Gibbon/Passes/DefinitionUseChains.hs b/gibbon-compiler/src/Gibbon/Passes/DefinitionUseChains.hs
@@ -104,11 +104,7 @@ generateDefUseChainsFunction ::
 generateDefUseChainsFunction env f@FunDef {funName, funBody, funTy, funArgs} =
   let edgeList = generateDefUseChainsFunBody env funBody
       (graph, nodeFromVertex, vertexFromKey) = G.graphFromEdges edgeList
-   in dbgTraceIt
-        (sdoc edgeList)
-        dbgTraceIt
-        ("\n")
-        M.insert
+   in   M.insert
         funName
         (graph, nodeFromVertex, vertexFromKey)
         M.empty
@@ -119,7 +115,7 @@ getDefinitionsReachingLetExp :: (FreeVars (e l d), Ord l, Ord d, Ord (e l d), Ou
 getDefinitionsReachingLetExp f@FunDef {funName, funBody, funTy, funArgs} =
   let edgeList = generateUseDefChainsFunBody M.empty funBody
       (graph, nodeFromVertex, vertexFromKey) = G.graphFromEdges edgeList
-    in dbgTraceIt (sdoc edgeList) dbgTraceIt ("\n") M.insert funName (graph, nodeFromVertex, vertexFromKey) M.empty
+    in M.insert funName (graph, nodeFromVertex, vertexFromKey) M.empty
 
 
 
@@ -132,11 +128,7 @@ generateDefUseChainsExp ::
 generateDefUseChainsExp env key expr =
   let edgeList = generateDefUseChainsFunBody env expr
       (graph, nodeFromVertex, vertexFromKey) = G.graphFromEdges edgeList
-   in dbgTraceIt
-        (sdoc edgeList)
-        dbgTraceIt
-        ("\n")
-        M.insert
+   in M.insert
         key
         (graph, nodeFromVertex, vertexFromKey)
         M.empty
@@ -350,3 +342,11 @@ getDefUseChainsVar var exp isReDefined =
     MapE {} -> error "getDefUseChainsVar: TODO MapE"
     FoldE {} -> error "getDefUseChainsVar: TODO FoldE"
     Ext _ -> error "getDefUseChainsVar: TODO Ext"
+
+
+
+-- TODO: 
+-- For UseDefChains, add variables introduced in case expressions.
+-- successors are expressions that use those expressions, make this recursive.
+-- remove all let binds 
+-- then release let binds using gFreeVars