kaholaz/TDT4255
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Half-working load.

Browse source
This commit is contained in:
Sebastian Bugge 2024-09-27 07:51:25 +02:00
parent 961ae49523
commit f7c93b1292
Signed by: kaholaz
GPG key ID: 2EFFEDEE03519691
8 changed files with 112 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/scala/CPU.scala
View file

@ -63,9 +63,12 @@ class CPU extends MultiIOModule {
IDBarrier.op1in := ID.io.op1 IDBarrier.op1in := ID.io.op1
IDBarrier.op2in := ID.io.op2 IDBarrier.op2in := ID.io.op2
IDBarrier.r2ValueIn := ID.io.r2Value
IDBarrier.ALUopIn := ID.io.ALUOp IDBarrier.ALUopIn := ID.io.ALUOp
IDBarrier.writeEnableIn := ID.io.writeEnableOut IDBarrier.writeEnableIn := ID.io.writeEnableOut
IDBarrier.writeAddrIn := ID.io.writeAddrOut IDBarrier.writeAddrIn := ID.io.writeAddrOut
IDBarrier.memWriteIn := ID.io.memWrite
IDBarrier.memReadIn := ID.io.memRead
EX.io.op1 := IDBarrier.op1out EX.io.op1 := IDBarrier.op1out
EX.io.op2 := IDBarrier.op2out EX.io.op2 := IDBarrier.op2out
@ -73,9 +76,18 @@ class CPU extends MultiIOModule {
EXBarrier.writeEnableIn := IDBarrier.writeEnableOut EXBarrier.writeEnableIn := IDBarrier.writeEnableOut
EXBarrier.writeAddrIn := IDBarrier.writeAddrOut EXBarrier.writeAddrIn := IDBarrier.writeAddrOut
EXBarrier.writeDataIn := EX.io.ALUResult.asUInt() EXBarrier.memWriteIn := IDBarrier.memWriteOut
EXBarrier.memReadIn := IDBarrier.memReadOut
EXBarrier.r2ValueIn := IDBarrier.r2ValueOut
EXBarrier.ALUResultIn := EX.io.ALUResult.asUInt()
ID.io.writeData := EXBarrier.writeDataOut MEM.io.ALUResult := EXBarrier.ALUResultOut
MEM.io.writeMem := EXBarrier.memWriteOut
MEM.io.readMem := EXBarrier.memReadOut
MEM.io.writeData := EXBarrier.r2ValueOut
// Write back
ID.io.writeData := MEM.io.dataOut
ID.io.writeEnableIn := EXBarrier.writeEnableOut ID.io.writeEnableIn := EXBarrier.writeEnableOut
ID.io.writeAddrIn := EXBarrier.writeAddrOut ID.io.writeAddrIn := EXBarrier.writeAddrOut
} }

49
src/main/scala/Decoder.scala
View file

@ -46,27 +46,36 @@ class Decoder() extends Module {
*/ */
val opcodeMap: Array[(BitPat, List[UInt])] = Array( val opcodeMap: Array[(BitPat, List[UInt])] = Array(
// signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp // signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp
ADD -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.ADD ), ADD -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.ADD ),
SUB -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SUB ), SUB -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SUB ),
AND -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.AND ), AND -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.AND ),
OR -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.OR ), OR -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.OR ),
XOR -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.XOR ), XOR -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.XOR ),
SLT -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLT ), SLT -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLT ),
SLTU -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLTU), SLTU -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLTU),
SRA -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SRA ), SRA -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SRA ),
SRL -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SRL ), SRL -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SRL ),
SLL -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLL ), SLL -> List(Y, N, N, N, N, branchType.DC, rs1, rs2, ImmFormat.DC, ALUOps.SLL ),
ADDI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.ADD ), // signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp
ANDI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.AND ), ADDI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.ADD ),
ORI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.OR ), ANDI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.AND ),
XORI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.XOR ), ORI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.OR ),
SLTI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLT ), XORI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.XOR ),
SLTIU -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLTU), SLTI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLT ),
SRAI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SRA ), SLTIU -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLTU),
SRLI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SRL ), SRAI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SRA ),
SLLI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLL ), SRLI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SRL ),
SLLI -> List(Y, N, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.SLL ),
// signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp
LUI -> List(Y, N, N, N, N, branchType.DC, Op1Select.Zero, imm, ImmFormat.UTYPE, ALUOps.ADD ),
AUIPC -> List(Y, N, N, N, N, branchType.DC, Op1Select.PC, imm, ImmFormat.UTYPE, ALUOps.ADD ),
// signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp
LW -> List(Y, Y, N, N, N, branchType.DC, rs1, imm, ImmFormat.ITYPE, ALUOps.ADD ),
SW -> List(N, N, Y, N, N, branchType.DC, rs1, imm, ImmFormat.STYPE, ALUOps.ADD ),
) )

