[CONFIG] new bitstream path convention (apache#25)

* updating hardware bitstream path convention * adding accum width
tmoreau89 · Jan 2, 2019 · bbfbde3 · bbfbde3
1 parent 9274d25
commit bbfbde3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vta/config/vta_config.py b/vta/config/vta_config.py
@@ -99,15 +99,15 @@ def main():
     cfg["LOG_OUT_BUFF_SIZE"] = cfg["LOG_ACC_BUFF_SIZE"] - cfg["LOG_ACC_WIDTH"] + cfg["LOG_OUT_WIDTH"]
     # Generate bitstream config string.
     # Needs to match the BITSTREAM string in python/vta/environment.py
-    cfg["BITSTREAM"] = "{}_{}_{}x{}x{}_a{}w{}o{}_{}_{}_{}_{}_{}MHz_{}ns_gii{}".format(
+    cfg["BITSTREAM"] = "{}_{}x{}x{}_a{}w{}o{}s{}_{}_{}_{}_{}_{}MHz_{}ns_gii{}".format(
         cfg["TARGET"],
-        cfg["HW_VER"].replace('.', '_'),
         (1 << cfg["LOG_BATCH"]),
         (1 << cfg["LOG_BLOCK_IN"]),
         (1 << cfg["LOG_BLOCK_OUT"]),
         (1 << cfg["LOG_INP_WIDTH"]),
         (1 << cfg["LOG_WGT_WIDTH"]),
         (1 << cfg["LOG_OUT_WIDTH"]),
+        (1 << cfg["LOG_ACC_WIDTH"]),
         cfg["LOG_UOP_BUFF_SIZE"],
         cfg["LOG_INP_BUFF_SIZE"],
         cfg["LOG_WGT_BUFF_SIZE"],

diff --git a/vta/python/vta/environment.py b/vta/python/vta/environment.py
@@ -152,7 +152,7 @@ def __init__(self, cfg):
         self._dev_ctx = None
         self._last_env = None
         # derive bitstream name
-        self.BITSTREAM = "{}/{}/{}x{}x{}_a{}w{}o{}_{}_{}_{}_{}_{}_{}MHz_{}ns_gii{}".format(
+        self.BITSTREAM = "{}/{}_{}x{}x{}_a{}w{}o{}s{}_{}_{}_{}_{}_{}_{}MHz_{}ns_gii{}".format(
             self.HW_VER.replace('.', '_'),
             self.TARGET,
             self.BATCH,
@@ -161,6 +161,7 @@ def __init__(self, cfg):
             self.INP_WIDTH,
             self.WGT_WIDTH,
             self.OUT_WIDTH,
+            self.ACC_WIDTH,
             self.LOG_BUS_WIDTH,
             self.LOG_UOP_BUFF_SIZE,
             self.LOG_INP_BUFF_SIZE,