Merge branch 'master' of https://github.com/verilog-to-routing/vtr-verilog-to-routing into CI_SV_FAILURE

Author: sdamghan

.gitignore

@@ -106,6 +106,11 @@ ODIN_II/usefull_tools/**/track_completed
 #
 Yosys
 
+#
+#ArchFPGA exec dir
+#
+ArchFPGA
+
 #
 #Python
 #

ODIN_II/SRC/adders.cpp

@@ -1064,7 +1064,7 @@ void remove_list_node(t_linked_vptr* pre, t_linked_vptr* next) {
         pre->next = next->next;
     else
         pre->next = NULL;
-    vtr::free(next);
+    delete next;
 }
 
 /*---------------------------------------------------------------------------
@@ -1434,4 +1434,4 @@ nnode_t* check_missing_ports(nnode_t* node, uintptr_t traverse_mark_number, netl
     }
 
     return new_node;
-}
+}

doc/src/yosys+odin/dev_guide/contributing.rst

@@ -156,6 +156,10 @@ If no architecture is passed in, Odin-II will create the soft logic and use LUTs
 However, if an architecture is passed, Odin-II will map accordingly to the available hard blocks and LUTs.
 It uses a combination of soft logic and hard logic.
 
+.. note::
+
+	Please visit the Yosys's `Developers Guide <https://docs.verilogtorouting.org/en/latest/yosys/dev_guide/#working-with-complex-blocks-and-how-to-instantiate-them?>`_ for more information about how Yosys deals with the complex blocks defined in the VTR architecture file.
+
 With the integration of Yosys+Odin-II, the Odin-II partial mapping features such as hard/soft logic trade-offs become available for a Yosys elaborated circuit.
 For instance, using optimization command arguments, a user can force the partial mapper to infer at least a user-defined percentage of multipliers in soft logic.
 

doc/src/yosys/dev_guide.rst

@@ -28,8 +28,8 @@ Changes applied to the VTB files are outlined as follows:
 	The LUT size is considered the one defined in the architecture file as the same as the regular VTR flow
 
 
-How to add new changes?
------------------------
+Working with Complex Blocks and How to Instantiate them?
+-------------------------------------------------------
 
 The Yosys synthesis commands, including the generic synthesis and additional VTR specific configurations, are provided
 in `synthesis.tcl <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/synthesis.tcl>`_. To make changes in the overall Yosys synthesis flow, the `synthesis.tcl <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/synthesis.tcl>`_
@@ -42,10 +42,31 @@ the `yosys_models.v <https://github.com/verilog-to-routing/vtr-verilog-to-routin
 
 Except for `single_port_ram.v <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/single_port_ram.v>`_ and `dual_port_ram.v <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/dual_port_ram.v>`_ Verilog files that perform the depth splitting
 process, the other files are defined as black-box, i.e., their declarations are required while no definition is needed. To add new black-box
-components, developers should first provide the corresponding Verilog files similar to the `adder.v <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/adder.v>`_. Then, a new  `read_verilog -lib TTT/NEW_BB.v`
+components manually, developers should first provide the corresponding Verilog files similar to the `adder.v <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/adder.v>`_. Then, a new  `read_verilog -lib TTT/NEW_BB.v`
 command should be added to the Yosys synthesis script. If there is an implicit inference of the new black-box component, the `yosys_models.v <https://github.com/verilog-to-routing/vtr-verilog-to-routing/blob/master/vtr_flow/misc/yosyslib/yosys_models.v>`_
 Verilog file must also be modified, as mentioned earlier.
 
+It is worth noting that the VTR flow scripts for running Yosys standalone as the VTR frontend are designed to automatically provide the black box declaration of complex blocks defined in the architecture XML file for Yosys.
+Technically, by running the ``run_vtr_flow.py`` script with the Yosys frontend, the ``write_arch_bb`` routine, defined in the ``libarchfpga``, is executed initially to extract the information of complex blocks defined in the architecture file.
+Then, the routine generates a file, including the black box declaration of the complex blocks in the Verilog format.
+The output file is named ``arch_dsps.v`` by default, found in the project destination directory.
+
+Instantiation of complex blocks is similar to the explicit instantiation of VTR primitives in HDL format.
+The ``write_arch_bb`` generates a Verilog module with the same name as the complex block model.
+Module ports are also defined according to the port declaration provided in the architecture file.
+For instance, the HDL instantiation of the ``multiply_fp_clk`` complex block defined in the ``COFFE_22nm/k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml`` architecture file is as follows:
+
+.. code-block:: verilog
+	...
+	multiply_fp_clk instance_name(
+		.b(i_b),		// input	[31:0]	b
+		.a(i_a), 		// input	[31:0]	a
+		.clk(i_clk), 	// input	[0:0]	clk
+		.out(i_out)		// output	[31:0]	out
+	);
+	...
+
+**Algorithm 1** - Custom Complex Blocks HDL Instantiation
 
 Yosys Synthesis Script File
 ---------------------------
@@ -135,4 +156,4 @@ Yosys Synthesis Script File
 	# ZZZ will be replaced by run_vtr_flow.pl
 	write_blif -true + vcc -false + gnd -undef + unconn -blackbox ZZZ
 
-**Algorithm 1** - The Yosys Tcl Script File
+**Algorithm 2** - The Yosys Tcl Script File

libs/EXTERNAL/libyosys/CMakeLists.txt

@@ -36,7 +36,10 @@ add_custom_target(yosys ALL DEPENDS ${LIB_FILE} ${BINARY_LIB_FILE})
 
 # create an library target out of the library compilation result
 add_library(libyosys SHARED IMPORTED GLOBAL)
-add_dependencies(libyosys yosys)
+
+# adding dependency to libarchfpga, as it is required
+# by VTR scripts for Yosys standalone frontend
+add_dependencies(libyosys yosys libarchfpga)
 
 # specify where the library is and where to find the headers
 set_target_properties(libyosys

libs/libarchfpga/CMakeLists.txt

@@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.9)
 
 project("libarchfpga")
 
-file(GLOB_RECURSE EXEC_SOURCES src/main.cpp)
+file(GLOB_RECURSE READ_ARCH_EXEC_SRC src/main.cpp)
+file(GLOB_RECURSE WRITE_ARCH_BB_EXEC_SRC src/write_arch_bb.cpp)
 file(GLOB_RECURSE LIB_SOURCES src/*.cpp)
 file(GLOB_RECURSE LIB_HEADERS src/*.h)
 files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
 
 #Remove test executable from library
-list(REMOVE_ITEM LIB_SOURCES ${EXEC_SOURCES})
+list(REMOVE_ITEM LIB_SOURCES ${READ_ARCH_EXEC_SRC} ${WRITE_ARCH_BB_EXEC_SRC})
 
 #Create the library
 add_library(libarchfpga STATIC
@@ -31,16 +32,40 @@ target_link_libraries(libarchfpga
 target_compile_definitions(libarchfpga PUBLIC ${INTERCHANGE_SCHEMA_HEADERS})
 
 #Create the test executable
-add_executable(read_arch ${EXEC_SOURCES})
+add_executable(read_arch ${READ_ARCH_EXEC_SRC})
+add_executable(write_arch_bb ${WRITE_ARCH_BB_EXEC_SRC})
 target_link_libraries(read_arch libarchfpga)
+target_link_libraries(write_arch_bb libarchfpga)
 
 #Supress IPO link warnings if IPO is enabled
 get_target_property(READ_ARCH_USES_IPO read_arch INTERPROCEDURAL_OPTIMIZATION)
+get_target_property(WRITE_ARCH_BB_USES_IPO write_arch_bb INTERPROCEDURAL_OPTIMIZATION)
 if (READ_ARCH_USES_IPO)
     set_property(TARGET read_arch APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
 endif()
+if (WRITE_ARCH_BB_USES_IPO)
+    set_property(TARGET write_arch_bb APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
+endif()
+
+install(TARGETS libarchfpga read_arch write_arch_bb DESTINATION bin)
 
-install(TARGETS libarchfpga read_arch DESTINATION bin)
+#
+# install executables in the VTR source root directory
+# to utilize them for scripts running VTR flow
+#
+set(ARCHFPGA_DIR ${VTR_SOURCE_DIR}/ArchFPGA)
+# making a new custom target out of libarchfpga to automatically perform
+# the house keeping for end users by deleting the ArchFPGA dir in the
+# VTR root dir if it exists and holds expired execs
+add_custom_target(archfpga-execs ALL 
+                    DEPENDS read_arch write_arch_bb
+                    COMMAND ${CMAKE_COMMAND} -E 
+                                            remove_directory ${ARCHFPGA_DIR}                     
+                    COMMAND ${CMAKE_COMMAND} -E 
+                                            make_directory ${ARCHFPGA_DIR}
+                    COMMAND ${CMAKE_COMMAND} -E 
+                                            copy_directory ${CMAKE_CURRENT_BINARY_DIR} ${ARCHFPGA_DIR}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 # 
 # Unit Tests

vpr/src/base/device_grid.cpp libs/libarchfpga/src/device_grid.cppvpr/src/base/device_grid.cpp renamed to libs/libarchfpga/src/device_grid.cpp

@@ -1,5 +1,4 @@
 #include "device_grid.h"
-#include "vpr_utils.h"
 
 DeviceGrid::DeviceGrid(std::string grid_name, vtr::Matrix<t_grid_tile> grid)
     : name_(grid_name)