Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/scala/riscv/Core.scala
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ object createDynamicPipeline {
val decode = new Stage("ID").setName("decode")

override val issuePipeline = new StaticPipeline {
override val parentPipeline = dynamicPipeline
override val stages = Seq(fetch, decode)
override val config = dynamicPipeline.config
override val data = dynamicPipeline.data
Expand Down
12 changes: 10 additions & 2 deletions src/main/scala/riscv/DynamicPipeline.scala
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,20 @@ trait DynamicPipeline extends Pipeline {

override def serviceOption[T](implicit tag: ClassTag[T]): Option[T] = {
super.serviceOption[T] match {
case None => issuePipeline.serviceOption[T]
case None => issuePipeline.serviceOptionLocal[T]
case someService => someService
}
}

override def hasService[T](implicit tag: ClassTag[T]): Boolean = {
super.hasService[T] || issuePipeline.hasService[T]
super.hasService[T] || issuePipeline.hasServiceLocal[T]
}

def serviceOptionLocal[T](implicit tag: ClassTag[T]): Option[T] = {
super.serviceOption[T]
}

def hasServiceLocal[T](implicit tag: ClassTag[T]): Boolean = {
super.hasService[T]
}
}
30 changes: 30 additions & 0 deletions src/main/scala/riscv/StaticPipeline.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import spinal.core._

import collection.mutable

import scala.reflect.ClassTag

private class PipelineDataInfo {
var firstOutputStageId = Int.MaxValue
var lastOutputStageId = -1
Expand All @@ -25,6 +27,7 @@ private class PipelineDataInfo {

trait StaticPipeline extends Pipeline {
private var pipelineRegsMap: Map[Stage, PipelineRegs] = null
val parentPipeline: DynamicPipeline = null

def pipelineRegs: Map[Stage, PipelineRegs] = {
assert(pipelineRegsMap != null)
Expand Down Expand Up @@ -110,4 +113,31 @@ trait StaticPipeline extends Pipeline {
stage.connectLastValues()
}
}

override def serviceOption[T](implicit tag: ClassTag[T]): Option[T] = {
if (parentPipeline == null) {
super.serviceOption[T]
} else {
super.serviceOption[T] match {
case None => parentPipeline.serviceOptionLocal[T]
case someService => someService
}
}
}

override def hasService[T](implicit tag: ClassTag[T]): Boolean = {
if (parentPipeline == null) {
super.hasService[T]
} else {
super.hasService[T] || parentPipeline.hasServiceLocal[T]
}
}

def serviceOptionLocal[T](implicit tag: ClassTag[T]): Option[T] = {
super.serviceOption[T]
}

def hasServiceLocal[T](implicit tag: ClassTag[T]): Boolean = {
super.hasService[T]
}
}
Loading