Fixed Odin Build Failures

Author: AlexandreSinger

odin_ii/src/core/adders.cpp

@@ -26,6 +26,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include "logic_types.h"
 #include "odin_types.h"
 #include "odin_util.h"
 #include "node_creation_library.h"
@@ -107,17 +108,18 @@ void report_add_distribution() {
  * (function: find_hard_adders)
  *-------------------------------------------------------------------------*/
 void find_hard_adders() {
-    hard_adders = Arch.models;
     //Disable the size in configuration file.(The threshold for the extra bits).
     //min_add = configuration.min_hard_adder;
     min_threshold_adder = configuration.min_threshold_adder;
 
-    while (hard_adders != NULL) {
+    hard_adders = NULL;
+    for (LogicalModelId model_id : Arch.models.user_models()) {
+        hard_adders = &Arch.models.get_model(model_id);
         if (strcmp(hard_adders->name, "adder") == 0) {
             init_add_distribution();
             return;
         } else {
-            hard_adders = hard_adders->next;
+            hard_adders = NULL;
         }
     }
 

odin_ii/src/core/hard_blocks.cpp

@@ -26,6 +26,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include "logic_types.h"
 #include "odin_types.h"
 #include "odin_util.h"
 #include "odin_globals.h"
@@ -55,14 +56,11 @@ t_model_ports* get_model_port(t_model_ports* ports, const char* name) {
 }
 
 void cache_hard_block_names() {
-    t_model* hard_blocks = NULL;
-
-    hard_blocks = Arch.models;
     hard_block_names = sc_new_string_cache();
-    while (hard_blocks) {
+    for (LogicalModelId model_id : Arch.models.user_models()) {
+        t_model* hard_blocks = &Arch.models.get_model(model_id);
         int sc_spot = sc_add_string(hard_block_names, hard_blocks->name);
         hard_block_names->data[sc_spot] = (void*)hard_blocks;
-        hard_blocks = hard_blocks->next;
     }
 }
 
@@ -112,14 +110,9 @@ void deregister_hard_blocks() {
 }
 
 t_model* find_hard_block(const char* name) {
-    t_model* hard_blocks;
-
-    hard_blocks = Arch.models;
-    while (hard_blocks)
-        if (!strcmp(hard_blocks->name, name))
-            return hard_blocks;
-        else
-            hard_blocks = hard_blocks->next;
+    LogicalModelId hard_block_model_id = Arch.models.get_model_by_name(name);
+    if (hard_block_model_id.is_valid())
+        return &Arch.models.get_model(hard_block_model_id);
 
     return NULL;
 }
@@ -208,19 +201,17 @@ void define_hard_block(nnode_t* node, FILE* out) {
 
 void output_hard_blocks(FILE* out) {
     t_model_ports* hb_ports;
-    t_model* hard_blocks;
     char buffer[MAX_BUF];
     int count;
     int i;
 
     oassert(out != NULL);
-    hard_blocks = Arch.models;
-    while (hard_blocks != NULL) {
+    for (LogicalModelId model_id : Arch.models.user_models()) {
+        t_model* hard_blocks = &Arch.models.get_model(model_id);
         if (hard_blocks->used == 1) /* Hard Block is utilized */
         {
             //IF the hard_blocks is an adder or a multiplier, we ignore it.(Already print out in add_the_blackbox_for_adds and add_the_blackbox_for_mults)
             if (strcmp(hard_blocks->name, "adder") == 0 || strcmp(hard_blocks->name, "multiply") == 0) {
-                hard_blocks = hard_blocks->next;
                 break;
             }
 
@@ -261,7 +252,6 @@ void output_hard_blocks(FILE* out) {
 
             fprintf(out, "\n.blackbox\n.end\n\n");
         }
-        hard_blocks = hard_blocks->next;
     }
 
     return;

odin_ii/src/core/multipliers.cpp

@@ -29,6 +29,7 @@
 #include <cmath>
 #include <string>
 
+#include "logic_types.h"
 #include "odin_types.h"
 #include "odin_util.h"
 #include "node_creation_library.h"
@@ -297,14 +298,15 @@ void report_mult_distribution() {
  * (function: find_hard_multipliers)
  *-------------------------------------------------------------------------*/
 void find_hard_multipliers() {
-    hard_multipliers = Arch.models;
+    hard_multipliers = NULL;
     min_mult = configuration.min_hard_multiplier;
-    while (hard_multipliers != NULL) {
+    for (LogicalModelId model_id : Arch.models.user_models()) {
+        hard_multipliers = &Arch.models.get_model(model_id);
         if (strcmp(hard_multipliers->name, "multiply") == 0) {
             init_mult_distribution();
             return;
         } else {
-            hard_multipliers = hard_multipliers->next;
+            hard_multipliers = NULL;
         }
     }
 

odin_ii/src/verilog/verilog_writer.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream> //std::stringstream
 
+#include "logic_types.h"
 #include "verilog.h"
 #include "odin_globals.h"
 #include "hard_blocks.h"
@@ -59,15 +60,12 @@ void verilog::writer::_write(const netlist_t* netlist) {
     }
 
     // print out the rest od models, including DSPs in the target architecture
-    t_model* model = Arch.models;
-
-    while (model) {
+    for (LogicalModelId model_id : Arch.models.user_models()) {
         int sc_spot;
-        if ((sc_spot = sc_lookup_string(this->models_declaration, model->name)) != -1) {
+        if ((sc_spot = sc_lookup_string(this->models_declaration, Arch.models.model_name(model_id).c_str())) != -1) {
             fprintf(this->output_file, "%s", (char*)this->models_declaration->data[sc_spot]);
             fflush(this->output_file);
         }
-        model = model->next;
     }
 }
 

parmys/parmys-plugin/core/adder.cc

@@ -101,6 +101,7 @@ void find_hard_adders()
     // min_add = configuration.min_hard_adder;
     min_threshold_adder = configuration.min_threshold_adder;
 
+    hard_adders = NULL;
     for (LogicalModelId model_id : Arch.models.user_models()) {
         hard_adders = &Arch.models.get_model(model_id);
         if (strcmp(hard_adders->name, "adder") == 0) {