project constraints in dependencies

Author: Oron Port

core/src/main/scala/dfhdl/platforms/resources/Resource.scala

@@ -9,6 +9,9 @@ trait Resource extends ResourceContext:
   private val connections = mutable.ListBuffer[Resource]()
   protected[resources] def connect(that: Resource): Unit =
     connections += that
+  private val downstreamDeps = mutable.ListBuffer[ResourceDeps]()
+  private[resources] def addDownstreamDep(that: ResourceDeps): Unit =
+    downstreamDeps += that
   // will always return at least this resource
   private lazy val allConnections: List[Resource] =
     val visited = mutable.Set[Resource]()
@@ -24,7 +27,7 @@ trait Resource extends ResourceContext:
     if (res.isEmpty) List(this) else res
   end allConnections
   lazy val allSigConstraints: List[SigConstraint] =
-    allConnections.flatMap(_.directAndOwnerSigConstraints).merge
+    (allConnections ++ downstreamDeps).flatMap(_.directAndOwnerSigConstraints).merge
   owner.addResource(this)
 end Resource
 

core/src/main/scala/dfhdl/platforms/resources/ResourceDeps.scala

@@ -1,9 +1,11 @@
 package dfhdl.platforms.resources
 
 trait ResourceDeps extends Resource:
-  protected def deps: List[Resource]
+  protected lazy val upstreamDeps: List[Resource]
   override protected[resources] def connect(that: Resource): Unit =
-    deps.lazyZip(that.asInstanceOf[ResourceDeps].deps).foreach {
+    upstreamDeps.lazyZip(that.asInstanceOf[ResourceDeps].upstreamDeps).foreach {
       case (r1, r2) => r1.connect(r2)
     }
     super.connect(that)
+  for (dep <- upstreamDeps)
+    dep.addDownstreamDep(this)

lib/src/main/scala/dfhdl/platforms/resources/DiffPair.scala

@@ -3,4 +3,4 @@ package dfhdl.platforms.resources
 trait DiffPair extends ResourceDeps:
   val pPin: IO
   val nPin: IO
-  protected def deps: List[Resource] = List(pPin, nPin)
+  lazy val upstreamDeps: List[Resource] = List(pPin, nPin)

lib/src/main/scala/dfhdl/platforms/resources/IOBus.scala

@@ -4,4 +4,4 @@ import dfhdl.compiler.ir.constraints
 
 class IOBus[T <: IO](val ios: T*) extends ResourceDeps:
   def apply(i: Int): T = ios(i)
-  protected def deps: List[Resource] = ios.toList
+  lazy val upstreamDeps: List[Resource] = ios.toList