26
src/main/scala/EXBarrier.scala
View file

@ -6,17 +6,25 @@ import chisel3.experimental.MultiIOModule
class EXBarrier extends MultiIOModule { class EXBarrier extends MultiIOModule {
val io = IO( val io = IO(
new Bundle { new Bundle {
val writeDataIn = Input(UInt(32.W)) val ALUResultIn = Input(UInt(32.W))
val writeDataOut = Output(UInt(32.W)) val ALUResultOut = Output(UInt(32.W))
val r2ValueIn = Input(UInt(32.W))
val r2ValueOut = Output(UInt(32.W))
val writeAddrIn = Input(UInt(5.W)) val writeAddrIn = Input(UInt(5.W))
val writeAddrOut = Output(UInt(5.W)) val writeAddrOut = Output(UInt(5.W))
val writeEnableIn = Input(Bool()) val writeEnableIn = Input(Bool())
val writeEnableOut = Output(Bool()) val writeEnableOut = Output(Bool())
val memReadIn = Input(Bool())
val memReadOut = Output(Bool())
val memWriteIn = Input(Bool())
val memWriteOut = Output(Bool())
}) })
val writeData = RegInit(UInt(32.W), 0.U) io.ALUResultOut := io.ALUResultIn
writeData := io.writeDataIn
io.writeDataOut := writeData val r2Value = RegInit(UInt(32.W), 0.U)
r2Value := io.r2ValueIn
io.r2ValueOut := r2Value
val writeAddr = RegInit(UInt(5.W), 0.U) val writeAddr = RegInit(UInt(5.W), 0.U)
writeAddr := io.writeAddrIn writeAddr := io.writeAddrIn
@ -25,5 +33,13 @@ class EXBarrier extends MultiIOModule {
val writeEnable = RegInit(Bool(), false.B) val writeEnable = RegInit(Bool(), false.B)
writeEnable := io.writeEnableIn writeEnable := io.writeEnableIn
io.writeEnableOut := writeEnable io.writeEnableOut := writeEnable
val memRead = RegInit(Bool(), false.B)
memRead := io.memReadIn
io.memReadOut := memRead
val memWrite = RegInit(Bool(), false.B)
memWrite := io.memWriteIn
io.memWriteOut := memWrite
} }

11
src/main/scala/ID.scala
View file

@ -22,12 +22,15 @@ class InstructionDecode extends MultiIOModule {
val pc = Input(UInt(32.W)) val pc = Input(UInt(32.W))
val op1 = Output(SInt(32.W)) val op1 = Output(SInt(32.W))
val op2 = Output(SInt(32.W)) val op2 = Output(SInt(32.W))
val r2Value = Output(UInt(32.W))
val ALUOp = Output(UInt(4.W)) val ALUOp = Output(UInt(4.W))
val writeAddrIn = Input(UInt(5.W)) val writeAddrIn = Input(UInt(5.W))
val writeAddrOut = Output(UInt(5.W)) val writeAddrOut = Output(UInt(5.W))
val writeEnableIn = Input(Bool()) val writeEnableIn = Input(Bool())
val writeEnableOut = Output(Bool()) val writeEnableOut = Output(Bool())
val writeData = Input(UInt(32.W)) val writeData = Input(UInt(32.W))
val memWrite = Output(Bool())
val memRead = Output(Bool())
} }
) )
@ -47,8 +50,9 @@ class InstructionDecode extends MultiIOModule {
decoder.instruction := io.instruction decoder.instruction := io.instruction
val select1Map = Array( val select1Map = Array(
Op1Select.rs1 -> registers.io.readData1.asSInt(), Op1Select.rs1 -> registers.io.readData1.asSInt(),
Op1Select.PC -> io.pc.asSInt(), Op1Select.PC -> io.pc.asSInt(),
Op1Select.Zero -> 0.S
) )
io.op1 := MuxLookup(decoder.op1Select, 0.S(32.W), select1Map) io.op1 := MuxLookup(decoder.op1Select, 0.S(32.W), select1Map)
@ -65,8 +69,11 @@ class InstructionDecode extends MultiIOModule {
Op2Select.rs2 -> registers.io.readData2.asSInt(), Op2Select.rs2 -> registers.io.readData2.asSInt(),
) )
io.op2 := MuxLookup(decoder.op2Select, 0.S(32.W), select2Map) io.op2 := MuxLookup(decoder.op2Select, 0.S(32.W), select2Map)
io.r2Value := registers.io.readData2
io.ALUOp := decoder.ALUop io.ALUOp := decoder.ALUop
io.writeAddrOut := decoder.instruction.registerRd io.writeAddrOut := decoder.instruction.registerRd
io.writeEnableOut := decoder.controlSignals.regWrite io.writeEnableOut := decoder.controlSignals.regWrite
io.memRead := decoder.controlSignals.memRead
io.memWrite := decoder.controlSignals.memWrite
} }

