From a6d1ffb169375f0721e328d0ba86aba371ce6913 Mon Sep 17 00:00:00 2001 From: vidsinghal Date: Mon, 7 Oct 2024 21:26:54 -0400 Subject: [PATCH] edits --- .../src/Gibbon/Passes/InferLocations.hs | 37 ------------------- gibbon-rts/rts-c/gibbon_rts.h | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/gibbon-compiler/src/Gibbon/Passes/InferLocations.hs b/gibbon-compiler/src/Gibbon/Passes/InferLocations.hs index 17661fe3..5edef763 100644 --- a/gibbon-compiler/src/Gibbon/Passes/InferLocations.hs +++ b/gibbon-compiler/src/Gibbon/Passes/InferLocations.hs @@ -152,46 +152,9 @@ convertFunTy (from,to,isPar) = do return $ LRM v (VarR r) md) (F.toList ls) --- convertFunTySoa :: ([Ty1],Ty1,Bool) -> DDefs Ty1 -> PassM (ArrowTy2 Ty2) --- convertFunTySoa (from,to,isPar) ddefs = do --- from' <- mapM convertTy from --- from'' <- mapM (convertTySoA ddefs) from --- to' <- convertTy to --- to'' <- convertTySoA ddefs to --- -- For this simple version, we assume every location is in a separate region: --- lrm1 <- concat <$> mapM (toLRM Input) from' --- lrm2 <- toLRM Output to' --- dbgTraceIt "Print in Inferloc: " dbgTraceIt (sdoc (lrm1, lrm2, from, to, from', to', from'', to'')) dbgTraceIt "\n" return $ ArrowTy2 { locVars = lrm1 ++ lrm2 --- , arrIns = from' --- , arrEffs = S.empty --- , arrOut = to' --- , locRets = [] --- , hasParallelism = isPar } --- where --- toLRM md ls = --- mapM (\v -> do r <- freshLocVar "r" --- return $ LRM v (VarR r) md) --- (F.toList ls) - - convertTy :: Ty1 -> PassM Ty2 convertTy ty = traverse (const (freshLocVar "loc")) ty --- convertTySoA :: DDefs Ty1 -> Ty1 -> PassM Ty2SoA --- convertTySoA ddefs ty = case ty of --- PackedTy tc loc -> case (M.lookup (toVar tc) ddefs) of --- Nothing -> do --- loc <- freshLocVar "loc" --- let locs = dbgTraceIt "Nothing case" [loc] --- in traverse (const $ pure locs) ty --- Just ddef -> do --- loc <- freshLocVar "loc" --- let locs = dbgTraceIt "just case" dbgTraceIt (sdoc ddef) dbgTraceIt "\n" [loc] --- in traverse (const $ pure locs) ty - - ---traverse (const (freshLocVar "loc")) ty - convertDDefs :: DDefs Ty1 -> PassM (DDefs Ty2) convertDDefs ddefs = traverse f ddefs where f (DDef tyargs n dcs) = do diff --git a/gibbon-rts/rts-c/gibbon_rts.h b/gibbon-rts/rts-c/gibbon_rts.h index a12381a0..6c9b9914 100644 --- a/gibbon-rts/rts-c/gibbon_rts.h +++ b/gibbon-rts/rts-c/gibbon_rts.h @@ -768,7 +768,7 @@ INLINE_HEADER void gib_grow_region(char **writeloc_addr, char **footer_addr) if (old_chunk_in_nursery) { gib_grow_region_in_nursery_fast( false, - old_chunk_in_nursery, + old_chunk_in_nursery, newsize, old_footer, writeloc_addr,