Changeset 62 for sources/src/schedulers.cc

Timestamp:

Feb 16, 2017, 3:46:11 PM (8 years ago)

Author:

meunier

Message:

• Functional (or supposedly functional) OpenMP support configure must be run with --enable-use-omp and the topcell must define the USE_OPENMP flag before including the .h files of systemcass (if openmp enabled).

File:

• sources/src/schedulers.cc (modified) (5 diffs)

sources/src/schedulers.cc

@@ -64 +64 @@
 method_process_list_t * transition_func_list;
 method_process_list_t * moore_func_list;
+#ifdef USE_OPENMP
 #pragma omp threadprivate(transition_func_list, moore_func_list)
+#endif
 method_process_list_t combinational_func_list;
 /* ***************************** */
@@ -120 +122 @@
 void sort_functions() {
     method_process_list_t::const_iterator m;
+#ifdef USE_OPENMP
 #pragma omp parallel
 #pragma omp critical
+#endif
     {
         transition_func_list = new method_process_list_t;
         moore_func_list = new method_process_list_t;
         for (m = method_process_list.begin(); m != method_process_list.end(); ++m) {
-#ifdef _OPENMP
+#ifdef USE_OPENMP
             if ((*m)->omp_threadnum == omp_get_thread_num())
 #endif
@@ -189 +193 @@
         exit (24092004);
     }
+    delete s;
     return sig_graph;
 }
@@ -229 +234 @@
 
     sort_functions();
+#ifdef USE_OPENMP
 #pragma omp parallel
 #pragma omp critical
+#endif
     {
         if (dump_funclist_info) {
-#ifdef _OPENMP
+#ifdef USE_OPENMP
             cerr << "Thread " << omp_get_thread_num() << "\n";
 #endif
             cerr << "  Transition functions : " << *transition_func_list << "\n";
             cerr << "  Moore generation functions : " << *moore_func_list << "\n";
+#ifdef USE_OPENMP
 #pragma omp master
+#endif
             {
                 if (!combinational_func_list.empty()) {
@@ -247 +256 @@
 
     /* Schedule */
-    switch (scheduling_method) {
-        case BUCHMANN_SCHEDULING :
-        {
-            // Generate the scheduled code, compile and link.
-            // Buchmann's thesis explains this scheduling method.
-            // Uses port dependancies like Dr. Mouchard.
-            ProcessDependencyList * process_list = BuchmannScheduling();
-            if (dynamic_link_of_scheduling_code) {
-                base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
-            }
-            else {
-                gen_scheduling_code_for_static_func(*transition_func_list, *moore_func_list, *process_list);
-            }
-            break;
+        switch (scheduling_method) {
+            case BUCHMANN_SCHEDULING :
+            {
+                // Generate the scheduled code, compile and link.
+                // Buchmann's thesis explains this scheduling method.
+                // Uses port dependancies like Dr. Mouchard.
+                ProcessDependencyList * process_list = BuchmannScheduling();
+                if (dynamic_link_of_scheduling_code) {
+                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
+                }
+                else {
+                    gen_scheduling_code_for_static_func(*transition_func_list, *moore_func_list, *process_list);
+                }
+                break;
+            }
+
+            case MOUCHARD_SCHEDULING :
+            {
+                // Generate the scheduled code, compile and link.
+                // Mouchard's thesis explains this scheduling method.
+                // Uses port dependancies like Dr. Mouchard.
+                // CAUTION : unlike FastSysC, this scheduling is totally static 
+                // and does not use an event-driven scheduler.
+                ProcessDependencyList * process_list = MouchardScheduling();
+                if (dynamic_link_of_scheduling_code) {
+                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
+                }
+                else {
+                    gen_scheduling_code_for_static_func (*transition_func_list, *moore_func_list, *process_list);
+                }
+                break;
+            }
+
+            case CASS_SCHEDULING :
+            {
+                // Generate the scheduled code, compile and link
+                // Hommais's thesis explains this scheduling method (like CASS strategy)
+                // Doesn't use port dependancies
+                strong_component_list_t * strong_list = NULL;
+#ifdef USE_OPENMP
+#pragma omp master
+#endif
+                {
+                    Graph * g = makegraph (&combinational_func_list);
+                    if (dump_all_graph && g) {
+                        graph2dot("module_graph", *g);
+                    }
+                    strong_list = strong_component(g);
+                }
+                if (dynamic_link_of_scheduling_code) {
+                    base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, strong_list);
+                }
+                else {
+                    gen_scheduling_code_for_quasistatic_func (*transition_func_list, *moore_func_list, strong_list);
+                }
+                // free the void_lists in strong_list
+                //for ( strong_component_list_t::iterator i = strong_list->begin(); i < strong_list->end(); i++) {
+                //    delete *i;
+                //}
+#ifdef USE_OPENMP
+#pragma omp master
+#endif
+                {
+                    delete strong_list;
+                }
+                break;
+            }
+            default :
+                cerr << "Error : Unable to schedule SystemC process."
+                    "Please select a scheduling method.\n";
+                exit (35);
         }
-
-        case MOUCHARD_SCHEDULING :
-        {
-            // Generate the scheduled code, compile and link.
-            // Mouchard's thesis explains this scheduling method.
-            // Uses port dependancies like Dr. Mouchard.
-            // CAUTION : unlike FastSysC, this scheduling is totally static 
-            // and does not use an event-driven scheduler.
-            ProcessDependencyList * process_list = MouchardScheduling();
-            if (dynamic_link_of_scheduling_code) {
-                base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, *process_list);
-            }
-            else {
-                gen_scheduling_code_for_static_func (*transition_func_list, *moore_func_list, *process_list);
-            }
-            break;
-        }
-
-        case CASS_SCHEDULING :
-        {
-            // Generate the scheduled code, compile and link
-            // Hommais's thesis explains this scheduling method (like CASS strategy)
-            // Doesn't use port dependancies
-            strong_component_list_t * strong_list = NULL;
-#pragma omp master
-            {
-                Graph * g = makegraph (&combinational_func_list);
-                if (dump_all_graph && g) {
-                    graph2dot("module_graph", *g);
-                }
-                strong_list = strong_component(g);
-            }
-            if (dynamic_link_of_scheduling_code) {
-                base_name = gen_scheduling_code_for_dynamic_link(*transition_func_list, *moore_func_list, strong_list);
-            }
-            else {
-                gen_scheduling_code_for_quasistatic_func (*transition_func_list, *moore_func_list, strong_list);
-            }
-            break;
-        }
-        default :
-            cerr << "Error : Unable to schedule SystemC process."
-                    "Please select a scheduling method.\n";
-            exit (35);
-    }
     }
     return base_name;