diff --git a/.gitignore b/.gitignore index 3322e95..b5d14b2 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ main.pdf # hls projects **/*.proj/ +**/*.comp/ # ignore any python virtual environments **/.venv/ diff --git a/examples/Makefile b/examples/Makefile index 880ac77..467b809 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -136,10 +136,10 @@ CXX_HLS_TARGET_FILES = \ spmv2_restructured.cpp \ spmv_unrolled.cpp -HLS_TARGETS = $(patsubst %.c,%.proj,$(CC_HLS_TARGET_FILES)) -HLS_TARGETS += $(patsubst %.cpp,%.proj,$(CXX_HLS_TARGET_FILES)) +HLS_TARGETS = $(patsubst %.c,%.comp,$(CC_HLS_TARGET_FILES)) +HLS_TARGETS += $(patsubst %.cpp,%.comp,$(CXX_HLS_TARGET_FILES)) -%.proj: %.tcl +%.comp: %.tcl # vivado_hls -f $? $(HLS_COMPILER) $? || (echo "$(HLS_COMPILER) $? failed $$?"; exit 0) @@ -159,7 +159,7 @@ test: $(EXAMPLES_LOG) clean: - rm -rf *.o *.log *.bin *.tcl *.proj logs/* hls/* + rm -rf *.o *.log *.bin *.tcl *.comp logs/* hls/* .PHONY: clean hls test diff --git a/scripts/gen_hls_runner_script.py b/scripts/gen_hls_runner_script.py index ff876fd..6b37ee4 100755 --- a/scripts/gen_hls_runner_script.py +++ b/scripts/gen_hls_runner_script.py @@ -107,12 +107,11 @@ def write_script( with open(output_file, "w", encoding="utf-8") as file: script_text = f"""\ - open_project {file_root}.proj -reset + open_component {file_root}.comp -reset add_files [list {files}] {tb_add_files} set_top {top} puts "Running: set_top {top}" - open_solution solution -reset set_part {part} puts "Running: set_part {part}" create_clock -period {period}