Merge pull request #91 from sarchlab/remove-now-VTimeInSec

Remove now v time in sec
sarchlab · Apr 3, 2024 · fa81495 · fa81495
2 parents d52bb0e + ab691f2
commit fa81495
Show file tree

Hide file tree

Showing 153 changed files with 1,518 additions and 2,201 deletions.
diff --git a/analysis/mock_sim_test.go b/analysis/mock_sim_test.go
diff --git a/mem/acceptancetests/dram/test.go b/mem/acceptancetests/dram/test.go
@@ -69,7 +69,7 @@ func main() {
  conn.PlugIn(agent.GetPortByName("Mem"), 16)
  conn.PlugIn(memCtrl.GetPortByName("Top"), 1)
 
- agent.TickLater(0)
+ agent.TickLater()
 
  err := engine.Run()
  if err != nil {

diff --git a/mem/acceptancetests/idealmemcontroller/test.go b/mem/acceptancetests/idealmemcontroller/test.go
@@ -66,7 +66,7 @@ func main() {
  conn.PlugIn(agent.GetPortByName("Mem"), 16)
  conn.PlugIn(dram.GetPortByName("Top"), 16)
 
- agent.TickLater(0)
+ agent.TickLater()
 
  err := engine.Run()
  if err != nil {

diff --git a/mem/acceptancetests/memoryagent.go b/mem/acceptancetests/memoryagent.go
@@ -54,26 +54,26 @@ func (a *MemAccessAgent) checkReadResult(
 }
 
 // Tick updates the states of the agent and issues new read and write requests.
-func (a *MemAccessAgent) Tick(now sim.VTimeInSec) bool {
+func (a *MemAccessAgent) Tick() bool {
  madeProgress := false
 
- madeProgress = a.processMsgRsp(now) || madeProgress
+ madeProgress = a.processMsgRsp() || madeProgress
 
  if a.ReadLeft == 0 && a.WriteLeft == 0 {
  return madeProgress
  }
 
  if a.shouldRead() {
- madeProgress = a.doRead(now) || madeProgress
+ madeProgress = a.doRead() || madeProgress
  } else {
- madeProgress = a.doWrite(now) || madeProgress
+ madeProgress = a.doWrite() || madeProgress
  }
 
  return madeProgress
 }
 
-func (a *MemAccessAgent) processMsgRsp(now sim.VTimeInSec) bool {
- msg := a.memPort.RetrieveIncoming(now)
+func (a *MemAccessAgent) processMsgRsp() bool {
+ msg := a.memPort.RetrieveIncoming()
  if msg == nil {
  return false
  }
@@ -82,7 +82,7 @@ func (a *MemAccessAgent) processMsgRsp(now sim.VTimeInSec) bool {
  case *mem.WriteDoneRsp:
  if dumpLog {
  write := a.PendingWriteReq[msg.RespondTo]
- log.Printf("%.10f, agent, write complete, 0x%X\n", now, write.Address)
+ log.Printf("%.10f, agent, write complete, 0x%X\n", a.CurrentTime(), write.Address)
  }
 
  delete(a.PendingWriteReq, msg.RespondTo)
@@ -93,7 +93,7 @@ func (a *MemAccessAgent) processMsgRsp(now sim.VTimeInSec) bool {
 
  if dumpLog {
  log.Printf("%.10f, agent, read complete, 0x%X, %v\n",
- now, req.Address, msg.Data)
+ a.CurrentTime(), req.Address, msg.Data)
  }
 
  a.checkReadResult(req, msg)
@@ -122,7 +122,7 @@ func (a *MemAccessAgent) shouldRead() bool {
  return dice > 0.5
 }
 
-func (a *MemAccessAgent) doRead(now sim.VTimeInSec) bool {
+func (a *MemAccessAgent) doRead() bool {
  address := a.randomReadAddress()
 
  if a.isAddressInPendingReq(address) {
@@ -136,15 +136,14 @@ func (a *MemAccessAgent) doRead(now sim.VTimeInSec) bool {
  WithByteSize(4).
  WithPID(1).
  Build()
- readReq.SendTime = now
 
  err := a.memPort.Send(readReq)
  if err == nil {
  a.PendingReadReq[readReq.ID] = readReq
  a.ReadLeft--
 
  if dumpLog {
- log.Printf("%.10f, agent, read, 0x%X\n", now, address)
+ log.Printf("%.10f, agent, read, 0x%X\n", a.CurrentTime(), address)
  }
  return true
  }
@@ -199,7 +198,7 @@ func bytesToUint32(data []byte) uint32 {
  return a
 }
 
-func (a *MemAccessAgent) doWrite(now sim.VTimeInSec) bool {
+func (a *MemAccessAgent) doWrite() bool {
  address := rand.Uint64() % (a.MaxAddress / 4) * 4
  data := rand.Uint32()
 
@@ -214,7 +213,6 @@ func (a *MemAccessAgent) doWrite(now sim.VTimeInSec) bool {
  WithPID(1).
  WithData(uint32ToBytes(data)).
  Build()
- writeReq.SendTime = now
 
  err := a.memPort.Send(writeReq)
  if err == nil {
@@ -224,7 +222,7 @@ func (a *MemAccessAgent) doWrite(now sim.VTimeInSec) bool {
 
  if dumpLog {
  log.Printf("%.10f, agent, write, 0x%X, %v\n",
- now, address, writeReq.Data)
+ a.CurrentTime(), address, writeReq.Data)
  }
 
  return true

diff --git a/mem/acceptancetests/writearoundcache/test.go b/mem/acceptancetests/writearoundcache/test.go
@@ -101,7 +101,7 @@ func buildEnvironment() {
  conn.PlugIn(writeevictCache.GetPortByName("Top"), 16)
  conn.PlugIn(dram.GetPortByName("Top"), 16)
 
- agent.TickLater(0)
+ agent.TickLater()
 }
 
 func runSimulation() {

diff --git a/mem/acceptancetests/writebackcache/test.go b/mem/acceptancetests/writebackcache/test.go
@@ -101,7 +101,7 @@ func buildEnvironment() {
  conn.PlugIn(writeBackCache.GetPortByName("Top"), 16)
  conn.PlugIn(dram.GetPortByName("Top"), 16)
 
- agent.TickLater(0)
+ agent.TickLater()
 }
 
 func runSimulation() {

diff --git a/mem/acceptancetests/writeevictcache/test.go b/mem/acceptancetests/writeevictcache/test.go
@@ -101,7 +101,7 @@ func buildEnvironment() {
  conn.PlugIn(writeevictCache.GetPortByName("Top"), 16)
  conn.PlugIn(dram.GetPortByName("Top"), 16)
 
- agent.TickLater(0)
+ agent.TickLater()
 }
 
 func runSimulation() {

diff --git a/mem/acceptancetests/writethroughcache/test.go b/mem/acceptancetests/writethroughcache/test.go
@@ -101,7 +101,7 @@ func buildEnvironment() {
  conn.PlugIn(writeevictCache.GetPortByName("Top"), 16)
  conn.PlugIn(dram.GetPortByName("Top"), 16)
 
- agent.TickLater(0)
+ agent.TickLater()
 }
 
 func runSimulation() {

diff --git a/mem/cache/protocol.go b/mem/cache/protocol.go
@@ -21,19 +21,12 @@ func (r *FlushReq) Meta() *sim.MsgMeta {
 
 // FlushReqBuilder can build flush requests.
 type FlushReqBuilder struct {
- sendTime sim.VTimeInSec
  src, dst sim.Port
  invalidateAllCacheLines bool
  discardInflight bool
  pauseAfterFlushing bool
 }
 
-// WithSendTime sets the send time of the message to build.
-func (b FlushReqBuilder) WithSendTime(t sim.VTimeInSec) FlushReqBuilder {
- b.sendTime = t
- return b
-}
-
 // WithSrc sets the source of the message to build
 func (b FlushReqBuilder) WithSrc(src sim.Port) FlushReqBuilder {
  b.src = src
@@ -73,7 +66,6 @@ func (b FlushReqBuilder) Build() *FlushReq {
  r.ID = sim.GetIDGenerator().Generate()
  r.Src = b.src
  r.Dst = b.dst
- r.SendTime = b.sendTime
  r.InvalidateAllCachelines = b.invalidateAllCacheLines
  r.DiscardInflight = b.discardInflight
  r.PauseAfterFlushing = b.pauseAfterFlushing
@@ -94,19 +86,10 @@ func (r *FlushRsp) Meta() *sim.MsgMeta {
 
 // FlushRspBuilder can build data ready responds.
 type FlushRspBuilder struct {
- sendTime sim.VTimeInSec
  src, dst sim.Port
  rspTo string
 }
 
-// WithSendTime sets the send time of the message to build.
-func (b FlushRspBuilder) WithSendTime(
- t sim.VTimeInSec,
-) FlushRspBuilder {
- b.sendTime = t
- return b
-}
-
 // WithSrc sets the source of the request to build.
 func (b FlushRspBuilder) WithSrc(src sim.Port) FlushRspBuilder {
  b.src = src
@@ -131,7 +114,6 @@ func (b FlushRspBuilder) Build() *FlushRsp {
  r.ID = sim.GetIDGenerator().Generate()
  r.Src = b.src
  r.Dst = b.dst
- r.SendTime = b.sendTime
  r.RspTo = b.rspTo
  return r
 }
@@ -149,18 +131,9 @@ func (r *RestartReq) Meta() *sim.MsgMeta {
 
 // RestartReqBuilder can build data ready responds.
 type RestartReqBuilder struct {
- sendTime sim.VTimeInSec
  src, dst sim.Port
 }
 
-// WithSendTime sets the send time of the message to build.
-func (b RestartReqBuilder) WithSendTime(
- t sim.VTimeInSec,
-) RestartReqBuilder {
- b.sendTime = t
- return b
-}
-
 // WithSrc sets the source of the request to build.
 func (b RestartReqBuilder) WithSrc(src sim.Port) RestartReqBuilder {
  b.src = src
@@ -179,7 +152,6 @@ func (b RestartReqBuilder) Build() *RestartReq {
  r.ID = sim.GetIDGenerator().Generate()
  r.Src = b.src
  r.Dst = b.dst
- r.SendTime = b.sendTime
  return r
 }
 
@@ -197,19 +169,10 @@ func (r *RestartRsp) Meta() *sim.MsgMeta {
 
 // RestartRspBuilder can build data ready responds.
 type RestartRspBuilder struct {
- sendTime sim.VTimeInSec
  src, dst sim.Port
  rspTo string
 }
 
-// WithSendTime sets the send time of the message to build.
-func (b RestartRspBuilder) WithSendTime(
- t sim.VTimeInSec,
-) RestartRspBuilder {
- b.sendTime = t
- return b
-}
-
 // WithSrc sets the source of the request to build.
 func (b RestartRspBuilder) WithSrc(src sim.Port) RestartRspBuilder {
  b.src = src
@@ -234,7 +197,6 @@ func (b RestartRspBuilder) Build() *RestartRsp {
  r.ID = xid.New().String()
  r.Src = b.src
  r.Dst = b.dst
- r.SendTime = b.sendTime
  r.RspTo = b.rspTo
  return r
 }