Merge remote-tracking branch 'origin/master' into visualize_flat_routing

Author: SamuelHo10

.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"

doc/src/api/vtrutil/logging.rst

@@ -14,6 +14,8 @@ vtr_error
    :project: vtr
    :sections: briefdescription detaileddescription innernamespace innerclass user-defined public-func
 
+.. _vtr_assertion:
+
 vtr_assertion
 -------------
 .. doxygenfile:: vtr_assert.h