Merge remote-tracking branch 'origin/develop' into issue177_modular

stanford-ppl · Jan 12, 2019 · 7c226bb · 7c226bb
2 parents 029b7f1 + 4c4e1ae
commit 7c226bb
Show file tree

Hide file tree

Showing 3 changed files with 490 additions and 4 deletions.
diff --git a/argon/src/argon/codegen/Codegen.scala b/argon/src/argon/codegen/Codegen.scala
@@ -112,7 +112,7 @@ trait Codegen extends Traversal {
             take0(t, h :: accList, h + accSum)
           case _ => accList
         }
-      take0(l.toList, Nil, 0).size
+      take0(l.drop(1).toList, List(l.head), l.head).size
     }
 
     if (hierarchyDepth == 0) {

diff --git a/src/spatial/traversal/BroadcastCleanup.scala b/src/spatial/traversal/BroadcastCleanup.scala
@@ -31,6 +31,13 @@ case class BroadcastCleanupAnalyzer(IR: State) extends AccelTraversal {
                 dbgs(s"  - Propogating info to $in")
                 in.isBroadcastAddr = if (in.getBroadcastAddr.isDefined) (in.isBroadcastAddr & broadcast) else broadcast
               }              
+            case Op(_: BankedWriter[_]) if sym.getPorts(0).isDefined => 
+              val broadcast = sym.port.broadcast.exists(_>0)
+              dbgs(s"Reader $sym is broadcast: $broadcast")
+              sym.nestedInputs.foreach{in => 
+                dbgs(s"  - Propogating info to $in")
+                in.isBroadcastAddr = if (in.getBroadcastAddr.isDefined) (in.isBroadcastAddr & broadcast) else broadcast
+              }              
             case _ if (sym.getBroadcastAddr.isDefined) => 
               dbgs(s"Node $sym has BroadcastAddress metadata defined as ${sym.isBroadcastAddr} ")
               sym.nestedInputs.foreach{in =>