ex controller works with new mesh

ucb-bar · Apr 19, 2024 · 8779f73 · 8779f73
1 parent 63ba9db
commit 8779f73
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/main/scala/gemmini/Configs.scala b/src/main/scala/gemmini/Configs.scala
@@ -243,15 +243,12 @@ object GemminiConfigs {
 
  val ReducedNVDLAConfig = defaultConfig.copy(meshRows = 1, meshColumns = 1, tileRows = 4, tileColumns = 4)
 
-<<<<<<< HEAD
  val gemvConfig = defaultConfig.copy(
  tileRows=1, tileColumns=4,
  meshRows=4, meshColumns=1
  )
 
-=======
  val smallConfig = defaultConfig.copy(meshRows = 4, meshColumns = 1, tileRows = 1, tileColumns = 4, sp_banks = 8, acc_banks = 4)
->>>>>>> 3afbb55 (execute controller working with only passing first column in)
 }
 
 /**

diff --git a/src/main/scala/gemmini/ExecuteController.scala b/src/main/scala/gemmini/ExecuteController.scala
@@ -249,9 +249,7 @@ class ExecuteController[T <: Data, U <: Data, V <: Data](xLen: Int, tagWidth: In
  // "C" stride variables
  val c_addr_stride = Reg(UInt(16.W)) // TODO magic numbers
 
- // val a_address = (0 until tileColumns).map(i => a_address_rs1(i) + a_addr_offset(i))
- // TODO this makes the ex controller repeatedly fetch the a_matrix but it should only fetch once and hold valid
- val a_address = (0 until tileColumns).map(i => a_address_rs1(i))
+ val a_address = (0 until tileColumns).map(i => a_address_rs1(i) + a_addr_offset(i))
  val b_address = b_address_rs2 + b_fire_counter
  val d_address = d_address_rs1 + (block_size.U - 1.U - d_fire_counter)