18
src/main/scala/IDBarrier.scala
View file

@ -10,12 +10,18 @@ class IDBarrier extends MultiIOModule {
val op1out = Output(SInt(32.W)) val op1out = Output(SInt(32.W))
val op2in = Input(SInt(32.W)) val op2in = Input(SInt(32.W))
val op2out = Output(SInt(32.W)) val op2out = Output(SInt(32.W))
val r2ValueIn = Input(UInt(32.W))
val r2ValueOut = Output(UInt(32.W))
val ALUopIn = Input(UInt(4.W)) val ALUopIn = Input(UInt(4.W))
val ALUopOut = Output(UInt(4.W)) val ALUopOut = Output(UInt(4.W))
val writeAddrIn = Input(UInt(5.W)) val writeAddrIn = Input(UInt(5.W))
val writeAddrOut = Output(UInt(5.W)) val writeAddrOut = Output(UInt(5.W))
val writeEnableIn = Input(Bool()) val writeEnableIn = Input(Bool())
val writeEnableOut = Output(Bool()) val writeEnableOut = Output(Bool())
val memReadIn = Input(Bool())
val memReadOut = Output(Bool())
val memWriteIn = Input(Bool())
val memWriteOut = Output(Bool())
}) })
val op1 = RegInit(SInt(32.W), 0.S) val op1 = RegInit(SInt(32.W), 0.S)
@ -26,6 +32,10 @@ class IDBarrier extends MultiIOModule {
op2 := io.op2in op2 := io.op2in
io.op2out := op2 io.op2out := op2
val r2Value = RegInit(UInt(32.W), 0.U)
r2Value := io.r2ValueIn
io.r2ValueOut := r2Value
val ALUop = RegInit(UInt(4.W), 0.U) val ALUop = RegInit(UInt(4.W), 0.U)
ALUop := io.ALUopIn ALUop := io.ALUopIn
io.ALUopOut := ALUop io.ALUopOut := ALUop
@ -37,4 +47,12 @@ class IDBarrier extends MultiIOModule {
val writeEnable = RegInit(Bool(), false.B) val writeEnable = RegInit(Bool(), false.B)
writeEnable := io.writeEnableIn writeEnable := io.writeEnableIn
io.writeEnableOut := writeEnable io.writeEnableOut := writeEnable
val memRead = RegInit(Bool(), false.B)
memRead := io.memReadIn
io.memReadOut := memRead
val memWrite = RegInit(Bool(), false.B)
memWrite := io.memWriteIn
io.memWriteOut := memWrite
} }

19
src/main/scala/MEM.scala
View file

@ -18,6 +18,11 @@ class MemoryFetch() extends MultiIOModule {
val io = IO( val io = IO(
new Bundle { new Bundle {
val ALUResult = Input(UInt(32.W)) // We get ALUResult one cycle early
val writeData = Input(UInt(32.W))
val readMem = Input(Bool())
val writeMem = Input(Bool())
val dataOut = Output(UInt(32.W))
}) })
@ -35,7 +40,15 @@ class MemoryFetch() extends MultiIOModule {
/** /**
* Your code here. * Your code here.
*/ */
DMEM.io.dataIn := 0.U DMEM.io.dataIn := io.writeData
DMEM.io.dataAddress := 0.U DMEM.io.dataAddress := io.ALUResult
DMEM.io.writeEnable := false.B DMEM.io.writeEnable := io.writeMem
// ALUResult is one cycle early!
val ALUResult = RegInit(UInt(32.W), 0.U)
ALUResult := io.ALUResult
when(io.readMem) {
io.dataOut := DMEM.io.dataOut
}.otherwise(io.dataOut := ALUResult)
} }

7
src/main/scala/ToplevelSignals.scala
View file

@ -80,9 +80,10 @@ object branchType {
using them altogether. using them altogether.
*/ */
object Op1Select { object Op1Select {
val rs1 = 0.asUInt(1.W) val rs1 = 0.asUInt(2.W)
val PC = 1.asUInt(1.W) val PC = 1.asUInt(2.W)
val DC = 0.asUInt(1.W) val Zero = 1.asUInt(2.W)
val DC = 3.asUInt(2.W)
} }
object Op2Select { object Op2Select {

2
src/test/scala/Manifest.scala
View file

@ -19,7 +19,7 @@ import LogParser._
object Manifest { object Manifest {
val singleTest = "addi.s" val singleTest = "load2.s"
val nopPadded = true val nopPadded = true