From 07dfd35e1259359c35bbfe3c18cbe4f5e06703ba Mon Sep 17 00:00:00 2001 From: Lalit Sharma Date: Tue, 8 Dec 2020 20:35:57 -0800 Subject: [PATCH] Adding yosys-symbiflow-plugins as submodule and adding tcllib as dependency in CI --- .github/workflows/install_dependency.sh | 1 + .gitmodules | 3 +++ CMakeLists.txt | 13 +++++++++++++ yosys-symbiflow-plugins | 1 + 4 files changed, 18 insertions(+) create mode 160000 yosys-symbiflow-plugins diff --git a/.github/workflows/install_dependency.sh b/.github/workflows/install_dependency.sh index 0e663ef26..c7165712b 100644 --- a/.github/workflows/install_dependency.sh +++ b/.github/workflows/install_dependency.sh @@ -27,6 +27,7 @@ sudo apt-get install libxml++2.6-dev sudo apt-get install perl sudo apt-get install python sudo apt-get install python-lxml +sudo apt-get install tcllib sudo apt-get install texinfo sudo apt-get install time sudo apt-get install valgrind diff --git a/.gitmodules b/.gitmodules index 659fe763f..0ad41944c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "yosys"] path = yosys url = https://github.com/YosysHQ/yosys.git +[submodule "yosys-symbiflow-plugins"] + path = yosys-symbiflow-plugins + url = https://github.com/SymbiFlow/yosys-symbiflow-plugins.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d021c2ee4..b615ff856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,8 @@ add_subdirectory(ace2) add_subdirectory(vpr) add_subdirectory(openfpga) +# yosys compilation starts + # Compilation options for yosys include(CMakeParseArguments) @@ -237,6 +239,17 @@ add_custom_target( # yosys compilation ends +# yosys-symbiflow-plugins compilation starts + +add_custom_target( + yosys-symbiflow-plugins ALL + COMMAND $(MAKE) all + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys-symbiflow-plugins + COMMENT "Compile yosys-symbiflow-plugins with given Makefile" +) + +# yosys-symbiflow-plugins compilation ends + # run make to extract compiler options, linker options and list of source files #add_custom_target( # yosys diff --git a/yosys-symbiflow-plugins b/yosys-symbiflow-plugins new file mode 160000 index 000000000..f8a61ea93 --- /dev/null +++ b/yosys-symbiflow-plugins @@ -0,0 +1 @@ +Subproject commit f8a61ea93e68db6e9d5db6a6069ae088808695e8