From 7cf5d4aa90afc5e8f48d1514fc68d16bd1dc21db Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Fri, 27 Oct 2017 00:26:35 -0700 Subject: [PATCH] diplomacy: define only primary node types --- src/main/scala/amba/ahb/package.scala | 4 +++- src/main/scala/amba/apb/package.scala | 4 +++- src/main/scala/amba/axi4/package.scala | 4 ++-- src/main/scala/diplomacy/package.scala | 2 ++ src/main/scala/interrupts/package.scala | 4 +--- src/main/scala/tile/LazyRoCC.scala | 4 ++-- src/main/scala/tilelink/package.scala | 8 +------- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/scala/amba/ahb/package.scala b/src/main/scala/amba/ahb/package.scala index c6ce626a..f7c080ee 100644 --- a/src/main/scala/amba/ahb/package.scala +++ b/src/main/scala/amba/ahb/package.scala @@ -3,9 +3,11 @@ package freechips.rocketchip.amba import Chisel._ -import freechips.rocketchip.diplomacy.OutwardNodeHandle +import freechips.rocketchip.diplomacy._ package object ahb { type AHBOutwardNode = OutwardNodeHandle[AHBMasterPortParameters, AHBSlavePortParameters, AHBBundle] + type AHBInwardNode = InwardNodeHandle[AHBMasterPortParameters, AHBSlavePortParameters, AHBBundle] + type AHBNode = SimpleNodeHandle[AHBMasterPortParameters, AHBSlavePortParameters, AHBBundle] } diff --git a/src/main/scala/amba/apb/package.scala b/src/main/scala/amba/apb/package.scala index c8fc21e5..7a1a5432 100644 --- a/src/main/scala/amba/apb/package.scala +++ b/src/main/scala/amba/apb/package.scala @@ -3,9 +3,11 @@ package freechips.rocketchip.amba import Chisel._ -import freechips.rocketchip.diplomacy.OutwardNodeHandle +import freechips.rocketchip.diplomacy._ package object apb { type APBOutwardNode = OutwardNodeHandle[APBMasterPortParameters, APBSlavePortParameters, APBBundle] + type APBInwardNode = InwardNodeHandle[APBMasterPortParameters, APBSlavePortParameters, APBBundle] + type APBNode = SimpleNodeHandle[APBMasterPortParameters, APBSlavePortParameters, APBBundle] } diff --git a/src/main/scala/amba/axi4/package.scala b/src/main/scala/amba/axi4/package.scala index cc5567bd..661c6650 100644 --- a/src/main/scala/amba/axi4/package.scala +++ b/src/main/scala/amba/axi4/package.scala @@ -7,7 +7,7 @@ import freechips.rocketchip.diplomacy._ package object axi4 { + type AXI4Node = SimpleNodeHandle[AXI4MasterPortParameters, AXI4SlavePortParameters, AXI4Bundle] type AXI4OutwardNode = OutwardNodeHandle[AXI4MasterPortParameters, AXI4SlavePortParameters, AXI4Bundle] - type AXI4AsyncOutwardNode = OutwardNodeHandle[AXI4AsyncMasterPortParameters, AXI4AsyncSlavePortParameters, AXI4AsyncBundle] - type AXI4Node = NodeHandle[AXI4MasterPortParameters, AXI4SlavePortParameters, AXI4Bundle, AXI4MasterPortParameters, AXI4SlavePortParameters, AXI4Bundle] + type AXI4InwardNode = InwardNodeHandle[AXI4MasterPortParameters, AXI4SlavePortParameters, AXI4Bundle] } diff --git a/src/main/scala/diplomacy/package.scala b/src/main/scala/diplomacy/package.scala index 1ac46a24..6bcf60a6 100644 --- a/src/main/scala/diplomacy/package.scala +++ b/src/main/scala/diplomacy/package.scala @@ -7,6 +7,8 @@ import freechips.rocketchip.config.Parameters package object diplomacy { + type SimpleNodeHandle[D, U, B <: Chisel.Data] = NodeHandle[D, U, B, D, U, B] + def sourceLine(sourceInfo: SourceInfo, prefix: String = " (", suffix: String = ")") = sourceInfo match { case SourceLine(filename, line, col) => s"$prefix$filename:$line:$col$suffix" case _ => "" diff --git a/src/main/scala/interrupts/package.scala b/src/main/scala/interrupts/package.scala index 91b089db..36f50740 100644 --- a/src/main/scala/interrupts/package.scala +++ b/src/main/scala/interrupts/package.scala @@ -9,7 +9,5 @@ package object interrupts { type IntInwardNode = InwardNodeHandle[IntSourcePortParameters, IntSinkPortParameters, Vec[Bool]] type IntOutwardNode = OutwardNodeHandle[IntSourcePortParameters, IntSinkPortParameters, Vec[Bool]] - type IntNode = NodeHandle[IntSourcePortParameters, IntSinkPortParameters, Vec[Bool], IntSourcePortParameters, IntSinkPortParameters, Vec[Bool]] - type IntSyncInwardNode = InwardNodeHandle[IntSourcePortParameters, IntSinkPortParameters, SyncInterrupts] - type IntSyncOutwardNode = OutwardNodeHandle[IntSourcePortParameters, IntSinkPortParameters, SyncInterrupts] + type IntNode = SimpleNodeHandle[IntSourcePortParameters, IntSinkPortParameters, Vec[Bool]] } diff --git a/src/main/scala/tile/LazyRoCC.scala b/src/main/scala/tile/LazyRoCC.scala index 663ef7bc..cbbb175b 100644 --- a/src/main/scala/tile/LazyRoCC.scala +++ b/src/main/scala/tile/LazyRoCC.scala @@ -60,8 +60,8 @@ class RoCCCoreIO(implicit p: Parameters) extends CoreBundle()(p) { abstract class LazyRoCC(implicit p: Parameters) extends LazyModule { val module: LazyRoCCModule - val atlNode: TLMixedNode = TLIdentityNode() - val tlNode: TLMixedNode = TLIdentityNode() + val atlNode: TLNode = TLIdentityNode() + val tlNode: TLNode = TLIdentityNode() } class RoCCIO(outer: LazyRoCC)(implicit p: Parameters) extends RoCCCoreIO()(p) { diff --git a/src/main/scala/tilelink/package.scala b/src/main/scala/tilelink/package.scala index 4dc8cc24..9a6cba28 100644 --- a/src/main/scala/tilelink/package.scala +++ b/src/main/scala/tilelink/package.scala @@ -9,11 +9,5 @@ package object tilelink { type TLInwardNode = InwardNodeHandle[TLClientPortParameters, TLManagerPortParameters, TLBundle] type TLOutwardNode = OutwardNodeHandle[TLClientPortParameters, TLManagerPortParameters, TLBundle] - type TLNode = NodeHandle[TLClientPortParameters, TLManagerPortParameters, TLBundle, TLClientPortParameters, TLManagerPortParameters, TLBundle] - type TLAsyncInwardNode = InwardNodeHandle[TLAsyncClientPortParameters, TLAsyncManagerPortParameters, TLAsyncBundle] - type TLAsyncOutwardNode = OutwardNodeHandle[TLAsyncClientPortParameters, TLAsyncManagerPortParameters, TLAsyncBundle] - type TLRationalInwardNode = InwardNodeHandle[TLRationalClientPortParameters, TLRationalManagerPortParameters, TLRationalBundle] - type TLRationalOutwardNode = OutwardNodeHandle[TLRationalClientPortParameters, TLRationalManagerPortParameters, TLRationalBundle] - type TLMixedNode = MixedNode[TLClientPortParameters, TLManagerPortParameters, TLEdgeIn, TLBundle, - TLClientPortParameters, TLManagerPortParameters, TLEdgeOut, TLBundle] + type TLNode = SimpleNodeHandle[TLClientPortParameters, TLManagerPortParameters, TLBundle] }