Removing yosys to try again, this time in libs/EXTERNAL

Author: loglav03

.gitmodules

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

CMakeLists.txt

@@ -420,17 +420,17 @@ if(${WITH_PARMYS}) # define cmake params to compile Yosys
     # else()
     #     set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
     # endif()
-    execute_process(
-        COMMAND git submodule update --init --recursive
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys
-        RESULT_VARIABLE _submod_ret
-        OUTPUT_QUIET
-        ERROR_QUIET
-    )
-    if(NOT _submod_ret EQUAL 0)
-        message(FATAL_ERROR
-        "Failed to `git submodule update --init --recursive` in ${CMAKE_CURRENT_SOURCE_DIR}/yosys")
-    endif()
+    # execute_process(
+    #     COMMAND ${GIT_EXECUTABLE} submodule update --init yosys
+    #     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}#/yosys
+    #     RESULT_VARIABLE _submod_ret
+    #     OUTPUT_QUIET
+    #     ERROR_QUIET
+    # )
+    # if(NOT _submod_ret EQUAL 0)
+    #     message(FATAL_ERROR
+    #     "Failed to `git submodule update --init --recursive` in ${CMAKE_CURRENT_SOURCE_DIR}/yosys")
+    # endif()
     add_subdirectory(cmake/yosys)
 endif()
 

cmake/yosys/CMakeLists.txt

@@ -17,17 +17,21 @@ if(${CMAKE_GENERATOR} STREQUAL "Ninja")
 endif()
 
 #Initialize yosys submodules
-#execute_process(
-#  COMMAND git submodule update --init --recursive
-#  WORKING_DIRECTORY ${YOSYS_SRC_DIR}
+execute_process(
+ COMMAND git submodule update --init
+ WORKING_DIRECTORY ${YOSYS_SRC_DIR}
 #  RESULT_VARIABLE _submod_ret
 #  OUTPUT_QUIET
 #  ERROR_QUIET
-#)
-#if(NOT _submod_ret EQUAL 0)
+)
+execute_process(
+  COMMAND ${GIT_EXECUTABLE} submodule foreach --recursive git\ submodule\ update\ --init
+  WORKING_DIRECTORY ${YOSYS_SRC_DIR}
+)
+# if(NOT _submod_ret EQUAL 0)
 #  message(FATAL_ERROR
 #    "Failed to `git submodule update --init --recursive` in ${YOSYS_SRC_DIR}")
-#endif()
+# endif()
 
 # how to build the result of the library
 add_custom_command(OUTPUT yosys-bin

libs/EXTERNAL/CMakeLists.txt

@@ -38,6 +38,55 @@ endif ()
 # The VTR root CMakeFile initializes the WITH_PARMYS
 if (${WITH_PARMYS})
 
+	cmake_minimum_required(VERSION 3.16)
+
+	#project(yosys_wrapper NONE)
+
+	# Create a target out of the library compilation result
+	SET(YOSYS_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys CACHE PATH "")
+	SET(YOSYS_BUILD_DIR ${CMAKE_BINARY_DIR}/yosys CACHE PATH "")
+
+	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}
+	#  RESULT_VARIABLE _submod_ret
+	#  OUTPUT_QUIET
+	#  ERROR_QUIET
+	)
+	execute_process(
+	  COMMAND ${GIT_EXECUTABLE} submodule foreach --recursive git\ submodule\ update\ --init
+	  WORKING_DIRECTORY ${YOSYS_SRC_DIR}
+	)
+	# if(NOT _submod_ret EQUAL 0)
+	#  message(FATAL_ERROR
+	#    "Failed to `git submodule update --init --recursive` in ${YOSYS_SRC_DIR}")
+	# endif()
+
+	# how to build the result of the library
+	add_custom_command(OUTPUT yosys-bin
+		COMMAND ${MAKE_PROGRAM} -C ${YOSYS_SRC_DIR}
+		    ENABLE_ABC=0
+		    PREFIX=${YOSYS_BUILD_DIR}
+		COMMAND 
+	#            -j${CUSTOM_BUILD_PARALLEL_LEVEL}
+		    > /dev/null
+
+		 COMMAND ${MAKE_PROGRAM} -C ${YOSYS_SRC_DIR}
+		    install ENABLE_ABC=0
+		    PREFIX=${YOSYS_BUILD_DIR}
+		    > /dev/null
+
+		WORKING_DIRECTORY ${YOSYS_SRC_DIR})
+
+	add_custom_target(yosys ALL DEPENDS yosys-bin)
+
+
     if (${SYNLIG_SYSTEMVERILOG})
 
         set(SURELOG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Surelog)
@@ -175,4 +224,4 @@ if (VPR_USE_SERVER)
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sockpp/include>
             $<INSTALL_INTERFACE:include>
             )
-endif()
+endif()