Reversed the order of models in parmys to fix slightly different results

Author: AlexandreSinger

parmys/parmys-plugin/core/hard_block.cc

@@ -15,6 +15,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <algorithm>
 #include <stdlib.h>
 
 #include "hard_block.h"
@@ -55,7 +56,13 @@ t_model_ports *get_model_port(t_model_ports *ports, const char *name)
 void cache_hard_block_names()
 {
     hard_block_names = sc_new_string_cache();
-    for (LogicalModelId model_id : Arch.models.user_models()) {
+    // After a change to the construction of the user models, the order was
+    // reversed, which slightly changed the results. Reversing them back to
+    // attain the same results.
+    // TODO: Regenerate the golden solutions to use the new model order.
+    std::vector<LogicalModelId> user_models(Arch.models.user_models().begin(), Arch.models.user_models().end());
+    std::reverse(user_models.begin(), user_models.end());
+    for (LogicalModelId model_id : 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;
@@ -195,7 +202,13 @@ void output_hard_blocks_yosys(Yosys::Design *design)
 {
     t_model_ports *hb_ports;
 
-    for (LogicalModelId model_id : Arch.models.user_models()) {
+    // After a change to the construction of the user models, the order was
+    // reversed, which slightly changed the results. Reversing them back to
+    // attain the same results.
+    // TODO: Regenerate the golden solutions to use the new model order.
+    std::vector<LogicalModelId> user_models(Arch.models.user_models().begin(), Arch.models.user_models().end());
+    std::reverse(user_models.begin(), user_models.end());
+    for (LogicalModelId model_id : user_models) {
         t_model* hard_blocks = &Arch.models.get_model(model_id);
         if (hard_blocks->used == 1) /* Hard Block is utilized */
         {

parmys/parmys-plugin/parmys_arch.cc

@@ -120,7 +120,13 @@ struct ParmysArchPass : public Pass {
             const char *arch_info_file = "arch.info";
             EchoArch(arch_info_file, physical_tile_types, logical_block_types, &arch);
 
-            for (LogicalModelId model_id : arch.models.user_models()) {
+            // After a change to the construction of the user models, the order was
+            // reversed, which slightly changed the results. Reversing them back to
+            // attain the same results.
+            // TODO: Regenerate the golden solutions to use the new model order.
+            std::vector<LogicalModelId> user_models(arch.models.user_models().begin(), arch.models.user_models().end());
+            std::reverse(user_models.begin(), user_models.end());
+            for (LogicalModelId model_id : user_models) {
                 t_model* hb = &arch.models.get_model(model_id);
                 if (strcmp(hb->name, SINGLE_PORT_RAM_string) && strcmp(hb->name, DUAL_PORT_RAM_string) && strcmp(hb->name, "multiply") &&
                     strcmp(hb->name, "adder")) {