New data type for cgra

Author: Jackcuii

api/driver.go

@@ -131,7 +131,7 @@ func (d *driverImpl) doOneFeedInTask(task *feedInTask) bool {
 		msg := cgra.MoveMsgBuilder{}.
 			WithSrc(port.AsRemote()).
 			WithDst(task.remotePorts[i]).
-			WithData(task.data[task.round*task.stride+i]).
+			WithData(cgra.NewScalar(task.data[task.round*task.stride+i])).
 			WithColor(task.color).
 			WithSendTime(d.Engine.CurrentTime()). // Set the current engine time here
 			Build()
@@ -179,13 +179,14 @@ func (d *driverImpl) doOneCollectTask(task *collectTask) bool {
 
 	for i, port := range task.ports {
 		msg := port.RetrieveIncoming().(*cgra.MoveMsg)
-		task.data[task.round*task.stride+i] = msg.Data
+		task.data[task.round*task.stride+i] = msg.Data.First()
 		// in red
 
 		core.Trace("DataFlow",
 			"Behavior", "Collect",
 			slog.Float64("Time", float64(d.Engine.CurrentTime()*1e9)),
 			"Data", task.data[task.round*task.stride+i],
+			"Pred", msg.Data.Pred,
 			"Color", task.color,
 			"From", task.ports[i].Name(),
 			"To", "None",

cgra/data.go

@@ -0,0 +1,35 @@
+package cgra
+
+type Data struct {
+	Data []uint32
+	Pred bool
+}
+
+// NewScalar creates a Data that wraps a single uint32 value with Pred=true by default.
+func NewScalar(v uint32) Data {
+	return Data{Data: []uint32{v}, Pred: true}
+}
+
+// NewScalar creates a Data that wraps a single uint32 value with Pred=true by default.
+func NewScalarWithPred(v uint32, pred bool) Data {
+	return Data{Data: []uint32{v}, Pred: pred}
+}
+
+// First returns the first lane value. If empty, returns 0.
+func (d Data) First() uint32 {
+	if len(d.Data) == 0 {
+		return 0
+	}
+	return d.Data[0]
+}
+
+// WithPred returns a copy with the given predicate flag.
+func (d Data) WithPred(pred bool) Data {
+	d.Pred = pred
+	return d
+}
+
+// FromSlice constructs a Data from a slice and optional predicate.
+func FromSlice(vals []uint32, pred bool) Data {
+	return Data{Data: vals, Pred: pred}
+}

cgra/msg.go

@@ -1,12 +1,14 @@
 package cgra
 
-import "github.com/sarchlab/akita/v4/sim"
+import (
+	"github.com/sarchlab/akita/v4/sim"
+)
 
 // MoveMsg moves data from one tile to another in a CGRA.
 type MoveMsg struct {
 	sim.MsgMeta
 
-	Data  uint32
+	Data  Data
 	Color int
 	//create a new branch predicate data
 	//Predicate int
@@ -29,7 +31,7 @@ func (m *MoveMsg) Clone() sim.Msg {
 type MoveMsgBuilder struct {
 	src, dst sim.RemotePort
 	sendTime sim.VTimeInSec
-	data     uint32
+	data     Data
 	color    int
 	// predicate value
 	//predicate int
@@ -54,7 +56,7 @@ func (m MoveMsgBuilder) WithSendTime(sendTime sim.VTimeInSec) MoveMsgBuilder {
 }
 
 // WithData sets the data of the msg.
-func (m MoveMsgBuilder) WithData(data uint32) MoveMsgBuilder {
+func (m MoveMsgBuilder) WithData(data Data) MoveMsgBuilder {
 	m.data = data
 	return m
 }

core/builder.go

@@ -45,11 +45,11 @@ func (b Builder) Build(name string) *Core {
 			"NorthWest": true,
 			"Router":    true,
 		},
-		Registers:        make([]uint32, 64),
+		Registers:        make([]cgra.Data, 64),
 		Memory:           make([]uint32, 1024),
-		RecvBufHead:      make([][]uint32, 4),
+		RecvBufHead:      make([][]cgra.Data, 4),
 		RecvBufHeadReady: make([][]bool, 4),
-		SendBufHead:      make([][]uint32, 4),
+		SendBufHead:      make([][]cgra.Data, 4),
 		SendBufHeadBusy:  make([][]bool, 4),
 		AddrBuf:          0,
 		IsToWriteMemory:  false,
@@ -63,9 +63,9 @@ func (b Builder) Build(name string) *Core {
 	}
 
 	for i := 0; i < 4; i++ {
-		c.state.RecvBufHead[i] = make([]uint32, 12)
+		c.state.RecvBufHead[i] = make([]cgra.Data, 12)
 		c.state.RecvBufHeadReady[i] = make([]bool, 12)
-		c.state.SendBufHead[i] = make([]uint32, 12)
+		c.state.SendBufHead[i] = make([]cgra.Data, 12)
 		c.state.SendBufHeadBusy[i] = make([]bool, 12)
 	}
 

core/core.go

@@ -114,7 +114,8 @@ func (c *Core) doSend() bool {
 			Trace("DataFlow",
 				"Behavior", "Send",
 				slog.Float64("Time", float64(c.Engine.CurrentTime()*1e9)),
-				"Data", msg.Data,
+				"Data", msg.Data.First(),
+				"Pred", c.state.SendBufHead[color][i].Pred,
 				"Color", color,
 				"Src", msg.Src,
 				"Dst", msg.Dst,
@@ -130,7 +131,7 @@ func (c *Core) doSend() bool {
 		if c.state.IsToWriteMemory {
 			msg := mem.WriteReqBuilder{}.
 				WithAddress(uint64(c.state.AddrBuf)).
-				WithData(makeBytesFromUint32(c.state.SendBufHead[c.emu.getColorIndex("R")][cgra.Router])).
+				WithData(makeBytesFromUint32(c.state.SendBufHead[c.emu.getColorIndex("R")][cgra.Router].First())).
 				WithSrc(c.ports[cgra.Side(cgra.Router)].local.AsRemote()).
 				WithDst(c.ports[cgra.Side(cgra.Router)].remote).
 				Build()
@@ -143,7 +144,8 @@ func (c *Core) doSend() bool {
 			Trace("Memory",
 				"Behavior", "Send",
 				slog.Float64("Time", float64(c.Engine.CurrentTime()*1e9)),
-				"Data", c.state.SendBufHead[c.emu.getColorIndex("R")][cgra.Router],
+				"Data", c.state.SendBufHead[c.emu.getColorIndex("R")][cgra.Router].First(),
+				"Pred", c.state.SendBufHead[c.emu.getColorIndex("R")][cgra.Router].Pred,
 				"Color", "R",
 				"Src", msg.Src,
 				"Dst", msg.Dst,
@@ -212,7 +214,8 @@ func (c *Core) doRecv() bool {
 			Trace("DataFlow",
 				"Behavior", "Recv",
 				"Time", float64(c.Engine.CurrentTime()*1e9),
-				"Data", msg.Data,
+				"Data", msg.Data.First(),
+				"Pred", c.state.RecvBufHead[color][i].Pred,
 				"Src", msg.Src,
 				"Dst", msg.Dst,
 				"Color", color,
@@ -234,28 +237,30 @@ func (c *Core) doRecv() bool {
 		// if msg is DataReadyRsp, then the data is ready
 		if msg, ok := item.(*mem.DataReadyRsp); ok {
 			c.state.RecvBufHeadReady[c.emu.getColorIndex("R")][cgra.Router] = true
-			c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router] = convert4BytesToUint32(msg.Data)
+			c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router] = cgra.NewScalar(convert4BytesToUint32(msg.Data))
 
 			Trace("Memory",
 				"Behavior", "Recv",
 				"Time", float64(c.Engine.CurrentTime()*1e9),
 				"Data", msg.Data,
 				"Src", msg.Src,
 				"Dst", msg.Dst,
+				"Pred", c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router].Pred,
 				"Color", "R",
 			)
 
 			c.ports[cgra.Side(cgra.Router)].local.RetrieveIncoming()
 			madeProgress = true
 		} else if msg, ok := item.(*mem.WriteDoneRsp); ok {
 			c.state.RecvBufHeadReady[c.emu.getColorIndex("R")][cgra.Router] = true
-			c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router] = 0
+			c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router] = cgra.NewScalar(0)
 
 			Trace("Memory",
 				"Behavior", "Recv",
 				"Time", float64(c.Engine.CurrentTime()*1e9),
 				"Src", msg.Src,
 				"Dst", msg.Dst,
+				"Pred", c.state.RecvBufHead[c.emu.getColorIndex("R")][cgra.Router].Pred,
 				"Color", "R",
 			)
 

core/data.go

@@ -0,0 +1,35 @@
+package core
+
+type Data struct {
+	Data []uint32
+	Pred bool
+}
+
+// NewScalar creates a Data that wraps a single uint32 value with Pred=true by default.
+func NewScalar(v uint32) Data {
+	return Data{Data: []uint32{v}, Pred: true}
+}
+
+// NewScalar creates a Data that wraps a single uint32 value with Pred=true by default.
+func NewScalarWithPred(v uint32, pred bool) Data {
+	return Data{Data: []uint32{v}, Pred: pred}
+}
+
+// First returns the first lane value. If empty, returns 0.
+func (d Data) First() uint32 {
+	if len(d.Data) == 0 {
+		return 0
+	}
+	return d.Data[0]
+}
+
+// WithPred returns a copy with the given predicate flag.
+func (d Data) WithPred(pred bool) Data {
+	d.Pred = pred
+	return d
+}
+
+// FromSlice constructs a Data from a slice and optional predicate.
+func FromSlice(vals []uint32, pred bool) Data {
+	return Data{Data: vals, Pred: pred}
+}