update noc

noc/acceptance/agent.go

@@ -35,20 +35,19 @@ func NewAgent(
 }
 
 // Tick tries to receive requests and send requests out.
-func (a *Agent) Tick(now sim.VTimeInSec) bool {
+func (a *Agent) Tick() bool {
  madeProgress := false
- madeProgress = a.send(now) || madeProgress
- madeProgress = a.recv(now) || madeProgress
+ madeProgress = a.send() || madeProgress
+ madeProgress = a.recv() || madeProgress
  return madeProgress
 }
 
-func (a *Agent) send(now sim.VTimeInSec) bool {
+func (a *Agent) send() bool {
  if len(a.MsgsToSend) == 0 {
  return false
  }
 
  msg := a.MsgsToSend[0]
- msg.Meta().SendTime = now
  err := msg.Meta().Src.Send(msg)
  if err == nil {
  a.MsgsToSend = a.MsgsToSend[1:]
@@ -59,10 +58,10 @@ func (a *Agent) send(now sim.VTimeInSec) bool {
  return false
 }
 
-func (a *Agent) recv(now sim.VTimeInSec) bool {
+func (a *Agent) recv() bool {
  madeProgress := false
  for _, port := range a.AgentPorts {
- msg := port.RetrieveIncoming(now)
+ msg := port.RetrieveIncoming()
  if msg != nil {
  a.test.receiveMsg(msg, port)
  a.recvBytes += uint64(msg.Meta().TrafficBytes)

noc/acceptance/dgx_single_p2p/main.go

@@ -37,7 +37,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < 9; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 5, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  }
 

noc/acceptance/dgx_single_p2p_all/main.go

@@ -89,7 +89,7 @@ func createAgents(
  for i := 0; i < 9; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 1, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  //test.RegisterAgent(agent)
  }

noc/acceptance/dgx_single_random/main.go

@@ -85,7 +85,7 @@ func createAgents(
  for i := 0; i < 9; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 1, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  //test.RegisterAgent(agent)
  }

noc/acceptance/mesh/main.go

@@ -45,7 +45,7 @@ func main() {
  for y := 0; y < meshHeight; y++ {
  name := fmt.Sprintf("Agent[%d][%d]", x, y)
  agent := acceptance.NewAgent(engine, freq, name, 1, test)
- agent.TickLater(0)
+ agent.TickLater()
 
  monitor.RegisterComponent(agent)
 

noc/acceptance/one_switch/main.go

@@ -37,7 +37,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < 2; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 5, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  test.RegisterAgent(agent)
  }

noc/acceptance/one_to_one/main.go

@@ -38,7 +38,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < 2; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 5, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  }
 

noc/acceptance/pcie_p2p/main.go

@@ -37,7 +37,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < 9; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 5, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  }
 

noc/acceptance/pcie_random/main.go

@@ -47,7 +47,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < numDevicePerSwitch*2+1; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), numPortPerDevice, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  test.RegisterAgent(agent)
  monitor.RegisterComponent(agent)

noc/acceptance/three_agent_one_switch/main.go

@@ -37,7 +37,7 @@ func createNetwork(engine sim.Engine, test *acceptance.Test) {
  for i := 0; i < 3; i++ {
  agent := acceptance.NewAgent(
  engine, freq, fmt.Sprintf("Agent%d", i), 5, test)
- agent.TickLater(0)
+ agent.TickLater()
  agents = append(agents, agent)
  test.RegisterAgent(agent)
  }

noc/standalone/agent.go

@@ -58,9 +58,9 @@ type Agent struct {
 }
 
 // NotifyRecv notifies that a port has received a message.
-func (a *Agent) NotifyRecv(now sim.VTimeInSec, port sim.Port) {
- a.ToOut.RetrieveIncoming(now)
- a.TickLater(now)
+func (a *Agent) NotifyRecv(port sim.Port) {
+ a.ToOut.RetrieveIncoming()
+ a.TickLater()
 }
 
 // Handle defines how an agent handles events.
@@ -81,21 +81,20 @@ func (a *Agent) Handle(e sim.Event) error {
 
 func (a *Agent) handleStartSendEvent(e *StartSendEvent) {
  a.Buffer = append(a.Buffer, e.Msg)
- a.TickLater(e.Time())
+ a.TickLater()
 }
 
 // Tick attempts to send a message out.
-func (a *Agent) Tick(now sim.VTimeInSec) bool {
- return a.sendDataOut(now)
+func (a *Agent) Tick() bool {
+ return a.sendDataOut()
 }
 
-func (a *Agent) sendDataOut(now sim.VTimeInSec) bool {
+func (a *Agent) sendDataOut() bool {
  if len(a.Buffer) == 0 {
  return false
  }
 
  msg := a.Buffer[0]
- msg.Meta().SendTime = now
  err := a.ToOut.Send(msg)
  if err == nil {
  a.Buffer = a.Buffer[1:]