Implemented InOuts

Author: djns1

ODIN_II/SRC/ast_elaborate.cpp

@@ -2656,11 +2656,11 @@ void create_param_table_for_scope(ast_node_t* module_items, sc_hierarchy* local_
                     /* symbols are already dealt with */
                     if (var_declare->types.variable.is_input
                         || var_declare->types.variable.is_output
+                        || var_declare->types.variable.is_inout
                         || var_declare->types.variable.is_reg
                         || var_declare->types.variable.is_genvar
                         || var_declare->types.variable.is_wire
                         || var_declare->types.variable.is_defparam)
-
                         continue;
 
                     oassert(module_items->children[i]->children[j]->type == VAR_DECLARE);

ODIN_II/SRC/netlist_create_from_ast.cpp

@@ -296,7 +296,8 @@ nnet_t* allocate_nnet() {
  *-------------------------------------------------------------------------------------------*/
 nnet_t* free_nnet(nnet_t* to_free) {
     if (to_free) {
-        to_free->fanout_pins = (npin_t**)vtr::free(to_free->fanout_pins);
+        if (to_free->num_fanout_pins)
+            to_free->fanout_pins = (npin_t**)vtr::free(to_free->fanout_pins);
 
         if (to_free->name)
             vtr::free(to_free->name);
@@ -417,13 +418,13 @@ void add_driver_pin_to_net(nnet_t* net, npin_t* pin) {
  * 	The lasting one is input, and output disappears
  *-------------------------------------------------------------------------------------------*/
 void combine_nets(nnet_t* output_net, nnet_t* input_net, netlist_t* netlist) {
+    /* in case there are any fanouts in output net (should only be zero and one nodes) */
+    join_nets(input_net, output_net);
     /* copy the driver over to the new_net */
     for (int i = 0; i < output_net->num_driver_pins; i++) {
         /* IF - there is a pin assigned to this net, then copy it */
         add_driver_pin_to_net(input_net, output_net->driver_pins[i]);
     }
-    /* in case there are any fanouts in output net (should only be zero and one nodes) */
-    join_nets(input_net, output_net);
     /* mark that this is combined */
     input_net->combined = true;
 
@@ -465,11 +466,25 @@ void join_nets(nnet_t* join_to_net, nnet_t* other_net) {
         }
 
         error_message(NETLIST, unknown_location, "%s", "Found a combinational loop");
-    } else if (other_net->num_driver_pins > 1) {
-        if (other_net->name && join_to_net->name)
-            error_message(NETLIST, unknown_location, "Tried to join net %s to %s but this would lose %d drivers for net %s", other_net->name, join_to_net->name, other_net->num_driver_pins - 1, other_net->name);
-        else
-            error_message(NETLIST, unknown_location, "Tried to join nets but this would lose %d drivers", other_net->num_driver_pins - 1);
+    } else if (other_net->num_driver_pins > 1 && join_to_net->num_driver_pins != 0) {
+        bool drivers_match = false;
+        if(other_net->num_driver_pins == join_to_net->num_driver_pins) {
+            for (int i = 0; !drivers_match && i < other_net->num_driver_pins; i++)
+            {
+                bool driver_match = false;
+                for (int j = 0; !driver_match && j < join_to_net->num_driver_pins; j++)
+                {
+                    driver_match = join_to_net->driver_pins[j] == other_net->driver_pins[i];
+                }
+                drivers_match |= driver_match;
+            }
+        }
+        if(!drivers_match) {
+            if (other_net->name && join_to_net->name)
+                error_message(NETLIST, unknown_location, "Tried to join net %s to %s but this would lose %d drivers for net %s", other_net->name, join_to_net->name, other_net->num_driver_pins - 1, other_net->name);
+            else
+                error_message(NETLIST, unknown_location, "Tried to join nets but this would lose %d drivers", other_net->num_driver_pins - 1);
+        }
     }
 
     /* copy the driver over to the new_net */

ODIN_II/SRC/netlist_utils.cpp

@@ -65,25 +65,24 @@ static bool warn_undriven(nnode_t* node, nnet_t* net) {
     return false;
 }
 
-// TODO Uncomment this for In Outs
-//static void merge_with_inputs(nnode_t* node, long pin_idx) {
-//    oassert(pin_idx < node->num_input_pins);
-//    nnet_t* net = node->input_pins[pin_idx]->net;
-//    warn_undriven(node, net);
-//    // Merge node with all inputs with fanout of 1
-//    if (net->num_fanout_pins <= 1) {
-//        for (int i = 0; i < net->num_driver_pins; i++) {
-//            npin_t* driver = net->driver_pins[i];
-//            if (driver->name != NULL && ((driver->node->type == MULTIPLY) || (driver->node->type == HARD_IP) || (driver->node->type == MEMORY) || (driver->node->type == ADD) || (driver->node->type == MINUS))) {
-//                vtr::free(driver->name);
-//                driver->name = vtr::strdup(node->name);
-//            } else {
-//                vtr::free(driver->node->name);
-//                driver->node->name = vtr::strdup(node->name);
-//            }
-//        }
-//    }
-//}
+static void merge_with_inputs(nnode_t* node, long pin_idx) {
+    oassert(pin_idx < node->num_input_pins);
+    nnet_t* net = node->input_pins[pin_idx]->net;
+    warn_undriven(node, net);
+    // Merge node with all inputs with fanout of 1
+    if (net->num_fanout_pins <= 1) {
+        for (int i = 0; i < net->num_driver_pins; i++) {
+            npin_t* driver = net->driver_pins[i];
+            if (driver->name != NULL && ((driver->node->type == MULTIPLY) || (driver->node->type == HARD_IP) || (driver->node->type == MEMORY) || (driver->node->type == ADD) || (driver->node->type == MINUS))) {
+                vtr::free(driver->name);
+                driver->name = vtr::strdup(node->name);
+            } else {
+                vtr::free(driver->node->name);
+                driver->node->name = vtr::strdup(node->name);
+            }
+        }
+    }
+}
 
 static void print_net_driver(FILE* out, nnode_t* node, nnet_t* net, long driver_idx) {
     oassert(driver_idx < net->num_driver_pins);
@@ -221,14 +220,13 @@ void output_blif(FILE* out, netlist_t* netlist) {
     fprintf(out, "\n.names gnd\n.names unconn\n.names vcc\n1\n");
     fprintf(out, "\n");
 
-    // TODO Uncomment this for In Outs
     // connect all the outputs up to the last gate
-    // for (long i = 0; i < netlist->num_top_output_nodes; i++) {
-    //     nnode_t* node = netlist->top_output_nodes[i];
-    //     for (int j = 0; j < node->num_input_pins; j++) {
-    //         merge_with_inputs(node, j);
-    //     }
-    // }
+    for (long i = 0; i < netlist->num_top_output_nodes; i++) {
+        nnode_t* node = netlist->top_output_nodes[i];
+        for (int j = 0; j < node->num_input_pins; j++) {
+            merge_with_inputs(node, j);
+        }
+    }
 
     /* traverse the internals of the flat net-list */
     if (strcmp(configuration.output_type.c_str(), "blif") == 0) {
@@ -241,8 +239,7 @@ void output_blif(FILE* out, netlist_t* netlist) {
     for (long i = 0; i < netlist->num_top_output_nodes; i++) {
         nnode_t* node = netlist->top_output_nodes[i];
 
-        // TODO Change this to > 1 for In Outs
-        if (node->input_pins[0]->net->num_fanout_pins > 0) {
+        if (node->input_pins[0]->net->num_fanout_pins > 1) {
             nnet_t* net = node->input_pins[0]->net;
             warn_undriven(node, net);
             for (int j = 0; j < net->num_driver_pins; j++) {