Changed vector emulation to use VLENB (VLEN / 8) and some merge fixes

Author: MichaelJSr

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -36,7 +36,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -79,7 +79,7 @@ jobs:
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -88,7 +88,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -130,7 +130,7 @@ jobs:
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -139,7 +139,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1

sim/simx/emulator.cpp

@@ -34,7 +34,7 @@ warp_t::warp_t(uint32_t num_threads)
   : ireg_file(MAX_NUM_REGS, std::vector<Word>(num_threads))
   , freg_file(MAX_NUM_REGS, std::vector<uint64_t>(num_threads))
 #ifdef EXT_V_ENABLE
-  , vreg_file(num_threads, std::vector(MAX_NUM_REGS, std::vector<Byte>(VLEN / 8)))
+  , vreg_file(num_threads, std::vector(MAX_NUM_REGS, std::vector<Byte>(VLENB)))
   , vcsrs(num_threads)
 #endif
   , uuid(0)

sim/simx/vec_unit.cpp

@@ -1,6 +1,7 @@
 #ifdef EXT_V_ENABLE
 
 #include "vec_unit.h"
+#include "emulator.h"
 
 using namespace vortex;
 

sim/simx/vec_unit.h

@@ -9,26 +9,6 @@
 
 namespace vortex {
 
-struct vtype_t {
-  uint32_t vill;
-  uint32_t vma;
-  uint32_t vta;
-  uint32_t vsew;
-  uint32_t vlmul;
-};
-
-union reg_data_t {
-  Word     u;
-  WordI    i;
-  WordF    f;
-  float    f32;
-  double   f64;
-  uint32_t u32;
-  uint64_t u64;
-  int32_t  i32;
-  int64_t  i64;
-};
-
 class VecUnit : public SimObject<VecUnit> {
 public:
   struct PerfStats {