Merge branch 'main' into barrier-tests-from-lift

rise-lang · Feb 17, 2022 · 693493b · 693493b
2 parents e621de7 + 6f5aded
commit 693493b
Show file tree

Hide file tree

Showing 13 changed files with 1,836 additions and 885 deletions.
diff --git a/runtime/clap_wrapper.sh b/runtime/clap_wrapper.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-LD_PRELOAD=./lib/clap/build/libClap.so $1 
+LD_PRELOAD=./lib/clap/build/libClap.so "$1" "$2"
diff --git a/src/main/scala/apps/mm.scala b/src/main/scala/apps/mm.scala
@@ -73,8 +73,8 @@ object mm {
               ))(zip(p6)(x._1))
             )
           ))(mapSeq(mapSeq(id))(generate(fun(_ => generate(fun(_ => lf32(0.0f)))))) :: (v4`.`v3`.`f32)) |> //
-          mapSeq(asScalar o mapSeq(id) o asVector(vw)) |>
-          transpose // v3.v4.f
+            mapSeq(asScalar o mapSeq(id) o asVector(vw)) |>
+            transpose // v3.v4.f
         )) |> join |> transpose
       )) |> join
     ))
@@ -107,7 +107,8 @@ object mm {
             mapWorkGroup(0)(fun(p3 =>
               zip(p2)(p3) |> // O'.(v8.v5.f x v8.v7.f)
                 // FIXME: there seems to be a bug in AdjustArraySizesForAllocations
-                oclReduceSeq(AddressSpace.Private)(fun((p13, p14) =>
+//                oclReduceSeq(AddressSpace.Private)(fun((p13, p14) =>
+                  oclReduceSeq(AddressSpace.Local)(fun((p13, p14) =>
                   // (v5/^v4).(v7/^v3).v4.v3.f x (v8.v5.f x v8.v7.f)
                   let (toLocal(makePair(
                     p14._1 |> join |> split(v6) |> // ((v8 x v5) /^ v6).v6.f