From f95653fadb9c8b98097b8d320d49bfb80915c1b7 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Tue, 5 Dec 2023 18:39:53 -0800 Subject: [PATCH 1/2] Remove vc_free bypass in output unit --- src/main/scala/router/OutputUnit.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scala/router/OutputUnit.scala b/src/main/scala/router/OutputUnit.scala index 4c3fc05..7bf3a2e 100644 --- a/src/main/scala/router/OutputUnit.scala +++ b/src/main/scala/router/OutputUnit.scala @@ -74,7 +74,6 @@ class OutputUnit(inParams: Seq[ChannelParams], ingressParams: Seq[IngressChannel when (io.out.vc_free(i)) { assert(s.occupied) s.occupied := false.B - io.channel_status(i).occupied := false.B } } } From f58456b0ab06f64673e67bebe06290555450565d Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 15 Dec 2023 10:30:39 -0800 Subject: [PATCH 2/2] Fix CI tests --- src/main/scala/test/Configs.scala | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/scala/test/Configs.scala b/src/main/scala/test/Configs.scala index 4b226e2..44d4e9f 100644 --- a/src/main/scala/test/Configs.scala +++ b/src/main/scala/test/Configs.scala @@ -722,7 +722,7 @@ class TestConfig67 extends NoCTesterConfig(NoCTesterParams( ) ) ), - inputPacketStallProbability = 0.97 + inputPacketStallProbability = 0.98 )) class TestConfig68 extends NoCTesterConfig(NoCTesterParams( NoCParams( @@ -965,7 +965,7 @@ class EvalTestConfig02 extends NoCEvalConfig(NoCEvalParams( class EvalTestConfig03 extends NoCEvalConfig(NoCEvalParams( requiredThroughput = 0.9, requiredMedianLatency = 30, - requiredMaxLatency = 175, + requiredMaxLatency = 210, flows = (s, d) => 0.1 / 10, nocParams = NoCParams( topology = UnidirectionalTorus1D(10), @@ -977,11 +977,13 @@ class EvalTestConfig03 extends NoCEvalConfig(NoCEvalParams( ) )) class EvalTestConfig04 extends NoCEvalConfig(NoCEvalParams( - requiredThroughput = 0.69, - flows = (s, d) => 0.05, + requiredThroughput = 0.99, + flows = (s, d) => 0.04, + requiredMedianLatency = 25, + requiredMaxLatency = 140, nocParams = NoCParams( topology = Butterfly(2, 3), - channelParamGen = (a, b) => UserChannelParams(Seq.fill(1) { UserVirtualChannelParams(5) }), + channelParamGen = (a, b) => UserChannelParams(Seq.fill(2) { UserVirtualChannelParams(5) }), ingresses = (0 until 8).map { i => UserIngressParams(i % 4) }, egresses = (0 until 8).map { i => UserEgressParams((i % 4) + 4 * 2) }, flows = Seq.tabulate(8, 8) { (s, d) => FlowParams(s, d, 0) }.flatten, @@ -1006,10 +1008,10 @@ class EvalTestConfig05 extends NoCEvalConfig(NoCEvalParams( ) )) class EvalTestConfig06 extends NoCEvalConfig(NoCEvalParams( - requiredMedianLatency = 25, + requiredMedianLatency = 20, requiredMaxLatency = 150, - requiredThroughput = 0.94, - flows = (s, d) => 0.2 / 16, + requiredThroughput = 0.95, + flows = (s, d) => 0.15 / 16, nocParams = NoCParams( topology = Mesh2D(4, 4), channelParamGen = (a, b) => UserChannelParams(Seq.fill(1) { UserVirtualChannelParams(4) }), @@ -1021,12 +1023,12 @@ class EvalTestConfig06 extends NoCEvalConfig(NoCEvalParams( )) class EvalTestConfig07 extends NoCEvalConfig(NoCEvalParams( requiredMedianLatency = 20, - requiredMaxLatency = 75, + requiredMaxLatency = 80, requiredThroughput = 0.95, flows = (s, d) => 0.2 / 16, nocParams = NoCParams( topology = Mesh2D(4, 4), - channelParamGen = (a, b) => UserChannelParams(Seq.fill(2) { UserVirtualChannelParams(4) }), + channelParamGen = (a, b) => UserChannelParams(Seq.fill(3) { UserVirtualChannelParams(4) }), ingresses = (0 until 16).map { i => UserIngressParams(i) }, egresses = (0 until 16).map { i => UserEgressParams(i) }, flows = Seq.tabulate(16, 16) { (s, d) => FlowParams(s, d, 0) }.flatten,