Backend and Makefile fixes for emulation

Author: axiotisk

hls4ml/backends/vitis_accelerator/vitis_accelerator_backend.py

@@ -112,12 +112,15 @@ def dat_to_numpy(self, model):
         y = np.loadtxt(output_file, dtype=float).reshape(-1, expected_shape)
         return y
 
-    def hardware_predict(self, model, x, target="hw"):
+    def hardware_predict(self, model, x, target="hw", debug=False):
+        if debug:
+            command = "DEBUG=1 "
         self._validate_target(target)
         self.numpy_to_dat(model, x)
         currdir = os.getcwd()
         os.chdir(model.config.get_output_dir())
-        os.system(f"TARGET={target} make run")
+        command += "TARGET=" + target + " make run"
+        os.system(command)
         os.chdir(currdir)
 
         return self.dat_to_numpy(model)

hls4ml/templates/vitis_accelerator/Makefile

@@ -25,11 +25,6 @@ PWD := $(shell pwd)
 # Target (hw, hw_emu, sw_emu)
 TARGET ?= hw
 
-# Define emulation mode variable
-ifneq($(TARGET), hw)
-  XCL_EMULATION_MODE=$(TARGET)
-endif
-
 # Accelerator card configuration file
 CARD_CFG ?= accelerator_card.cfg
 
@@ -126,9 +121,14 @@ host: $(KERNEL_NAME)_host_cl.cpp libs/xcl2.cpp
 # Execute program #############################################################
 
 run: ./host $(BUILD_DIR)/$(WRAPPER_NAME).xclbin
-  cd firmware
-	./host $(BUILD_DIR)/$(WRAPPER_NAME).xclbin
-  cd ..
+ifeq ($(TARGET), hw)
+	@echo "TARGET is hw, not setting XCL_EMULATION_MODE"
+	$(eval EMULATION_MODE :=)
+else
+	@echo "Setting XCL_EMULATION_MODE to $(TARGET)"
+	$(eval EMULATION_MODE := XCL_EMULATION_MODE=$(TARGET))
+endif
+	@cd firmware && $(EMULATION_MODE) ../host ../$(BUILD_DIR)/$(WRAPPER_NAME).xclbin
 
 # Cleanup #####################################################################