From 171e9291d5a5ca31b6a7c5b46cc5d3b0ba6d5c3e Mon Sep 17 00:00:00 2001 From: coolbreeze413 Date: Sat, 9 Oct 2021 03:11:28 +0530 Subject: [PATCH] change yosys bin/share path due to yosys-symbiflow-plugins needs --- .dockerignore | 12 ++++++------ .gitmodules | 1 + CMakeLists.txt | 6 +++--- openfpga.sh | 1 - openfpga_flow/misc/fpgaflow_default_tool_path.conf | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index 93af49793..8240dff87 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,12 +12,12 @@ !/openfpga/openfpga !/vpr/libvpr.a !/vpr/vpr -!/yosys/share/ -!/yosys/yosys -!/yosys/yosys-abc -!/yosys/yosys-config -!/yosys/yosys-filterlib -!/yosys/yosys-smtbmc +!/yosys/install/share/ +!/yosys/install/bin/yosys +!/yosys/install/bin/yosys-abc +!/yosys/install/bin/yosys-config +!/yosys/install/bin/yosys-filterlib +!/yosys/install/bin/yosys-smtbmc !/openfpga_flow !/openfpga.sh !/openfpga_flow/ diff --git a/.gitmodules b/.gitmodules index 6a6775e53..ddc22b508 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "yosys"] path = yosys url = https://github.com/symbiflow/yosys + ignore = dirty [submodule "yosys-plugins"] path = yosys-plugins url = https://github.com/SymbiFlow/yosys-symbiflow-plugins diff --git a/CMakeLists.txt b/CMakeLists.txt index 845749559..1135a27e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,10 +229,10 @@ include(CheckCXXCompilerFlag) # run makefile provided, we pass-on the options to the local make file # Build Yosys add_custom_target( - yosys-main ALL + yosys ALL COMMAND $(MAKE) config-gcc COMMAND make clean - COMMAND $(MAKE) install -j10 PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install + COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys COMMENT "Compile Yosys with given Makefile" ) @@ -249,7 +249,7 @@ add_custom_target( COMMENT "Compile Yosys-plugins with given Makefile" ) -add_dependencies(yosys-plugins yosys-main) +add_dependencies(yosys-plugins yosys) # yosys-plugins compilation ends diff --git a/openfpga.sh b/openfpga.sh index 7ebc0f739..f0ab701ee 100755 --- a/openfpga.sh +++ b/openfpga.sh @@ -16,7 +16,6 @@ export OPENFPGA_SCRIPT_PATH="${OPENFPGA_PATH}/openfpga_flow/scripts" export OPENFPGA_TASK_PATH="${OPENFPGA_PATH}/openfpga_flow/tasks" if [ -z $PYTHON_EXEC ]; then export PYTHON_EXEC="python3"; fi - # This function checks the path and # raises warning if the command is not executing # inside current OpendFPGA folder diff --git a/openfpga_flow/misc/fpgaflow_default_tool_path.conf b/openfpga_flow/misc/fpgaflow_default_tool_path.conf index 91108dbac..b0b25b100 100644 --- a/openfpga_flow/misc/fpgaflow_default_tool_path.conf +++ b/openfpga_flow/misc/fpgaflow_default_tool_path.conf @@ -1,10 +1,10 @@ # Standard Configuration Example [CAD_TOOLS_PATH] openfpga_shell_path = ${PATH:OPENFPGA_PATH}/openfpga/openfpga -yosys_path = ${PATH:OPENFPGA_PATH}/yosys/yosys +yosys_path = ${PATH:OPENFPGA_PATH}/yosys/install/bin/yosys misc_dir = ${PATH:OPENFPGA_PATH}/openfpga_flow/misc odin2_path = ${PATH:OPENFPGA_PATH}/openfpga_flow/not_used_atm/odin2.exe -abc_path = ${PATH:OPENFPGA_PATH}/yosys/yosys-abc +abc_path = ${PATH:OPENFPGA_PATH}/yosys/install/bin/yosys-abc abc_mccl_path = ${PATH:OPENFPGA_PATH}/abc_with_bb_support/abc abc_with_bb_support_path = ${PATH:OPENFPGA_PATH}/abc_with_bb_support/abc vpr_path = ${PATH:OPENFPGA_PATH}/vpr/vpr