[Yosys+Odin-II]: replace Yosys RTLIL subcircuit names with their output pin name,

		 (should be unique for each subcircuit) to enhance the readability
		 and ease of CP tracking in VTR final timing analysis

Signed-off-by: Seyed Alireza Damghani <[email protected]>

Author: sdamghan

ODIN_II/SRC/BLIFReader.cpp

@@ -336,10 +336,7 @@ void BLIF::Reader::create_hard_block_nodes(hard_block_models* models) {
     t_model* hb_model = NULL;
     nnode_t* new_node = allocate_nnode(my_location);
 
-    // Name the node subcircuit_name~hard_block_number so that the name is unique.
     static long hard_block_number = 0;
-    odin_sprintf(buffer, "%s~%ld", subcircuit_name, hard_block_number++);
-    new_node->name = make_full_ref_name(buffer, NULL, NULL, NULL, -1);
 
     // init the edge sensitivity of hard block
     if (configuration.coarsen)
@@ -357,21 +354,15 @@ void BLIF::Reader::create_hard_block_nodes(hard_block_models* models) {
                 new_node->type = yosys_subckt_strmap[subcircuit_stripped_name];
 
             if (new_node->type == NO_OP) {
-                char new_name[READ_BLIF_BUFFER];
-                vtr::free(new_node->name);
                 /* in case of weird names, need to add memories manually */
                 int sc_spot = -1;
                 char* yosys_subckt_str = NULL;
                 if ((yosys_subckt_str = retrieve_node_type_from_subckt_name(subcircuit_stripped_name)) != NULL) {
                     /* specify node type */
                     new_node->type = yosys_subckt_strmap[yosys_subckt_str];
-                    /* specify node name */
-                    odin_sprintf(new_name, "\\%s~%ld", yosys_subckt_str, hard_block_number - 1);
                 } else if ((sc_spot = sc_lookup_string(hard_block_names, subcircuit_stripped_name)) != -1) {
                     /* specify node type */
                     new_node->type = HARD_IP;
-                    /* specify node name */
-                    odin_sprintf(new_name, "\\%s~%ld", subcircuit_stripped_name, hard_block_number - 1);
                     /* Detect used hard block for the blif generation */
                     hb_model = find_hard_block(subcircuit_stripped_name);
                     if (hb_model) {
@@ -381,7 +372,6 @@ void BLIF::Reader::create_hard_block_nodes(hard_block_models* models) {
                     error_message(PARSE_BLIF, unknown_location,
                                   "Unsupported subcircuit type (%s) in BLIF file.\n", subcircuit_name);
                 }
-                new_node->name = make_full_ref_name(new_name, NULL, NULL, NULL, -1);
 
                 // CLEAN UP
                 vtr::free(yosys_subckt_str);
@@ -493,6 +483,28 @@ void BLIF::Reader::create_hard_block_nodes(hard_block_models* models) {
             output_nets_hash->add(name, new_net);
         }
 
+        if (!configuration.coarsen || new_node->type == SPRAM || new_node->type == DPRAM) {
+            // Name the node subcircuit_name~hard_block_number so that the name is unique.
+            odin_sprintf(buffer, "%s~%ld", subcircuit_name, hard_block_number++);
+            new_node->name = make_full_ref_name(buffer, NULL, NULL, NULL, -1);
+        } else {
+            // Find the basename of the output pin and name the node
+            // with BASENAME^TYPE
+            char* splitter = strrchr(new_node->output_pins[0]->net->name, '.');
+            char* output_pin_fullname = new_node->output_pins[0]->net->name;
+
+            // there is only a top module, no instantiation of submodules
+            if (splitter == NULL)
+                splitter = strchr(output_pin_fullname, '^');
+
+            char basename[READ_BLIF_BUFFER];
+            size_t basename_len = splitter - output_pin_fullname;
+
+            strncpy(basename, output_pin_fullname, basename_len);
+            basename[basename_len] = '\0';
+            new_node->name = node_name(new_node, basename);
+        }
+
         // Create a fake ast node.
         if (!configuration.coarsen || new_node->type == HARD_IP) {
             new_node->related_ast_node = create_node_w_type(HARD_BLOCK, my_location);