Merge branch 'master' into fix_fasm_warnings

Author: soheilshahrouz

.github/scripts/install_dependencies.sh

@@ -29,6 +29,7 @@ sudo apt install -y \
   libncurses5-dev \
   libx11-dev \
   libxft-dev \
+  libxml2-utils \
   libxml++2.6-dev \
   libreadline-dev \
   tcllib \

CMakeLists.txt

@@ -418,11 +418,13 @@ if(${WITH_PARMYS}) # define cmake params to compile Yosys
         set(MAKE_PROGRAM "make")
     endif()
 
-    if(NOT DEFINED "${CMAKE_BUILD_PARALLEL_LEVEL}")
-        set(CUSTOM_BUILD_PARALLEL_LEVEL 16)
-    else()
-        set(CUSTOM_BUILD_PARALLEL_LEVEL "${CMAKE_BUILD_PARALLEL_LEVEL}")
-    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()
 

doc/src/vtr/benchmarks.rst

@@ -102,7 +102,7 @@ These designs use many precisions including binary, different fixed point types
     proxy               Proxy/synthetic benchmarks
     =================   ======================================
 
-The VTR benchmarks are provided as Verilog (enabling full flexibility to modify and change how the designs are implemented) under: ::
+The Koios benchmarks are provided as Verilog (enabling full flexibility to modify and change how the designs are implemented) under: ::
 
     $VTR_ROOT/vtr_flow/benchmarks/verilog/koios
 
@@ -207,4 +207,4 @@ real application domains. On the other hand, MLP benchmarks include modules that
 and move data. Pre-synthesized netlists for the synthetic benchmarks are added to VTR project, but MLP netlists should
 be downloaded separately.
 
-.. note:: The NoC MLP benchmarks are not included with the VTR release (due to their size). However they can be downloaded and extracted by running ``make get_noc_mlp_benchmarks`` from the root of the VTR tree.  They can also be `downloaded manually <https://www.eecg.utoronto.ca/~vaughn/titan/>`_.
+.. note:: The NoC MLP benchmarks are not included with the VTR release (due to their size). However they can be downloaded and extracted by running ``make get_noc_mlp_benchmarks`` from the root of the VTR tree.  They can also be `downloaded manually <https://www.eecg.utoronto.ca/~vaughn/titan/>`_.

yosys/CMakeLists.txt

@@ -20,7 +20,7 @@ add_custom_command(OUTPUT yosys-bin
 #            -C ${CMAKE_CURRENT_BINARY_DIR}
 #            -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile #(out-of-tree) build directory
             PREFIX=${CMAKE_BINARY_DIR}
-            -j${CUSTOM_BUILD_PARALLEL_LEVEL}
+#            -j${CUSTOM_BUILD_PARALLEL_LEVEL}
             > /dev/null
 
         COMMAND ${MAKE_PROGRAM} install ENABLE_ABC=0
@@ -43,4 +43,4 @@ add_custom_target(yosys ALL DEPENDS yosys-bin)
 #        INTERFACE_INCLUDE_DIRECTORIES ${YOSYS_INCLUDE_DIRS})
 
 
-#install(FILES ${BINARY_LIB_FILE1} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#install(FILES ${BINARY_LIB_FILE1} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})