Skip to content

Commit

Permalink
fix mhpmcounter3
Browse files Browse the repository at this point in the history
  • Loading branch information
HidetaroTanaka committed Nov 1, 2023
1 parent 7b5d7e0 commit 13ae372
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/main/scala/hajime/vectormodules/VectorCpu.scala
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,10 @@ class VectorCpu(implicit params: HajimeCoreParams) extends CpuModule with Scalar
} else false.B))
// ベクトル命令がEXにある場合,IDがスカラ命令,またはIDのベクトル命令が発行できないならばIDの方でストールさせる

// EX_WB_REGのvectorExecNumのデフォルト値
EX_WB_REG.bits.vectorExecNum.get.valid := false.B
EX_WB_REG.bits.vectorExecNum.get.bits := 0.U

// リタイアするベクトル命令があればそれでEX_WB_REGを上書き
for(d <- vecAluExecUnit) {
when(d.io.toExWbReg.valid) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/hajime/vectormodules/VectorCpuSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class Zve64xAppTestForVecCpu extends AnyFlatSpec with ChiselScalatestTester {
val applicationTest = Seq(
"vector_median"
)
val zve64xTestList: Seq[String] = ldstTest ++ arithmeticTest ++ applicationTest
val zve64xTestList: Seq[String] = applicationTest
for (e <- zve64xTestList) {
it should s"Vector CPU execute $e" in {
test(new Core_and_cache(useVector = true, cpu = classOf[VectorCpu])).withAnnotations(Seq(WriteVcdAnnotation, VerilatorBackendAnnotation)) { dut =>
Expand Down

0 comments on commit 13ae372

Please sign in to comment.