[incubator-tvm] branch refactor updated: hls bitstream generation tested for pynq target

[mo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

moreau pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/incubator-tvm.git


The following commit(s) were added to refs/heads/refactor by this push:
     new bd92215  hls bitstream generation tested for pynq target
bd92215 is described below

commit bd92215b25b0eec5577870156d328c4ceadb8837
Author: Thierry Moreau <mo...@uw.edu>
AuthorDate: Fri Mar 6 14:47:05 2020 -0800

    hls bitstream generation tested for pynq target
---
 3rdparty/vta-hw/config/vta_config.py     | 6 +++---
 3rdparty/vta-hw/hardware/xilinx/Makefile | 8 ++++----
 vta/python/vta/pkg_config.py             | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/3rdparty/vta-hw/config/vta_config.py b/3rdparty/vta-hw/config/vta_config.py
index 1c2f050..f55ba8c 100644
--- a/3rdparty/vta-hw/config/vta_config.py
+++ b/3rdparty/vta-hw/config/vta_config.py
@@ -23,7 +23,7 @@ import argparse
 def get_pkg_config(cfg):
     """Get the pkg config object."""
     curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-    proj_root = os.path.abspath(os.path.join(curr_path, "../../"))
+    proj_root = os.path.abspath(os.path.join(curr_path, "../../../"))
     pkg_config_py = os.path.join(proj_root, "vta/python/vta/pkg_config.py")
     libpkg = {"__file__": pkg_config_py}
     exec(compile(open(pkg_config_py, "rb").read(), pkg_config_py, "exec"), libpkg, libpkg)
@@ -107,9 +107,9 @@ def main():
 
     curr_path = os.path.dirname(
         os.path.abspath(os.path.expanduser(__file__)))
-    proj_root = os.path.abspath(os.path.join(curr_path, "../../"))
+    proj_root = os.path.abspath(os.path.join(curr_path, "../../../"))
     path_list = [
-        os.path.join(proj_root, "vta/config/vta_config.json")
+        os.path.join(proj_root, "3rdparty/vta-hw/config/vta_config.json")
     ]
     if args.use_cfg:
         path_list = [args.use_cfg]
diff --git a/3rdparty/vta-hw/hardware/xilinx/Makefile b/3rdparty/vta-hw/hardware/xilinx/Makefile
index 77d5d44..2651583 100644
--- a/3rdparty/vta-hw/hardware/xilinx/Makefile
+++ b/3rdparty/vta-hw/hardware/xilinx/Makefile
@@ -17,8 +17,8 @@
 
 # Directories
 ROOTDIR = $(CURDIR)
-VTA_DIR = $(CURDIR)/../..
-BUILD_DIR = $(VTA_DIR)/build/hardware/xilinx
+VTA_HW_DIR = $(CURDIR)/../..
+BUILD_DIR = $(VTA_HW_DIR)/build/hardware/xilinx
 SCRIPT_DIR = $(CURDIR)/scripts
 SRC_DIR = $(CURDIR)/src
 
@@ -27,7 +27,7 @@ VIVADO_HLS = vivado_hls
 VIVADO = vivado
 
 # Process VTA JSON config
-VTA_CONFIG := $(CURDIR)/../../config/vta_config.py
+VTA_CONFIG := $(VTA_HW_DIR)/config/vta_config.py
 
 # Derive config name
 CONF := $(shell python ${VTA_CONFIG} --cfg-str)
@@ -52,7 +52,7 @@ $(IP_PATH): $(SRC_DIR)/*
 		$(VIVADO_HLS) \
 		-f $(SCRIPT_DIR)/hls.tcl \
 		-tclargs \
-			$(VTA_DIR) \
+			$(VTA_HW_DIR) \
 			${VTA_CONFIG}
 
 $(BIT_PATH): $(IP_PATH)
diff --git a/vta/python/vta/pkg_config.py b/vta/python/vta/pkg_config.py
index 0516e83..dee6f7a 100644
--- a/vta/python/vta/pkg_config.py
+++ b/vta/python/vta/pkg_config.py
@@ -66,17 +66,17 @@ class PkgConfig(object):
         # Include path
         self.include_path = [
             "-I%s/include" % proj_root,
-            "-I%s/vta/include" % proj_root,
+            "-I%s/3rdparty/vta-hw/include" % proj_root,
             "-I%s/3rdparty/dlpack/include" % proj_root,
             "-I%s/3rdparty/dmlc-core/include" % proj_root
         ]
 
         # List of source files that can be used to build standalone library.
         self.lib_source = []
-        self.lib_source += glob.glob("%s/vta/src/*.cc" % proj_root)
+        self.lib_source += glob.glob("%s/3rdparty/vta-hw/src/*.cc" % proj_root)
         if self.TARGET in ["pynq", "ultra96"]:
             # add pynq drivers for any board that uses pynq driver stack (see pynq.io)
-            self.lib_source += glob.glob("%s/vta/src/pynq/*.cc" % (proj_root))
+            self.lib_source += glob.glob("%s/3rdparty/vta-hw/src/pynq/*.cc" % (proj_root))
 
         # Linker flags
         if self.TARGET in ["pynq", "ultra96"]: