Merge pull request #3156 from verilog-to-routing/yosys_to_submodule

Converting Yosys to Submodule

Author: AlexandreSinger

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "libs/EXTERNAL/libezgl"]
 	path = libs/EXTERNAL/libezgl
 	url = https://github.com/verilog-to-routing/ezgl.git
+[submodule "libs/EXTERNAL/yosys"]
+	path = libs/EXTERNAL/yosys
+	url = https://github.com/YosysHQ/yosys.git

CMakeLists.txt

@@ -413,24 +413,6 @@ if(${WITH_ABC})
     add_subdirectory(abc)
 endif()
 
-if(${WITH_PARMYS}) # define cmake params to compile Yosys
-    add_definitions("-D_YOSYS_")
-
-    set(MAKE_PROGRAM "$(MAKE)")
-    if(${CMAKE_GENERATOR} STREQUAL "Ninja")
-        set(MAKE_PROGRAM "make")
-    endif()
-
-    # Commented out since a make file should not call another make command with
-    # threads. It should pass this information from the parent automatically.
-    # if(NOT DEFINED "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    #     set(CUSTOM_BUILD_PARALLEL_LEVEL 16)
-    # else()
-    #     set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    # endif()
-    add_subdirectory(yosys)
-endif()
-
 add_subdirectory(libs) #libs/CMakeLists.txt handles adding warnings flags to non-external libraries
 
 if(${WITH_PARMYS})

dev/subtree_config.xml

@@ -49,11 +49,6 @@
         internal_path="vtr_flow/benchmarks/system_verilog/fx68k"
         external_url="https://github.com/ijor/fx68k.git"
         default_external_ref="master"/>
-    <subtree
-        name="yosys"
-        internal_path="yosys"
-        external_url="https://github.com/YosysHQ/yosys.git"
-        default_external_ref="yosys-0.32"/>
     <subtree
         name="parmys"
         internal_path="parmys"

libs/EXTERNAL/CMakeLists.txt

@@ -38,6 +38,47 @@ endif ()
 # The VTR root CMakeFile initializes the WITH_PARMYS
 if (${WITH_PARMYS})
 
+	cmake_minimum_required(VERSION 3.16)
+
+	#project(yosys)
+
+	# Create a target out of the library compilation result
+	SET(YOSYS_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys)
+	SET(YOSYS_BUILD_DIR ${CMAKE_BINARY_DIR}/bin/yosys)
+
+    add_definitions("-D_YOSYS_")
+    set(MAKE_PROGRAM "$(MAKE)")
+	set(CURRENT_CPPFLAGS "$(CPPFLAGS)-w")
+	if(${CMAKE_GENERATOR} STREQUAL "Ninja")
+	    set(CURRENT_CPPFLAGS "-w")
+	endif()
+
+	#Initialize yosys submodules
+	execute_process(
+	 COMMAND git submodule update --init
+	 WORKING_DIRECTORY ${YOSYS_SRC_DIR}
+	)
+	execute_process(
+	  COMMAND ${GIT_EXECUTABLE} submodule foreach --recursive git\ submodule\ update\ --init
+	  WORKING_DIRECTORY ${YOSYS_SRC_DIR}
+	)
+
+	# how to build the result of the library
+	add_custom_command(OUTPUT ${YOSYS_BUILD_DIR}
+		COMMAND ${MAKE_PROGRAM} -C ${YOSYS_SRC_DIR}
+		    ENABLE_ABC=0
+		    PREFIX=${CMAKE_BINARY_DIR}
+
+		 COMMAND ${MAKE_PROGRAM} 
+		    -C ${YOSYS_SRC_DIR}
+		    install
+		    ENABLE_ABC=0
+		    PREFIX=${CMAKE_BINARY_DIR}
+
+		WORKING_DIRECTORY ${YOSYS_SRC_DIR})
+
+	add_custom_target(yosys ALL DEPENDS ${YOSYS_BUILD_DIR})
+
     if (${SYNLIG_SYSTEMVERILOG})
 
         set(SURELOG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Surelog)
@@ -175,4 +216,4 @@ if (VPR_USE_SERVER)
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sockpp/include>
             $<INSTALL_INTERFACE:include>
             )
-endif()
+endif()

libs/EXTERNAL/yosys

@@ -19,7 +19,7 @@ add_library(parmys SHARED
 )
 target_include_directories(parmys PUBLIC ${LIB_INCLUDE_DIRS})
 target_include_directories(parmys PUBLIC ${LIB_INCLUDE_DIRS_O})
-target_include_directories(parmys PUBLIC ${VTR_SOURCE_DIR}/yosys/share/include)
+target_include_directories(parmys PUBLIC ${VTR_SOURCE_DIR}/libs/EXTERNAL/yosys/share/include)
 
 add_definitions("-D_YOSYS_")
 add_dependencies(parmys yosys)

parmys/CMakeLists.txt

@@ -483,7 +483,7 @@
         "Average Path": 3,
         "Estimated LUTs": 4777,
         "Total Node": 1957,
-        "Wires": 5594,
+        "Wires": 5592,
         "Wire Bits": 10106,
         "Public Wires": 240,
         "Public Wire Bits": 240,

parmys/regression_test/benchmark/task/freecores/synthesis_result.json

@@ -95,21 +95,21 @@
         "test_name": "and/replicate_and_int_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "and/replicate_and_ultra_wide/no_arch": {
         "test_name": "and/replicate_and_ultra_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "and/replicate_and_wide/no_arch": {
         "test_name": "and/replicate_and_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "DEFAULT": {

parmys/regression_test/benchmark/task/keywords/and/synthesis_result.json

@@ -94,21 +94,21 @@
         "test_name": "nand/replicate_nand_int_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "nand/replicate_nand_ultra_wide/no_arch": {
         "test_name": "nand/replicate_nand_ultra_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "nand/replicate_nand_wide/no_arch": {
         "test_name": "nand/replicate_nand_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "DEFAULT": {

parmys/regression_test/benchmark/task/keywords/nand/synthesis_result.json

@@ -100,21 +100,21 @@
         "test_name": "nor/replicate_nor_int_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "nor/replicate_nor_ultra_wide/no_arch": {
         "test_name": "nor/replicate_nor_ultra_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "nor/replicate_nor_wide/no_arch": {
         "test_name": "nor/replicate_nor_wide/no_arch",
         "exit": 1,
         "errors": [
-            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2754."
+            "Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
         ]
     },
     "DEFAULT": {