Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Permalink
add vector for sending input and output ports info
Browse files Browse the repository at this point in the history
  • Loading branch information
@SinaKarvandi
SinaKarvandi committed May 5, 2024
1 parent 58678ab commit 4922da1
Show file tree
Hide file tree
Showing 6 changed files with 408 additions and 42 deletions.
2 changes: 1 addition & 1 deletion sim/hwdbg/DebuggerModuleTestingBRAM/test.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
make SIM=icarus WAVES=1
make SIM=verilator WAVES=1
64 changes: 32 additions & 32 deletions sim/hwdbg/DebuggerModuleTestingBRAM/test_DebuggerModuleTestingBRAM.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,38 +231,38 @@ async def DebuggerModuleTestingBRAM_test(dut):
#
# Assert initial output is unknown
#
assert LogicArray(dut.io_outputPin_0.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_1.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_2.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_3.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_4.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_5.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_6.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_7.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_8.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_9.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_10.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_11.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_12.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_13.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_14.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_15.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_16.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_17.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_18.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_19.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_20.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_21.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_22.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_23.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_24.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_25.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_26.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_27.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_28.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_29.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_30.value) == LogicArray("Z")
assert LogicArray(dut.io_outputPin_31.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_0.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_1.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_2.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_3.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_4.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_5.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_6.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_7.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_8.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_9.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_10.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_11.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_12.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_13.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_14.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_15.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_16.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_17.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_18.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_19.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_20.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_21.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_22.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_23.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_24.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_25.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_26.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_27.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_28.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_29.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_30.value) == LogicArray("Z")
# assert LogicArray(dut.io_outputPin_31.value) == LogicArray("Z")

#
# Create a 10ns period clock on port clock
Expand Down
125 changes: 117 additions & 8 deletions src/main/scala/hwdbg/communication/interpreter/port_information.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package hwdbg.communication.interpreter

import chisel3._
import chisel3.util.{switch, is}
import chisel3.util.{switch, is, log2Ceil}
import circt.stage.ChiselStage

import hwdbg.version._
Expand All @@ -25,7 +25,7 @@ import hwdbg.utils._

object InterpreterPortInformationEnums {
object State extends ChiselEnum {
val sIdle, sSendCountOfInputPorts, sSendCountOfOutputPorts, sSendPortItems, sDone = Value
val sIdle, sSendCountOfInputPorts, sSendCountOfOutputPorts, sSendInputPortItems, sSendOutputPortItems, sDone = Value
}
}

Expand Down Expand Up @@ -63,6 +63,32 @@ class InterpreterPortInformation(
//
val state = RegInit(sIdle)

//
// Convert input port pins into vector
//
val inputPinsVec = VecInit(inputPortsConfiguration.values.toSeq.map(_.U))

//
// Convert output port pins into vector
//
val outputPinsVec = VecInit(outputPortsConfiguration.values.toSeq.map(_.U))

//
// Get number of input/output ports
//
val numberOfInputPorts = inputPortsConfiguration.size
val numberOfOutputPorts = outputPortsConfiguration.size

//
// Determine the width for numberOfSentPins based on conditions
//
val numberOfSentPinsWidth = if (numberOfInputPorts > numberOfOutputPorts) log2Ceil(numberOfInputPorts) else log2Ceil(numberOfOutputPorts)

//
// Registers for keeping track of sent pin details
//
val numberOfSentPins = RegInit(0.U(numberOfSentPinsWidth.W))

//
// Output pins
//
Expand All @@ -89,15 +115,13 @@ class InterpreterPortInformation(
//
// Send count of input ports
//
val numberOfInputPorts = inputPortsConfiguration.size
LogInfo(debug)("Number of input ports (PORT_PINS_MAP_INPUT): " + numberOfInputPorts)

sendingData := numberOfInputPorts.U

//
// Data is valid
//
noNewDataSender := true.B
dataValidOutput := true.B

//
Expand All @@ -111,24 +135,22 @@ class InterpreterPortInformation(
//
// Send count of output ports
//
val numberOfOutputPorts = outputPortsConfiguration.size
LogInfo(debug)("Number of output ports (PORT_PINS_MAP_OUTPUT): " + numberOfOutputPorts)

sendingData := numberOfOutputPorts.U

//
// Data is valid
//
noNewDataSender := true.B
dataValidOutput := true.B

//
// Next, we gonna send each ports' information ()
//
state := sSendPortItems
state := sSendInputPortItems

}
is(sSendPortItems) {
is(sSendInputPortItems) {

//
// Send input port items
Expand All @@ -139,6 +161,93 @@ class InterpreterPortInformation(
LogInfo(debug)(s"Port $port has $pins pins")
}

//
// Adjust data
//
sendingData := inputPinsVec(numberOfSentPins)

//
// Data is valid
//
dataValidOutput := true.B

when(numberOfSentPins === numberOfInputPorts.U) {

//
// Reset the pins sent for sending output details
//
numberOfSentPins := 0.U

state := sSendOutputPortItems

}.otherwise {

//
// Send next index
//
numberOfSentPins := numberOfSentPins + 1.U

//
// Stay at the same state
//
state := sSendInputPortItems
}

}
is(sSendOutputPortItems) {

//
// Send output port items
//
LogInfo(debug)("Iterating over output pins:")

outputPortsConfiguration.foreach { case (port, pins) =>
LogInfo(debug)(s"Port $port has $pins pins")
}

//
// Adjust data
//
sendingData := outputPinsVec(numberOfSentPins)

//
// Data is valid
//
dataValidOutput := true.B

when(numberOfSentPins === numberOfOutputPorts.U) {

//
// Reset the pins sent for sending input details (later)
//
numberOfSentPins := 0.U

state := sDone

}.otherwise {

//
// Send next index
//
numberOfSentPins := numberOfSentPins + 1.U

//
// Stay at the same state
//
state := sSendOutputPortItems
}
}
is(sDone) {

//
// Indicate that sending data is done
//
noNewDataSender := true.B

//
// Goto the idle state
//
state := sIdle
}
}

Expand Down
1 change: 1 addition & 0 deletions src/main/scala/hwdbg/configs/test_configs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ import chisel3.util._
object TestingConfigurations {

val BRAM_INITIALIZATION_FILE_PATH: String = "./src/test/bram/send_version.hex.txt"
// val BRAM_INITIALIZATION_FILE_PATH: String = "./src/test/bram/port_information.hex.txt"

}
Loading

0 comments on commit 4922da1

Please sign in to comment.