Merge remote-tracking branch 'origin/master' into gemmini-conv-fsm

Author: hngenc

gemmini/gemmini.cc

@@ -1103,7 +1103,7 @@ void gemmini_t::loop_conv_ws_config_6(reg_t rs1, reg_t rs2) {
   gemmini_state.loop_conv_ws_input = rs2;
 }
 
-reg_t gemmini_t::custom3(rocc_insn_t insn, reg_t xs1, reg_t xs2) {
+reg_t gemmini_t::CUSTOMFN(XCUSTOM_ACC)(rocc_insn_t insn, reg_t xs1, reg_t xs2) {
   if (insn.funct == mvin_funct) {
     mvin(xs1, xs2, 0);
   } else if (insn.funct == mvin2_funct) {

gemmini/gemmini.h

@@ -21,6 +21,9 @@ static const uint64_t addr_len = ADDR_LEN; // Number of bits used to address the
 #define dprintf(...)
 #endif
 
+#define MAKECUSTOMFN(opcode) custom ## opcode
+#define CUSTOMFN(opcode) MAKECUSTOMFN(opcode)
+
 struct gemmini_state_t
 {
   enum Dataflow {OS, WS};
@@ -86,7 +89,9 @@ class gemmini_t : public rocc_t
 public:
   gemmini_t() : cause(0), aux(0), debug(false) {}
   const char* name() { return "gemmini"; }
-  reg_t custom3(rocc_insn_t insn, reg_t xs1, reg_t xs2);
+
+
+  reg_t CUSTOMFN(XCUSTOM_ACC)( rocc_insn_t insn, reg_t xs1, reg_t xs2);
   void reset();
 
   void mvin(reg_t dram_addr, reg_t sp_addr, int state_id);

gemmini/gemmini_params.h

@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <limits.h>
 
+#define XCUSTOM_ACC 3
 #define DIM 16
 #define ADDR_LEN 32
 #define BANK_NUM 4
@@ -71,4 +72,4 @@ typedef uint32_t acc_scale_t_bits;
 #define ACC_READ_SMALL_WIDTH
 #define ACC_READ_FULL_WIDTH
 
-#endif // GEMMINI_PARAMS_H
+#endif // GEMMINI_PARAMS_H