commit 8303389368a8adacd2ec02c12e6525877fbc652d
author Cindy Liu <hcindyl@google.com> Wed Aug 02 12:43:32 2023 -0700
committer Cindy Liu <hcindyl@google.com> Wed Aug 02 13:32:02 2023 -0700
tree fba28aee78653c9f16d9b554ecf52cb408872784
parent 8eab14295cf4e3c2dc2d52a0455a6eda67042dfb

Fix vector load instruction post increment register encoding

Fix rs1 encoding

PiperOrigin-RevId: 553227108

sim/kelvin_encoding.cc

diff --git a/sim/kelvin_encoding.cc b/sim/kelvin_encoding.cc
index a92b6c3..76a3cfe 100644
--- a/sim/kelvin_encoding.cc
+++ b/sim/kelvin_encoding.cc
@@ -296,6 +296,9 @@
           return GetRegisterDestinationOp<mpact::sim::riscv::RV32Register>(
               state_, "X0Dest", 0, xreg_alias_[0]);
         } else {
+          // `vs1` is stored in bit[19:14], but scalar xs1 is in bit[19:15]
+          // (same as the regular riscv32 encoding)
+          reg_num >>= 1;
           return GetRegisterDestinationOp<mpact::sim::riscv::RVFpRegister>(
               state_, absl::StrCat(KelvinState::kXregPrefix, reg_num), latency,
               xreg_alias_[reg_num]);