add point to point connection network

stanford-ppl · Jul 10, 2018 · 1a5e521 · 1a5e521
1 parent 36a033f
commit 1a5e521
Show file tree

Hide file tree

Showing 46 changed files with 82 additions and 10 deletions.
diff --git a/src/codegen/dot/NetworkDotCodegen.scala b/src/codegen/dot/NetworkDotCodegen.scala
@@ -8,8 +8,6 @@ class NetworkDotCodegen[B<:PinType:ClassTag](val fileName:String)(implicit compi
 
   import spademeta._
 
-  //lazy val dynamic = isDynamic(compiler.top)
-
   def openDot = SpadeConfig.openDot
 
   override def finPass = {
@@ -33,8 +31,6 @@ class NetworkDotCodegen[B<:PinType:ClassTag](val fileName:String)(implicit compi
     attr.label(label)
   }
 
-  //def shape(attr:DotAttr, n:Any) = attr.shape(box)
-
   val scale = 5
 
   def pos(attr:DotAttr, n:Any) = {
@@ -77,10 +73,6 @@ class NetworkDotCodegen[B<:PinType:ClassTag](val fileName:String)(implicit compi
   override def emitNode(n:N) = {
     n match {
       case n:Top => super.visitNode(n)
-      //case n:ArgFringe if !dynamic =>
-        //emitNode(s"${n}_top",setAttrs((n, "top")))
-        //emitNode(s"${n}_bottom",setAttrs((n, "bottom")))
-        //nodes += n
       case n:Routable => emitSingleNode(n)
     }
   }

diff --git a/src/core/SpadeConfig.scala b/src/core/SpadeConfig.scala
@@ -25,7 +25,7 @@ object SpadeConfig extends prism.GlobalConfig {
   /* ------------------ Architecture parameters ---------------- */
   register[Int]("word", default=32, info="Word width")
   register[Int]("vec", default=16, info="Vector width of SIMD lanes and vector network")
-  register[String]("net", default="static", info="Network type [dynamic, static, asic]")
+  register[String]("net", default="static", info="Network type [dynamic, static, asic, p2p]")
   register[String]("topo", default="mesh", info="Network topology [mesh, torus, cmesh]")
   register[Int]("row", default=2, info="number of rows in network")
   register[Int]("col", default=2, info="number of columns in network")

diff --git a/src/node/SpadeNodeUtil.scala b/src/node/SpadeNodeUtil.scala
@@ -119,6 +119,13 @@ trait SpadeNodeUtil {
     case n => false
   }
 
+  def isPointToPoint(n:Any):Boolean = n match {
+    case n:SpadeDesign => isPointToPoint(n.top)
+    case n:PointToPointTop => true
+    case n:PointToPointTopParam => true
+    case n => false
+  }
+
   def cuOf(n:SpadeNode) = n.collectUp[CU]().headOption
 
   def routableOf(n:SpadeNode) = n.collectUp[Routable]().headOption

diff --git a/src/node/Control.scala → src/node/primitives/Control.scala b/src/node/Control.scala → src/node/primitives/Control.scala
diff --git a/src/node/Counter.scala → src/node/primitives/Counter.scala b/src/node/Counter.scala → src/node/primitives/Counter.scala
diff --git a/src/node/Memory.scala → src/node/primitives/Memory.scala b/src/node/Memory.scala → src/node/primitives/Memory.scala
diff --git a/src/node/SIMDUnit.scala → src/node/primitives/SIMDUnit.scala b/src/node/SIMDUnit.scala → src/node/primitives/SIMDUnit.scala
diff --git a/src/node/Stage.scala → src/node/primitives/Stage.scala b/src/node/Stage.scala → src/node/primitives/Stage.scala
diff --git a/src/node/ArgFringe.scala → src/node/routable/ArgFringe.scala b/src/node/ArgFringe.scala → src/node/routable/ArgFringe.scala
diff --git a/src/node/CU.scala → src/node/routable/CU.scala b/src/node/CU.scala → src/node/routable/CU.scala
diff --git a/src/node/MC.scala → src/node/routable/MC.scala b/src/node/MC.scala → src/node/routable/MC.scala
diff --git a/src/node/Routable.scala → src/node/routable/Routable.scala b/src/node/Routable.scala → src/node/routable/Routable.scala
diff --git a/src/node/Router.scala → src/node/routable/Router.scala b/src/node/Router.scala → src/node/routable/Router.scala
diff --git a/src/node/SwitchBox.scala → src/node/routable/SwitchBox.scala b/src/node/SwitchBox.scala → src/node/routable/SwitchBox.scala
diff --git a/src/node/Terminal.scala → src/node/routable/Terminal.scala b/src/node/Terminal.scala → src/node/routable/Terminal.scala
diff --git a/src/node/AsicTop.scala → src/node/top/AsicTop.scala b/src/node/AsicTop.scala → src/node/top/AsicTop.scala
diff --git a/src/node/DynamicCMeshTop.scala → src/node/top/DynamicCMeshTop.scala b/src/node/DynamicCMeshTop.scala → src/node/top/DynamicCMeshTop.scala
diff --git a/src/node/DynamicGridTop.scala → src/node/top/DynamicGridTop.scala b/src/node/DynamicGridTop.scala → src/node/top/DynamicGridTop.scala
diff --git a/src/node/GridTop.scala → src/node/top/GridTop.scala b/src/node/GridTop.scala → src/node/top/GridTop.scala
diff --git a/src/node/top/PointToPointTop.scala b/src/node/top/PointToPointTop.scala
@@ -0,0 +1,50 @@
+package spade
+package node
+import param._
+
+case class PointToPointTop(
+  override val param:PointToPointTopParam
+)(implicit design:SpadeDesign) extends GridTop {
+  import param._
+  import design.spademeta._
+
+  @transient val cuArray = List.tabulate(numCols, numRows) { case (i,j) => 
+    if (i == numCols/2-1 && j == numRows-1) {
+      bundleGroup(fringePattern.argFringeParam, coord=Some(i+fringeNumCols,j))
+    } else {
+      bundleGroup(
+        centrolPattern.cuAt(i,j),
+        coord=Some(i+fringeNumCols, j)
+      )
+    }
+  }
+
+  @transient val dagArray = fringePattern.dagParam.map { dagParam =>
+    List.tabulate(2, numRows) { case (i, j) => 
+      bundleGroup(
+        dagParam, 
+        coord=Some(if (i==0) (1, j) else (numTotalCols-2, j))
+      ) 
+    }
+  }
+
+  @transient val mcArray = List.tabulate(2, numRows) { case (i, j) => 
+    bundleGroup(
+      fringePattern.mcParam,
+      coord=Some(if (i==0) (0,j) else (numTotalCols-1,j))
+    )
+  }
+
+  val networks = Nil
+
+  createSubmodules
+
+  override def minInputs[B<:PinType:ClassTag](param:Parameter) = 1000
+
+  override def maxInputs[B<:PinType:ClassTag](param:Parameter) = 1000
+
+  override def minOutputs[B<:PinType:ClassTag](param:Parameter) = 1000
+
+  override def maxOutputs[B<:PinType:ClassTag](param:Parameter) = 1000
+}
+
diff --git a/src/node/StaticCMeshTop.scala → src/node/top/StaticCMeshTop.scala b/src/node/StaticCMeshTop.scala → src/node/top/StaticCMeshTop.scala
diff --git a/src/node/StaticGridTop.scala → src/node/top/StaticGridTop.scala b/src/node/StaticGridTop.scala → src/node/top/StaticGridTop.scala
diff --git a/src/node/Top.scala → src/node/top/Top.scala b/src/node/Top.scala → src/node/top/Top.scala
@@ -18,7 +18,7 @@ trait Top extends Module {
   }
 
   def createSubmodules = {
-    paramMap.head._2.keys.foreach(checkParam)
+    paramMap.headOption.foreach { _._2.keys.foreach(checkParam) }
     bundleGroups.foreach { case b@BundleGroup(param, coord) => 
       val m = Module(Factory.create(param, b.bundles))
       coord.foreach { coord => indexOf(m) = coord }

diff --git a/src/param/DefaultParams.scala b/src/param/DefaultParams.scala
@@ -12,6 +12,7 @@ trait DefaultParams {
       case ("torus" , "dynamic") => DynamicGridTopParam()
       case ("cmesh" , "dynamic") => DynamicCMeshTopParam()
       case (_       , "asic") => AsicTopParam()
+      case (_       , "p2p") => PointToPointTopParam()
       case _ => StaticGridTopParam()
     }
   }

diff --git a/src/param/Factory.scala b/src/param/Factory.scala
@@ -16,6 +16,7 @@ object Factory extends Logging {
     case param:StaticCMeshTopParam => StaticCMeshTop(param)
     case param:DynamicCMeshTopParam => DynamicCMeshTop(param)
     case param:AsicTopParam => AsicTop(param)
+    case param:PointToPointTopParam => PointToPointTop(param)
   }
   def create(param:Parameter, nios:List[Bundle[_<:PinType]])(implicit design:SpadeDesign):Routable = param match {
     case param:PCUParam => PCU(param, nios)

diff --git a/src/param/MemoryParam.scala → src/param/primitives/MemoryParam.scala b/src/param/MemoryParam.scala → src/param/primitives/MemoryParam.scala
diff --git a/src/param/SIMDParam.scala → src/param/primitives/SIMDParam.scala b/src/param/SIMDParam.scala → src/param/primitives/SIMDParam.scala
diff --git a/src/param/StageParam.scala → src/param/primitives/StageParam.scala b/src/param/StageParam.scala → src/param/primitives/StageParam.scala
diff --git a/src/param/ArgFringeParam.scala → src/param/routable/ArgFringeParam.scala b/src/param/ArgFringeParam.scala → src/param/routable/ArgFringeParam.scala
diff --git a/src/param/CUParams.scala → src/param/routable/CUParams.scala b/src/param/CUParams.scala → src/param/routable/CUParams.scala
diff --git a/src/param/MCParam.scala → src/param/routable/MCParam.scala b/src/param/MCParam.scala → src/param/routable/MCParam.scala
diff --git a/src/param/RouterParam.scala → src/param/routable/RouterParam.scala b/src/param/RouterParam.scala → src/param/routable/RouterParam.scala
diff --git a/src/param/SwitchParam.scala → src/param/routable/SwitchParam.scala b/src/param/SwitchParam.scala → src/param/routable/SwitchParam.scala
diff --git a/src/param/AsicTopParam.scala → src/param/top/AsicTopParam.scala b/src/param/AsicTopParam.scala → src/param/top/AsicTopParam.scala
diff --git a/src/param/CMeshTopParam.scala → src/param/top/CMeshTopParam.scala b/src/param/CMeshTopParam.scala → src/param/top/CMeshTopParam.scala
diff --git a/src/param/DynamicCMeshNetworkParam.scala → src/param/top/DynamicCMeshNetworkParam.scala b/src/param/DynamicCMeshNetworkParam.scala → src/param/top/DynamicCMeshNetworkParam.scala
diff --git a/src/param/DynamicGridNetworkParam.scala → src/param/top/DynamicGridNetworkParam.scala b/src/param/DynamicGridNetworkParam.scala → src/param/top/DynamicGridNetworkParam.scala
diff --git a/src/param/DynamicGridTopParam.scala → src/param/top/DynamicGridTopParam.scala b/src/param/DynamicGridTopParam.scala → src/param/top/DynamicGridTopParam.scala
diff --git a/src/param/GridTopParam.scala → src/param/top/GridTopParam.scala b/src/param/GridTopParam.scala → src/param/top/GridTopParam.scala
diff --git a/src/param/NetowrkParam.scala → src/param/top/NetowrkParam.scala b/src/param/NetowrkParam.scala → src/param/top/NetowrkParam.scala
diff --git a/src/param/Patterns.scala → src/param/top/Patterns.scala b/src/param/Patterns.scala → src/param/top/Patterns.scala
diff --git a/src/param/top/PointToPointTopParam.scala b/src/param/top/PointToPointTopParam.scala
@@ -0,0 +1,21 @@
+package spade
+package param
+
+import SpadeConfig._
+case class PointToPointTopParam(
+  numRows:Int=option[Int]("row"),
+  numCols:Int=option[Int]("col"),
+  centrolPattern:GridCentrolPattern=defaultCentrolPattern,
+  fringePattern:GridFringePattern=defaultFringePattern
+) extends GridTopParam {
+  val busWithReady = true
+  val fringeNumCols = fringePattern match {
+    case _:MCOnly => 1
+    case _:MC_DramAG => 2
+  }
+  // Oneside
+  val numTotalRows = numRows
+  val numTotalCols = numCols+fringeNumCols*2
+  val networkParams = Nil
+}
+
diff --git a/src/param/StaticCMeshNetworkParam.scala → src/param/top/StaticCMeshNetworkParam.scala b/src/param/StaticCMeshNetworkParam.scala → src/param/top/StaticCMeshNetworkParam.scala
diff --git a/src/param/StaticGridNetworkParam.scala → src/param/top/StaticGridNetworkParam.scala b/src/param/StaticGridNetworkParam.scala → src/param/top/StaticGridNetworkParam.scala
diff --git a/src/param/StaticGridTopParam.scala → src/param/top/StaticGridTopParam.scala b/src/param/StaticGridTopParam.scala → src/param/top/StaticGridTopParam.scala
diff --git a/src/param/TopParam.scala → src/param/top/TopParam.scala b/src/param/TopParam.scala → src/param/top/TopParam.scala