edits

Author: vidsinghal

gibbon-compiler/examples/soa_examples/list.hs

@@ -38,7 +38,7 @@ id lst = lst
 
 gibbon_main = let 
 		lst = mkList 100
-                lst' = (add1 lst) 
+                lst' = id (add1 lst) 
 	       in sumList lst'
 
 

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

@@ -1348,20 +1348,25 @@ cursorizePackedExp freeVarToVarEnv lenv ddfs fundefs denv tenv senv ex =
                   let_assign_write_cur <$> LetE (d',[], CursorTy, Ext $ WriteVector write_vector_at rnd' (stripTyLocs el_ty)) <$>
                     go2 marker_added fvarenv' aft_dloc from_rec_end aft_flocs' rst
 
-                _ -> error $ "TODO: Cursorize: cursorizePackedExp: Ty not implemented!! " ++ show (ty)
+                -- _ -> error $ "TODO: Cursorize: cursorizePackedExp: Ty not implemented!! " ++ show (ty)
 
                 -- -- Write a pointer to a vector
                 -- ListTy el_ty -> do
                 --   rnd' <- cursorizeExp freeVarToVarEnv ddfs fundefs denv tenv senv rnd
                 --   LetE (d',[], CursorTy, Ext $ WriteList d rnd' (stripTyLocs el_ty)) <$>
                 --     go2 marker_added d' rst
 
-                -- -- shortcut pointer
-                -- CursorTy -> do
-                --   rnd' <- cursorizeExp freeVarToVarEnv ddfs fundefs denv tenv senv rnd
-                --   LetE (d',[], CursorTy, Ext $ WriteTaggedCursor d rnd') <$>
-                --     go2 marker_added d' rst
-                -- _ -> error $ "Unknown type encounterred while cursorizing DataConE. Type was " ++ show ty 
+                -- shortcut pointer
+                -- SoA case
+                -- Fix case for indirection/shortcut pointers
+                CursorTy -> do
+                   rnd' <- cursorizeExp freeVarToVarEnv lenv ddfs fundefs denv tenv senv rnd
+                   after_indirection <- gensym "aft_indirection"
+                   LetE (d',[], CursorTy, Ext $ WriteTaggedCursor aft_dloc rnd') <$>
+                    LetE (after_indirection,[], CursorTy, VarE d') <$> --Ext $ AddCursor aft_dloc (L3.LitE 8)
+                    go2 marker_added freeVarToVarEnv after_indirection from_rec_end aft_flocs rst
+                
+                _ -> error $ "Unknown type encounterred while cursorizing DataConE. Type was " ++ show ty 
 
 
 
@@ -1576,7 +1581,11 @@ cursorizePackedExp freeVarToVarEnv lenv ddfs fundefs denv tenv senv ex =
           if gopt Opt_DisableGC dflags
              -- || (from_reg == "dummy" || to_reg == "dummy") -- HACK!!!
              -- [2022.03.02]: ckoparkar:WTH does this hack enable?
-          then go freeVarToVarEnv tenv senv (DataConE from dcon [VarE (((unwrapLocVar . toLocVar)) to)])
+          then do
+            let locs_var = case M.lookup (fromLocArgToFreeVarsTy to) freeVarToVarEnv of 
+                                        Nothing -> error "Did not find variable for location!"
+                                        Just var -> var 
+            go freeVarToVarEnv tenv senv (DataConE from dcon [VarE locs_var])
           else do
             start <- gensym "start"
             end <- gensym "end"

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

@@ -37,7 +37,6 @@ removeCopiesFn :: DDefs Ty2 -> FunDefs2 -> FunDef2 -> PassM FunDef2
 removeCopiesFn ddefs fundefs f@FunDef{funArgs,funTy,funBody} = do
   let initLocEnv = M.fromList $ map (\(LRM lc r _) -> case r of 
                                                           _ -> (lc, regionToVar r)
-                                                          SoAR _ _ -> error "TODO: removeCopiesFn structure of arrays not implemented yet."
                                     ) (locVars funTy)
       initTyEnv  = M.fromList $ zip funArgs (arrIns funTy)
       env2 = Env2 initTyEnv (initFunEnv fundefs)
@@ -59,14 +58,14 @@ removeCopiesExp ddefs fundefs lenv env2 ex =
         [] -> error $ "removeCopies: No indirection constructor found for: " ++ sdoc tycon
         [dcon] -> do
           let reg_lout = case (lenv # lout) of 
-                                  SingleR v -> v
-                                  SoARv _ _ -> error "removeCopies: structure of arrays not implemented yet."
+                                  SingleR v -> fromRegVarToLocVar $ (SingleR v)
+                                  r@(SoARv _ _) -> fromRegVarToLocVar r
           let reg_lin = case (lenv # lin) of 
-                                  SingleR v -> v
-                                  SoARv _ _ -> error "removeCopies: structure of arrays not implemented yet."
+                                  SingleR v -> fromRegVarToLocVar $ (SingleR v)
+                                  r@(SoARv _ _) -> fromRegVarToLocVar r
           return $
             mkLets ([(indirection,[],PackedTy tycon lout,
-                      Ext $ IndirectionE tycon dcon (lout , singleLocVar $ reg_lout) (lin, singleLocVar $ reg_lin) arg)])
+                      Ext $ IndirectionE tycon dcon (lout , reg_lout) (lin, reg_lin) arg)])
             (VarE indirection)
         oth -> error $ "removeCopies: Multiple indirection constructors: " ++ sdoc oth