Merge pull request #220 from rise-lang/barrier-tests-from-lift

Port barrier tests from Lift

src/main/scala/shine/OpenCL/AdjustArraySizesForAllocations.scala

@@ -96,6 +96,10 @@ object AdjustArraySizesForAllocations {
 
       case Map(_, _, _, _, _, a) => visitAndGatherInformation(a, parallInfo)
 
+      // TODO: think more about these two, what about the indices?
+      case Gather(_, _, _, indices, a) => visitAndGatherInformation(a, parallInfo)
+      case Scatter(_, _, _, indices, a) => visitAndGatherInformation(a, parallInfo)
+
       case pattern => throw new Exception(s"this should not happen for now: $pattern")
     }
   }

src/main/scala/shine/OpenCL/Compilation/Passes/InsertMemoryBarriers.scala

@@ -167,6 +167,10 @@ object InsertMemoryBarriers {
         collectWrites(a, allocs, writes); collectWrites(b, allocs, writes)
       case TakeAcc(_, _, _, a) => collectWrites(a, allocs, writes)
       case TransposeAcc(_, _, _, a) => collectWrites(a, allocs, writes)
+      // TODO: collect reads in indices?
+      case ScatterAcc(_, _, _, indices, a) =>
+        /* collectReads(indices, allocs, reads); */ collectWrites(a, allocs, writes)
+      case UnzipAcc(_, _, _, a) => collectWrites(a, allocs, writes)
       case _ => throw new Exception(s"did not expect $a")
     }
   }