merge PR #74,#77,#79

sarchlab · Apr 13, 2024 · dbc54d1 · dbc54d1
1 parent d08a02e
commit dbc54d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/akita_test.yml b/.github/workflows/akita_test.yml
@@ -1,6 +1,6 @@
 name: Akita Test
 
-on: push
+on: [push, pull_request]
 
 jobs:
  akitartm_compile:

diff --git a/noc/networking/switching/endpoint/builder.go b/noc/networking/switching/endpoint/builder.go
@@ -106,7 +106,7 @@ func (b Builder) Build(name string) *Comp {
  fmt.Sprintf("%s.NetworkPort", ep.Name()))
 
  for _, dp := range b.devicePorts {
- ep.PlugIn(dp, 1)
+ ep.PlugIn(dp, ep.numInputChannels)
  }
 
  return ep

diff --git a/noc/networking/switching/endpoint/endpoint.go b/noc/networking/switching/endpoint/endpoint.go
@@ -202,17 +202,23 @@ func (c *Comp) recv() bool {
 func (c *Comp) assemble() bool {
  madeProgress := false
 
- for e := c.assemblingMsgs.Front(); e != nil; e = e.Next() {
+ e := c.assemblingMsgs.Front()
+ for e != nil {
  assemblingMsg := e.Value.(*msgToAssemble)
 
+ next := e.Next()
+
  if assemblingMsg.numFlitArrived < assemblingMsg.numFlitRequired {
+ e = next
  continue
  }
 
  c.assembledMsgs = append(c.assembledMsgs, assemblingMsg.msg)
  c.assemblingMsgs.Remove(e)
  delete(c.assemblingMsgTable, assemblingMsg.msg.Meta().ID)
 
+ e = next
+
  // fmt.Printf("%.10f, %s, assembled, msg-%s\n",
  // c.Engine.CurrentTime(), c.Name(), assemblingMsg.msg.Meta().ID)