Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vc_free bypass in output unit #59

Merged
merged 2 commits into from
Dec 15, 2023
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: 0 additions & 1 deletion src/main/scala/router/OutputUnit.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
} }

Expand Down
22 changes: 12 additions & 10 deletions src/main/scala/test/Configs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ class TestConfig67 extends NoCTesterConfig(NoCTesterParams(
)
)
),
inputPacketStallProbability = 0.97
inputPacketStallProbability = 0.98
))
class TestConfig68 extends NoCTesterConfig(NoCTesterParams(
NoCParams(
Expand Down Expand Up @@ -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),
Expand All @@ -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,
Expand All @@ -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) }),
Expand All @@ -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,
Expand Down
Loading