wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix SharedNoC config

Browse Source
This commit is contained in:
Jerry Zhao
2023-10-20 15:42:16 -07:00
parent 646ba4fba7
commit 68f7c90938
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
generators/chipyard/src/main/scala/config/NoCConfigs.scala
View File

@@ -45,7 +45,7 @@ import scala.collection.immutable.ListMap
* | SI:Core 2 | SO:system[0] | SO:system[1] | SI:Core 3 | * | SI:Core 2 | SO:system[0] | SO:system[1] | SI:Core 3 |
* |(0)___________|(1)___________|(2)___________|(3)___________| * |(0)___________|(1)___________|(2)___________|(3)___________|
* | FBus | Core 0 | Core 1 | Pbus | * | FBus | Core 0 | Core 1 | Pbus |
* | SI:serial-tl | SI:Core 0 | SI:Core 1 | SO:pbus | * | SI:serial_tl | SI:Core 0 | SI:Core 1 | SO:pbus |
* |______________|______________|______________|______________| * |______________|______________|______________|______________|
* *
* |(0)___________|(1)___________|(2)___________|(3)___________| * |(0)___________|(1)___________|(2)___________|(3)___________|
@@ -65,7 +65,7 @@ class MultiNoCConfig extends Config(
new constellation.soc.WithCbusNoC(constellation.protocol.TLNoCParams( new constellation.soc.WithCbusNoC(constellation.protocol.TLNoCParams(
constellation.protocol.DiplomaticNetworkNodeMapping( constellation.protocol.DiplomaticNetworkNodeMapping(
inNodeMapping = ListMap( inNodeMapping = ListMap(
"serial-tl" -> 0), "serial_tl" -> 0),
outNodeMapping = ListMap( outNodeMapping = ListMap(
"error" -> 1, "l2[0]" -> 2, "pbus" -> 3, "plic" -> 4, "error" -> 1, "l2[0]" -> 2, "pbus" -> 3, "plic" -> 4,
"clint" -> 5, "dmInner" -> 6, "bootrom" -> 7, "clock" -> 8)), "clint" -> 5, "dmInner" -> 6, "bootrom" -> 7, "clock" -> 8)),
@@ -81,7 +81,7 @@ class MultiNoCConfig extends Config(
"L2 InclusiveCache[2]" -> 5, "L2 InclusiveCache[3]" -> 6), "L2 InclusiveCache[2]" -> 5, "L2 InclusiveCache[3]" -> 6),
outNodeMapping = ListMap( outNodeMapping = ListMap(
"system[0]" -> 0, "system[1]" -> 3, "system[2]" -> 4 , "system[3]" -> 7, "system[0]" -> 0, "system[1]" -> 3, "system[2]" -> 4 , "system[3]" -> 7,
"serdesser" -> 0)), "serial_tl_0" -> 0)),
NoCParams( NoCParams(
topology = TerminalRouter(BidirectionalTorus1D(8)), topology = TerminalRouter(BidirectionalTorus1D(8)),
channelParamGen = (a, b) => UserChannelParams(Seq.fill(10) { UserVirtualChannelParams(4) }), channelParamGen = (a, b) => UserChannelParams(Seq.fill(10) { UserVirtualChannelParams(4) }),
@@ -92,7 +92,7 @@ class MultiNoCConfig extends Config(
inNodeMapping = ListMap( inNodeMapping = ListMap(
"Core 0" -> 1, "Core 1" -> 2, "Core 2" -> 4 , "Core 3" -> 7, "Core 0" -> 1, "Core 1" -> 2, "Core 2" -> 4 , "Core 3" -> 7,
"Core 4" -> 8, "Core 5" -> 11, "Core 6" -> 13, "Core 7" -> 14, "Core 4" -> 8, "Core 5" -> 11, "Core 6" -> 13, "Core 7" -> 14,
"serial-tl" -> 0), "serial_tl" -> 0),
outNodeMapping = ListMap( outNodeMapping = ListMap(
"system[0]" -> 5, "system[1]" -> 6, "system[2]" -> 9, "system[3]" -> 10, "system[0]" -> 5, "system[1]" -> 6, "system[2]" -> 9, "system[3]" -> 10,
"pbus" -> 3)), "pbus" -> 3)),
@@ -133,7 +133,7 @@ class MultiNoCConfig extends Config(
* Core 6 | SI | Core 6 | 16 * Core 6 | SI | Core 6 | 16
* Core 7 | SI | Core 7 | 18 * Core 7 | SI | Core 7 | 18
* Core 8 | SI | Core 8 | 19 * Core 8 | SI | Core 8 | 19
* fbus | SI | serial-tl | 9 * fbus | SI | serial_tl | 9
* pbus | SO | pbus | 4 * pbus | SO | pbus | 4
* L2 0 | SO | system[0] | 0 * L2 0 | SO | system[0] | 0
* L2 1 | SO | system[1] | 2 * L2 1 | SO | system[1] | 2
@@ -145,7 +145,7 @@ class MultiNoCConfig extends Config(
* L2 3 | MI | Cache[3] | 6 * L2 3 | MI | Cache[3] | 6
* DRAM 0 | MO | system[0] | 3 * DRAM 0 | MO | system[0] | 3
* DRAM 1 | MO | system[1] | 5 * DRAM 1 | MO | system[1] | 5
* extram | MO | serdesser | 9 * extram | MO | serial_tl_0 | 9
*/ */
// DOC include start: SharedNoCConfig // DOC include start: SharedNoCConfig
class SharedNoCConfig extends Config( class SharedNoCConfig extends Config(
@@ -168,12 +168,12 @@ class SharedNoCConfig extends Config(
"Cache[0]" -> 0, "Cache[1]" -> 2, "Cache[2]" -> 8, "Cache[3]" -> 6), "Cache[0]" -> 0, "Cache[1]" -> 2, "Cache[2]" -> 8, "Cache[3]" -> 6),
outNodeMapping = ListMap( outNodeMapping = ListMap(
"system[0]" -> 3, "system[1]" -> 5, "system[0]" -> 3, "system[1]" -> 5,
"serdesser" -> 9)) "serial_tl_0" -> 9))
), true) ++ ), true) ++
new constellation.soc.WithSbusNoC(constellation.protocol.TLNoCParams( new constellation.soc.WithSbusNoC(constellation.protocol.TLNoCParams(
constellation.protocol.DiplomaticNetworkNodeMapping( constellation.protocol.DiplomaticNetworkNodeMapping(
inNodeMapping = ListMap( inNodeMapping = ListMap(
"serial-tl" -> 9, "Core 0" -> 2, "serial_tl" -> 9, "Core 0" -> 2,
"Core 1" -> 10, "Core 2" -> 11, "Core 3" -> 13, "Core 4" -> 14, "Core 1" -> 10, "Core 2" -> 11, "Core 3" -> 13, "Core 4" -> 14,
"Core 5" -> 15, "Core 6" -> 16, "Core 7" -> 18, "Core 8" -> 19), "Core 5" -> 15, "Core 6" -> 16, "Core 7" -> 18, "Core 8" -> 19),
outNodeMapping = ListMap( outNodeMapping = ListMap(
@@ -199,13 +199,13 @@ class SbusRingNoCConfig extends Config(
"Core 5" -> 5, "Core 5" -> 5,
"Core 6" -> 6, "Core 6" -> 6,
"Core 7" -> 7, "Core 7" -> 7,
"serial-tl" -> 8), "serial_tl" -> 8),
outNodeMapping = ListMap( outNodeMapping = ListMap(
"system[0]" -> 9, "system[0]" -> 9,
"system[1]" -> 10, "system[1]" -> 10,
"system[2]" -> 11, "system[2]" -> 11,
"system[3]" -> 12, "system[3]" -> 12,
"pbus" -> 8)), // TSI is on the pbus, so serial-tl and pbus should be on the same node "pbus" -> 8)), // TSI is on the pbus, so serial_tl and pbus should be on the same node
NoCParams( NoCParams(
topology = UnidirectionalTorus1D(13), topology = UnidirectionalTorus1D(13),
channelParamGen = (a, b) => UserChannelParams(Seq.fill(10) { UserVirtualChannelParams(4) }), channelParamGen = (a, b) => UserChannelParams(Seq.fill(10) { UserVirtualChannelParams(4) }),