update noc with Clone

sarchlab · Jun 5, 2024 · 4e89555 · 4e89555
1 parent 706021b
commit 4e89555
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 8 deletions.
diff --git a/noc/acceptance/test.go b/noc/acceptance/test.go
@@ -15,6 +15,13 @@ func (m *trafficMsg) Meta() *sim.MsgMeta {
  return &m.MsgMeta
 }
 
+func (m *trafficMsg) Clone() sim.Msg {
+ cloneMsg := *m
+ cloneMsg.ID = sim.GetIDGenerator().Generate()
+
+ return &cloneMsg
+}
+
 // Test is a test case.
 type Test struct {
  agents []*Agent

diff --git a/noc/messaging/flit.go b/noc/messaging/flit.go
@@ -20,6 +20,16 @@ func (f *Flit) Meta() *sim.MsgMeta {
  return &f.MsgMeta
 }
 
+// Clone returns cloned Flit with different ID
+func (f *Flit) Clone() sim.Msg {
+ cloneMsg := *f
+ cloneMsg.ID = fmt.Sprintf("flit-%d-msg-%s-%s",
+ cloneMsg.SeqID, cloneMsg.Msg.Meta().ID,
+ sim.GetIDGenerator().Generate())
+
+ return &cloneMsg
+}
+
 // FlitBuilder can build flits
 type FlitBuilder struct {
  src, dst sim.Port

diff --git a/noc/networking/arbitration/xbar_test.go b/noc/networking/arbitration/xbar_test.go
@@ -16,6 +16,10 @@ func (m *SampleMsg) Meta() *sim.MsgMeta {
  return &m.MsgMeta
 }
 
+func (m *SampleMsg) Clone() sim.Msg {
+ return m
+}
+
 var _ = Describe("XBar", func() {
  var (
  mockCtrl *gomock.Controller

diff --git a/noc/networking/switching/endpoint/endpoint_test.go b/noc/networking/switching/endpoint/endpoint_test.go
@@ -16,6 +16,10 @@ func (m *sampleMsg) Meta() *sim.MsgMeta {
  return &m.MsgMeta
 }
 
+func (m *sampleMsg) Clone() sim.Msg {
+ return m
+}
+
 var _ = Describe("End Point", func() {
  var (
  mockCtrl *gomock.Controller

diff --git a/noc/networking/switching/switches/swtich_test.go b/noc/networking/switching/switches/swtich_test.go
@@ -38,6 +38,10 @@ func (m *sampleMsg) Meta() *sim.MsgMeta {
  return &m.MsgMeta
 }
 
+func (m *sampleMsg) Clone() sim.Msg {
+ return m
+}
+
 var _ = Describe("Switch", func() {
  var (
  mockCtrl *gomock.Controller

diff --git a/noc/standalone/agent.go b/noc/standalone/agent.go
@@ -18,6 +18,11 @@ func (m *TrafficMsg) Meta() *sim.MsgMeta {
  return &m.MsgMeta
 }
 
+// Clone returns cloned TrafficMsg
+func (m *TrafficMsg) Clone() sim.Msg {
+ return m
+}
+
 // NewTrafficMsg creates a new traffic message
 func NewTrafficMsg(src, dst sim.Port, byteSize int) *TrafficMsg {
  msg := new(TrafficMsg)

diff --git a/sim/examples/ping/comp.go b/sim/examples/ping/comp.go
@@ -19,10 +19,7 @@ func (p *PingMsg) Meta() *sim.MsgMeta {
 }
 
 func (p *PingMsg) Clone() sim.Msg {
- cloneMsg := *p
- cloneMsg.ID = sim.GetIDGenerator().Generate()
-
- return &cloneMsg
+ return p
 }
 
 type PingRsp struct {
@@ -36,10 +33,7 @@ func (p *PingRsp) Meta() *sim.MsgMeta {
 }
 
 func (p *PingRsp) Clone() sim.Msg {
- cloneMsg := *p
- cloneMsg.ID = sim.GetIDGenerator().Generate()
-
- return &cloneMsg
+ return p
 }
 
 type StartPingEvent struct {