cleanup

Makefile

@@ -78,7 +78,6 @@ syn:$(operators_syn_targets)
 # Out-of-Context Synthesis from Verilog to post-synthesis DCP
 $(operators_syn_targets):$(ws_syn)/%/page_netlist.dcp:$(ws_hls)/runLog%.log $(ws_overlay)$(overlay_suffix)/__overlay_is_ready__ ./pr_flow/syn.py
 	python2 pr_flow.py $(prj_name) -syn -op $(subst runLog,,$(basename $(notdir $<)))
-	#cd $(ws_syn)/$(subst runLog,,$(basename $(notdir $<)))/riscv && ./qsub_run.sh
 	cd $(ws_syn)/$(subst runLog,,$(basename $(notdir $<))) && ./main.sh $(operators)
 
 # HLS
@@ -106,7 +105,22 @@ overlay_only:
 	python2 pr_flow.py $(prj_name) -g -op '$(basename $(notdir $(operators)))' -bft_n=$(bft_n)
 	cd ./workspace/F001_overlay$(overlay_suffix) && ./main.sh
 
+
+
+clear:
+	rm -rf ./workspace/*$(prj_name)
+
+clean:
+	rm -rf ./workspace
+	rm -rf ./pr_flow/*.pyc
+
+clear_impl:
+	rm -rf ./workspace/F004_impl_$(prj_name)
+	rm -rf ./workspace/F005_bits_$(prj_name)
+
+
 # Incremental compile
+prj_name=optical_flow_incr
 incr:
 	python2 pr_flow.py $(prj_name) -incr -op '$(operators)'
 run_on_fpga:
@@ -121,16 +135,4 @@ revert_to_init:
 	rm -f ./input_src/$(prj_name)/operators/best_result.txt
 	rm -rf ./input_src/$(prj_name)/operators/*.cpp ./input_src/$(prj_name)/operators/*.h ./input_src/$(prj_name)/operators/*.json
 	cp ./input_src/$(prj_name)/operators/_original/* ./input_src/$(prj_name)/operators/
-	mv ./input_src/$(prj_name)/operators/top.cpp ./input_src/$(prj_name)/host/top.cpp
-
-
-clear:
-	rm -rf ./workspace/*$(prj_name)
-
-clean:
-	rm -rf ./workspace
-	rm -rf ./pr_flow/*.pyc
-
-clear_impl:
-	rm -rf ./workspace/F004_impl_$(prj_name)
-	rm -rf ./workspace/F005_bits_$(prj_name)
+	mv ./input_src/$(prj_name)/operators/top.cpp ./input_src/$(prj_name)/host/top.cpp

common/configure/configure.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-  <spec name = "riscv_dir"          value = "/opt/riscv32" />
+<!--   <spec name = "riscv_dir"          value = "/opt/riscv32" /> -->
   <spec name = "overlay_type"       value = "psnoc" />
 <!--   <spec name = "overlay_type"       value = "hipr" /> -->
   <!--spec name = "riscv_dir"          value = "/scratch/unsafe/RISCV/riscv32i" -->
@@ -10,7 +10,7 @@
   <!--spec name = "board"              value = "au50" -->
   <spec name = "board"              value = "zcu102" />
   <spec name = "Xilinx_dir"         value = "/tools/Xilinx/Vitis/2021.1/settings64.sh" />
-  <spec name = "xrt_dir"            value = "/opt/xilinx/xrt/setup.sh" />
+  <spec name = "xrt_dir"            value = "/opt/xilinx/xrt/setup.sh" /> <!-- Not necessary for embedded platform -->
 
 
   <spec name = "email"              value = "[email protected]" />

common/script_src/gen_runtime.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -e
 Xilinx_dir
-xrt_dir
+# xrt_dir
 g++ -Wall -g -std=c++11 host.cpp  -o app.exe -I${XILINX_XRT}/include/ -I${XILINX_VIVADO}/include/ -L${XILINX_XRT}/lib/ -lOpenCL -lpthread -lrt -lstdc++

common/script_src/get_blocked_resources.py

@@ -1,5 +1,5 @@
 import os.path
-from natsort import natsorted
+# from natsort import natsorted
 import math
 import json
 
@@ -276,7 +276,8 @@ def main():
 
 
     blocked_resource_final_dict = {}
-    for blocked_file in natsorted(blocked_files):
+    # for blocked_file in natsorted(blocked_files):
+    for blocked_file in blocked_files:
         blocked_sites_file = os.path.dirname(blocked_file) + '/blockedSitesInputs.tcl'
         blocked_file_short = blocked_file.split('.tcl')[0] + '_short.tcl'
         print(blocked_file)
@@ -397,7 +398,8 @@ def main():
         for pblock_name in pblock_resource_dict:
             blocked_resource_count_dict[pblock_name] = {}
 
-        for pblock_name in natsorted(blocked_resource_loc_dict.keys()):
+        # for pblock_name in natsorted(blocked_resource_loc_dict.keys()):
+        for pblock_name in blocked_resource_loc_dict.keys():
             # print(pblock_name)
             for resource_type in blocked_resource_loc_dict[pblock_name]:
                 if(resource_type == 'SLICE'):

common/ydma/zcu102/build.sh

@@ -12,7 +12,8 @@ export PLATFORM=
 #export MaxJobNum=10
 
 Xilinx_dir
-xrt_dir
+# Embedded platform doesn't need XRT_DIR
+
 unset LD_LIBRARY_PATH
 
 sdk_dir