bug fix for topi conv2d test with multiplication (apache#4)

tmoreau89 · Mar 20, 2019 · 1c8a0aa · 1c8a0aa
1 parent e7be16a
commit 1c8a0aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/vta/config/vta_config.json b/vta/config/vta_config.json
@@ -1,5 +1,5 @@
 {
-  "TARGET" : "pynq",
+  "TARGET" : "sim",
   "HW_VER" : "0.0.2",
   "HW_FREQ" : 100,
   "HW_CLK_TARGET" : 7,

diff --git a/vta/src/sim/sim_driver.cc b/vta/src/sim/sim_driver.cc
@@ -483,6 +483,11 @@ class Device {
             return std::min(x, y);
           });
       }
+      case VTA_ALU_OPCODE_MUL: {
+        return RunALULoop<use_imm>(op, [](int32_t x, int32_t y) {
+            return x * y;
+          });
+      }
       case VTA_ALU_OPCODE_SHR: {
         return RunALULoop<use_imm>(op, [](int32_t x, int32_t y) {
             if (y >= 0) {

diff --git a/vta/tests/python/integration/test_benchmark_topi_conv2d.py b/vta/tests/python/integration/test_benchmark_topi_conv2d.py
@@ -202,6 +202,7 @@ def run_vta_conv2d(env, remote, key, batch_size, wl, profile=True):
         res = topi.add(res, bias)
         res = topi.multiply(res, coeff)
         res = my_clip(res, 0, (1 << env.OUT_WIDTH-1)-1)
+        res = topi.cast(res, "int8")
 
         # Handle quantized outputs (less than 8 bits)
         # o_pack_factor = 1 << (3 - env.LOG_OUT_WIDTH)