build() signature alignment + xcl update + write_host() overwrite

Author: alex-yang-upenn

hls4ml/backends/vitis_accelerator/vitis_accelerator_backend.py

@@ -44,7 +44,7 @@ def create_initial_config(
         config['AcceleratorConfig']['Batchsize'] = batchsize
         return config
 
-    def build(self, model, target="all"):
+    def build(self, model, reset=False, synth=True, vsynth=True):
         if 'linux' in sys.platform:
             if 'XILINX_VITIS' not in os.environ:
                 raise Exception("XILINX_VITIS environmental variable missing. Please install XRT and Vitis, and run the setup scripts before building")
@@ -53,19 +53,35 @@ def build(self, model, target="all"):
             if 'XILINX_VIVADO' not in os.environ:
                 raise Exception("XILINX_VIVADO environmental variable missing. Please install XRT and Vitis, and run the setup scripts before building")
 
-            if target not in ["all", "host", "hls", "xclbin"]:
-                raise Exception("Invalid build target")
-
             curr_dir = os.getcwd()
             os.chdir(model.config.get_output_dir())
+
+            if reset:
+                if vsynth:
+                    os.system("make cleanxclbin")
+                if synth:
+                    os.system("make cleanhls")
+                os.system("rm -rf host")
+            
+            if vsynth:
+                if synth:
+                    target = "all"
+                else:
+                    target = "xclbin"
+            elif synth:
+                target = "hls"
+            else:
+                target = "host"
             command = "make " + target
+
             # Pre-loading libudev
             ldconfig_output = subprocess.check_output(["ldconfig", "-p"]).decode("utf-8")
             for line in ldconfig_output.split("\n"):
                 if "libudev.so" in line and "x86" in line:
                     command = "LD_PRELOAD=" + line.split("=>")[1].strip() + " " + command
                     break
             os.system(command)
+            
             os.chdir(curr_dir)
         else:
             raise Exception("Currently untested on non-Linux OS")

hls4ml/templates/vitis_accelerator/Makefile

@@ -25,7 +25,7 @@ endif
 KERN_LIBRARIES += -I./ -I./firmware/ -I./firmware/weights -I./firmware/nnet_utils/
 
 .PHONY: all
-all: host xclbin
+all: hls xclbin
 
 # Building kernel
 ./build/myproject_kernel.xo: kernel_wrapper.cpp
@@ -47,12 +47,16 @@ host: myproject_host_cl.cpp libs/xcl2.cpp
 hls: ./build/myproject_kernel.xo
 
 .PHONY: xclbin
-xclbin: ./build/kernel_wrapper.xclbin
+xclbin: ./build/kernel_wrapper.xclbin host
 
 # Cleaning stuff
-.PHONY: clean
-clean:
-	-rm -rf host
-	-rm -rf *.xclbin*
-	-rm -rf build*
-	-rm -rf *.log *.jou *.rpt *.csv *.mdb *.ltx
+.PHONY: cleanxclbin
+	-rm -rf host tb_data/hw_results.dat
+	-rm -rf *kernel_wrapper*.log 
+	-rm -rf build/kernel_wrapper.xclbin* build/kernel_wrapper.xsa* build/kernel_wrapper.ltx build/kernel_wrapper.mdb
+	-rm -rf build/xclbin
+
+.PHONY: cleanhls
+	-rm -rf build/myproject_kernel.xo*
+	-rm -rf build/xo
+	-rm -rf *myproject_kernel*.log