Changeset 65 for sources/src/entity.cc

Timestamp:

Oct 23, 2019, 12:53:07 PM (5 years ago)

Author:

bouyer

Message:

Various performance improvements for the parallel systemcass: cache-aligned
data structures, write only when needed, disable some unneeded barriers.

Fix bug in the non-openmp case: a pointer was not initialized

various style updates

File:

• sources/src/entity.cc (modified) (1 diff)

sources/src/entity.cc

@@ -395 +395 @@
     equi_list_t::iterator i;
     int index = 0;
-    for (i = equi_list.begin(); i != equi_list.end(); ++i) {
-        sc_interface *out = get_out_port(*i);
-        if (out) {
-            bind_equi_to_table(*i, out->get_pointer());
-        }
-        else {
-            sc_interface * reg = get_signal(*i);
-            if (reg == NULL) {
-                reg = get_localvar(*i);
-            }
-            if (reg) {
-                bind_equi_to_table(*i, reg->get_pointer());
-            }
-            else {
-                bind_equi_to_table(*i, &(equi_table[index]));
-                index += (i->begin()->data_size_in_bytes() - 1) / sizeof(tab_t) + 1;
-            }
-        }
-#if 0
-        sc_interface *reg = get_signal (*i);
-        sc_interface *out = get_out_port (*i);
-        if (reg) {
-            std::cerr << "binding " << *i << " to reg "
-                << reg << std::endl;
-            bind_equi_to_table (*i, reg->get_pointer ());
-        } else if (out) {
-            std::cerr << "binding " << *i << " to out "
-                << out << std::endl;
-            bind_equi_to_table (*i, out->get_pointer ());
-        } else {
-            reg = get_localvar (*i);
-            if (reg) {
-                std::cerr << "binding " << *i << " to localvar "
-                    << reg << std::endl;
-                bind_equi_to_table (*i, reg->get_pointer ());
-            } else {
-                std::cerr << "binding " << *i << " to index "
-                    << index << std::endl;
-                bind_equi_to_table (*i, &(equi_table[index]));
-                index += (i->begin()->data_size_in_bytes() - 1) / sizeof(tab_t) + 1;
-            }
-        }
+    for (i = equi_list.begin (); i != equi_list.end (); ++i)            {
+#if 1
+                        sc_interface *out = get_out_port (*i);
+                        if (out) {
+                                bind_equi_to_table (*i, out->get_pointer ());
+                        } else {
+                                sc_interface *reg = get_signal (*i);
+                                if (reg == NULL)
+          reg = get_localvar (*i);
+                                if (reg) {
+          bind_equi_to_table (*i, reg->get_pointer ());
+                                } else {
+                bind_equi_to_table (*i, &(equi_table[index]));
+                                  index += (i->begin()->data_size_in_bytes() - 1) / sizeof(tab_t) + 1;
+                                }
+                        }
+#else
+                        sc_interface *reg = get_signal (*i);
+                        sc_interface *out = get_out_port (*i);
+                        if (reg) {
+                                std::cerr << "binding " << *i << " to reg "
+                                    << reg << std::endl;
+                                  bind_equi_to_table (*i, reg->get_pointer ());
+                        } else if (out) {
+                                std::cerr << "binding " << *i << " to out "
+                                    << out << std::endl;
+                                bind_equi_to_table (*i, out->get_pointer ());
+                        } else {
+                                reg = get_localvar (*i);
+                                if (reg) {
+                                        std::cerr << "binding " << *i << " to localvar "
+                                            << reg << std::endl;
+                                          bind_equi_to_table (*i, reg->get_pointer ());
+                                } else {
+                                        std::cerr << "binding " << *i << " to index "
+                                            << index << std::endl;
+                                        bind_equi_to_table (*i, &(equi_table[index]));
+                                        index += (i->begin()->data_size_in_bytes() - 1) / sizeof(tab_t) + 1;
+                                }
+                        }
 #endif
     }