Merge branch 'master' into adding_fix_clusters_option

Author: sfkhalid

.gitignore

@@ -66,6 +66,12 @@ vgcore*
 *.place
 *.route
 *.out
+*.bin
+
+#
+# FASM result files
+#
+*.fasm
 
 #
 #Odin test outputs

.readthedocs.yaml

@@ -7,14 +7,14 @@ version: 2
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-  builder: htmldir
+  builder: dirhtml
   configuration: doc/src/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 2
+  version: 3.7
   install:
     - requirements: doc/requirements.txt

BUILDING.md

@@ -94,6 +94,24 @@ apt-get install \
 	ctags
 ```
 
+#### Using Nix ####
+
+Although the recommended platform is Debian or Ubuntu, Nix can be used to build VTR on other platforms, such as MacOS.
+
+If you don't have [Nix](https://nixos.org/nix/), you can [get it](https://nixos.org/nix/download.html) with:
+
+```shell
+$ curl -L https://nixos.org/nix/install | sh
+```
+
+These commands will set up dependencies for Linux and MacOS and build VTR:
+
+```shell
+#In the VTR root
+$ nix-shell dev/nix/shell.nix
+$ make
+```
+
 ### Building using the Makefile wrapper ###
 Run `make` from the root of the VTR source tree
 

ODIN_II/CMakeLists.txt

@@ -64,7 +64,9 @@ if(ODIN_COVERAGE)
     )
 
     set(ODIN_EXTRA_LINK_FLAGS
-        "-lgcov --coverage"
+        "-lgcov"
+        "--coverage"
+        ${ODIN_EXTRA_LINK_FLAGS}
     )
 
 endif()
@@ -74,13 +76,23 @@ if(ODIN_SANITIZE)
     message("*** Compiling with Odin Coverage flags")
 
     set(ODIN_EXTRA_FLAGS
-        "-g"
+        "-O1"
+        "-fno-omit-frame-pointer"
         "-fsanitize=address"
+        "-fsanitize=leak"
+        "-fsanitize=undefined"
+        "-fuse-ld=gold"
         ${ODIN_EXTRA_FLAGS}
     )
 
     set(ODIN_EXTRA_LINK_FLAGS
+        "-O1"
+        "-fno-omit-frame-pointer"
         "-fsanitize=address"
+        "-fsanitize=leak"
+        "-fsanitize=undefined"        
+        "-fuse-ld=gold"
+        ${ODIN_EXTRA_LINK_FLAGS}
     )
 
 endif()
@@ -169,10 +181,10 @@ foreach(ODIN_FLAG ${ODIN_EXTRA_FLAGS})
 endforeach()
 
 #add extra link flags for odin
-if(ODIN_EXTRA_LINK_FLAGS)
-    set_target_properties(libodin_ii PROPERTIES LINK_FLAGS ${ODIN_EXTRA_LINK_FLAGS})
-    set_target_properties(odin_II PROPERTIES LINK_FLAGS ${ODIN_EXTRA_LINK_FLAGS})
-endif()
+foreach(ODIN_LINK_FLAG ${ODIN_EXTRA_LINK_FLAGS})
+        target_link_libraries(libodin_ii ${ODIN_LINK_FLAG})
+        target_link_libraries(odin_II ${ODIN_LINK_FLAG})
+endforeach()
 
 #Supress IPO link warnings if IPO is enabled
 get_target_property(ODIN_USES_IPO odin_II INTERPROCEDURAL_OPTIMIZATION)

ODIN_II/README.md

@@ -0,0 +1,15 @@
+Odin_II
+=======
+
+Odin II is used for logic synthesis and elaboration, converting a subset of the Verilog Hardware Description Language (HDL) into a BLIF netlist.
+
+-----------------
+
+* **[Quick Start](../doc/src/odin/quickstart.md)**
+* **[User Guide](../doc/src/odin/user_guide.md)**
+* **[Verilog Support](../doc/src/odin/verilog_support.md)**
+* **Developper guide**
+  * [Contributing](../doc/src/odin/dev_guide/contributing)
+  * [Regression Tests](../doc/src/odin/dev_guide/regression_test)
+  * [Regression Tool](../doc/src/odin/dev_guide/verify_script)
+  * [Validating Tests](../doc/src/odin/dev_guide/testing)

ODIN_II/README.rst

@@ -146,7 +146,7 @@ void declare_hard_adder(nnode_t* node) {
 
     /* See if this size instance of adder exists? */
     if (hard_adders == NULL)
-        warning_message(NETLIST, node->related_ast_node->line_number, node->related_ast_node->file_number, "%s\n", "Instantiating adder where adders do not exist");
+        warning_message(NETLIST, node->loc, "%s\n", "Instantiating adder where adders do not exist");
 
     tmp = (t_adder*)hard_adders->instances;
     width_a = node->input_port_sizes[0];
@@ -629,7 +629,7 @@ void split_adder(nnode_t* nodeo, int a, int b, int sizea, int sizeb, int cin, in
     node = (nnode_t**)vtr::malloc(sizeof(nnode_t*) * (count));
 
     for (i = 0; i < count; i++) {
-        node[i] = allocate_nnode();
+        node[i] = allocate_nnode(nodeo->loc);
         node[i]->name = (char*)vtr::malloc(strlen(nodeo->name) + 20);
         odin_sprintf(node[i]->name, "%s-%d", nodeo->name, i);
         if (i == count - 1) {
@@ -675,7 +675,7 @@ void split_adder(nnode_t* nodeo, int a, int b, int sizea, int sizeb, int cin, in
     // don't add a dummy adder in the beginning of the chain if the first cin will be connected to a global gnd
     if ((flag == 0 || count > 1) && !configuration.adder_cin_global) {
         //connect the a[0] and b[0] of first adder node to ground
-        connect_nodes(netlist->gnd_node, 0, node[0], 0);
+        connect_nodes(netlist->vcc_node, 0, node[0], 0);
         connect_nodes(netlist->gnd_node, 0, node[0], sizea);
         //hang the first sumout
         node[0]->output_pins[1] = allocate_npin();