Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src

Timestamp:

Jun 26, 2009, 10:43:23 AM (15 years ago)

Author:

rosiere

Message:

1) Correct bug in link two signal
2) Fix error detected with valgrind
3) modif distexe script

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src

Files:

• Core_deallocation.cpp (modified) (1 diff)
• Parameters.cpp (modified) (7 diffs)
• Parameters_msg_error.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core_deallocation.cpp

@@ -61 +61 @@
     delete _component;
 
-//     delete    _component_glue;
-//     delete    _component_dcache_access;
-//     delete    _component_icache_access;
-//     for (uint32_t i=0; i<_param->_nb_execute_loop; ++i)
-//     delete    _component_execute_loop [i];
-//     delete [] _component_execute_loop;
-//     for (uint32_t i=0; i<_param->_nb_ooo_engine; ++i)
-//     delete    _component_ooo_engine [i];
-//     delete [] _component_ooo_engine;
-//     for (uint32_t i=0; i<_param->_nb_front_end; ++i)
-//     delete    _component_front_end [i];
-//     delete [] _component_front_end;
+    delete    _component_glue;
+    delete    _component_dcache_access;
+    delete    _component_icache_access;
+    for (uint32_t i=0; i<_param->_nb_execute_loop; ++i)
+    delete    _component_execute_loop [i];
+    delete [] _component_execute_loop;
+    for (uint32_t i=0; i<_param->_nb_ooo_engine; ++i)
+    delete    _component_ooo_engine [i];
+    delete [] _component_ooo_engine;
+    for (uint32_t i=0; i<_param->_nb_front_end; ++i)
+    delete    _component_front_end [i];
+    delete [] _component_front_end;
 
     log_end(Core,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp

@@ -394 +394 @@
         _link_thread_with_context [x.first][x.second] = i;
       }
+
+//     log_printf(TRACE,Core,FUNCTION,_("  * _link_decod_unit_with_decod_bloc"));
     for (uint32_t i=0; i<_nb_decod_bloc; ++i)
       {
         pair_dual x = _link_decod_unit_with_decod_bloc[i];
         _link_decod_bloc_with_decod_unit [x.first][x.second] = i;
+//         log_printf(TRACE,Core,FUNCTION,_("    [%d][%d] -> %d"),x.first,x.second,i);
       }
+
     for (uint32_t i=0; i<_nb_rename_bloc; ++i)
       {
@@ -803 +807 @@
     ALLOC2(_front_end_context_select_load_balancing       ,Tload_balancing_t,_nb_front_end,_nb_decod_unit[it1]);
 
+    log_printf(TRACE,Core,FUNCTION,_("  * decod_unit"));
+
     for (uint32_t i=0; i<_nb_front_end; ++i)
       {
@@ -813 +819 @@
           {
             uint32_t num_decod_bloc=_link_decod_bloc_with_decod_unit[i][j];
-            
+           
+            log_printf(TRACE,Core,FUNCTION,_("  [%d][%d] -> %d"),i,j,num_decod_bloc);
+ 
             _front_end_size_decod_queue              [i][j] = _size_decod_queue              [num_decod_bloc];
             _front_end_decod_queue_scheme            [i][j] = _decod_queue_scheme            [num_decod_bloc];
@@ -1827 +1835 @@
           uint32_t num_load_store_unit = _list_load_store_unit_with_execute_unit [i][j];
           
-          uint32_t num_thread;
-          for (num_thread = 0; num_thread<_nb_thread; ++num_thread)
-            if (_link_load_store_unit_with_thread [num_thread] == num_load_store_unit)
-              break;
-          
+          {
+            uint32_t num_thread;
+            for (num_thread = 0; num_thread<_nb_thread; ++num_thread)
+              if (_link_load_store_unit_with_thread [num_thread] == num_load_store_unit)
+                break;
 #ifdef DEBUG_TEST
-          if (num_thread == _nb_thread)
-            throw ERRORMORPHEO(FUNCTION,toString(_("Load_store_unit [%d] is not link with a thread.\n"),num_load_store_unit));
+            if (num_thread == _nb_thread)
+              throw ERRORMORPHEO(FUNCTION,toString(_("Load_store_unit [%d] is not link with a thread.\n"),num_load_store_unit));
 #endif 
+          }
+
           // init with an invalid thread_id
           for (uint32_t k=0; k<_dcache_access_nb_context [i]; ++k)
@@ -1858 +1868 @@
                       uint32_t num_thread = _link_thread_with_context [num_front_end][num_context];
                       
-                      uint32_t index = ((num_ooo_engine<<(_size_context_id + _size_front_end_id )) |
-                                        (num_front_end <<(_size_context_id)) |
-                                        (num_context));
-                      
-                      _dcache_access_translate_load_store_unit_to_thread [i][j][index] = num_thread;
+                      if (_link_load_store_unit_with_thread [num_thread] == num_load_store_unit)
+                        {
+                          uint32_t index = ((num_ooo_engine<<(_size_context_id + _size_front_end_id )) |
+                                            (num_front_end <<(_size_context_id)) |
+                                            (num_context));
+                          
+                          _dcache_access_translate_load_store_unit_to_thread [i][j][index] = num_thread;
+                        }
                     }
                 }
@@ -1960 +1973 @@
         _nb_thread                                 ,
         _link_thread_with_context               [i]
-        );
+         );
 
     ALLOC1(_nb_inst_issue_queue,uint32_t,_nb_ooo_engine);
