GALOP

futhark.cabal

@@ -392,7 +392,9 @@ library
       Futhark.Optimise.Unstream
       Futhark.Pass
       Futhark.Pass.AD
-      Futhark.Pass.CoalesceAccess
+      Futhark.Pass.OptimizeMemLayout
+      Futhark.Pass.OptimizeMemLayout.Transform
+      Futhark.Pass.OptimizeMemLayout.Layout
       Futhark.Pass.ExpandAllocations
       Futhark.Pass.ExplicitAllocations
       Futhark.Pass.ExplicitAllocations.GPU

src/Futhark/CLI/Dev.hs

@@ -45,7 +45,6 @@ import Futhark.Optimise.TileLoops
 import Futhark.Optimise.Unstream
 import Futhark.Pass
 import Futhark.Pass.AD
-import Futhark.Pass.CoalesceAccess
 import Futhark.Pass.ExpandAllocations
 import Futhark.Pass.ExplicitAllocations.GPU qualified as GPU
 import Futhark.Pass.ExplicitAllocations.MC qualified as MC
@@ -56,6 +55,7 @@ import Futhark.Pass.FirstOrderTransform
 import Futhark.Pass.KernelBabysitting
 import Futhark.Pass.LiftAllocations as LiftAllocations
 import Futhark.Pass.LowerAllocations as LowerAllocations
+import Futhark.Pass.OptimizeMemLayout
 import Futhark.Pass.Simplify
 import Futhark.Passes
 import Futhark.Util.Log
@@ -391,15 +391,15 @@ coalesceOption short =
   passOption (passDescription pass) (UntypedPass perform) short long
   where
     perform (GPU prog) config =
-      GPU <$> runPipeline (onePass coalesceAccess) config prog
+      GPU <$> runPipeline (onePass optimizeMemLayout) config prog
     perform (MC prog) config =
-      MC <$> runPipeline (onePass coalesceAccess) config prog
+      MC <$> runPipeline (onePass optimizeMemLayout) config prog
     perform s _ =
       externalErrorS $
         "Pass '" ++ passDescription pass ++ "' cannot operate on " ++ representation s
 
     long = [passLongOption pass]
-    pass = coalesceAccess :: Pass GPU.GPU GPU.GPU
+    pass = optimizeMemLayout :: Pass GPU.GPU GPU.GPU
 
 sinkOption :: String -> FutharkOption
 sinkOption short =