@@ -2181 +2194 @@
     log_begin(Core,FUNCTION);
 
-//     for (uint32_t i=0; i<_nb_front_end; ++i)
-//     delete    _param_front_end [i];
-//     delete [] _param_front_end;
-//     for (uint32_t i=0; i<_nb_ooo_engine; ++i)
-//     delete    _param_ooo_engine [i];
-//     delete [] _param_ooo_engine;
-//     for (uint32_t i=0; i<_nb_execute_loop; ++i)
-//     delete    _param_execute_loop [i];
-//     delete [] _param_execute_loop;
-//     delete    _param_icache_access;
-//     delete    _param_dcache_access;
-//     delete    _param_glue;
-
+    for (uint32_t i=0; i<_nb_front_end; ++i)
+    delete    _param_front_end [i];
+    delete [] _param_front_end;
+    for (uint32_t i=0; i<_nb_ooo_engine; ++i)
+    delete    _param_ooo_engine [i];
+    delete [] _param_ooo_engine;
+    for (uint32_t i=0; i<_nb_execute_loop; ++i)
+    delete    _param_execute_loop [i];
+    delete [] _param_execute_loop;
+    delete    _param_icache_access;
+    delete    _param_dcache_access;
+    delete    _param_glue;
+
+    DELETE1(_nb_inst_issue_queue                                    ,_nb_ooo_engine);
+    DELETE1(_issue_queue_in_order                                   ,_nb_ooo_engine);
     DELETE3(_dcache_access_translate_load_store_unit_to_thread      ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],_dcache_access_nb_context[it1]);
     DELETE1(_dcache_access_nb_context                               ,_nb_execute_loop);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_msg_error.cpp

@@ -59 +59 @@
       // set link
       for (uint32_t i=0; i<_nb_decod_bloc; ++i)
-        nb_link_decod_unit[_link_decod_unit_with_decod_bloc[i].first][_link_decod_unit_with_decod_bloc[i].second] ++;
-
+        {
+          uint32_t num_front_end  = _link_decod_unit_with_decod_bloc[i].first;
+          uint32_t num_decod_unit = _link_decod_unit_with_decod_bloc[i].second;
+
+          bool error = false;
+
+          if (num_front_end >= _nb_front_end)
+            {
+              error = true;
+              test.error(toString(_("Decod_bloc [%d] is connected with an invalid front_end (%d).\n"),i,num_front_end));
+            }
+
+          if (num_decod_unit >= _nb_decod_unit[num_front_end])
+            {
+              error = true;
+              test.error(toString(_("Decod_bloc [%d] is connected with an invalid decod_unit (%d.%d).\n"),i,num_front_end,num_decod_unit));
+            }
+
+          if (not error)
+            nb_link_decod_unit[num_front_end][num_decod_unit] ++;
+        }
       // test
       for (uint32_t i=0; i<_nb_front_end; ++i)