- Timestamp:
- May 26, 2009, 9:01:47 PM (15 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop
- Files:
-
- 7 edited
-
Network/Execution_unit_to_Write_unit/include/Parameters.h (modified) (2 diffs)
-
Network/Execution_unit_to_Write_unit/src/Parameters.cpp (modified) (2 diffs)
-
Network/Read_unit_to_Execution_unit/include/Parameters.h (modified) (2 diffs)
-
Network/Read_unit_to_Execution_unit/src/Parameters.cpp (modified) (2 diffs)
-
Network/Read_unit_to_Execution_unit/src/Parameters_msg_error.cpp (modified) (4 diffs)
-
include/Parameters.h (modified) (2 diffs)
-
src/Parameters.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit/include/Parameters.h
r88 r120 40 40 public : bool *** _table_routing ; //[nb_execute_unit][nb_execute_unit_port][nb_write_unit] 41 41 public : bool ** _table_thread ; //[nb_write_unit][nb_thread] 42 public : bool * _num_thread_valid ; //[nb_thread] 42 43 43 44 public : uint32_t _max_nb_execute_unit_port ; … … 71 72 bool *** table_routing , 72 73 bool ** table_thread , 74 bool * num_thread_valid , //[nb_thread] 73 75 bool is_toplevel=false 74 76 ); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Execution_unit_to_Write_unit/src/Parameters.cpp
r97 r120 33 33 bool *** table_routing ,//[nb_execute_unit][nb_execute_unit_port][nb_write_unit] 34 34 bool ** table_thread ,//[nb_write_unit][nb_thread] 35 bool * num_thread_valid ,//[nb_thread] 35 36 bool is_toplevel ) 36 37 { … … 49 50 _table_routing = table_routing ; 50 51 _table_thread = table_thread ; 52 _num_thread_valid = num_thread_valid ; 51 53 52 54 _max_nb_execute_unit_port= max<uint32_t>(_nb_execute_unit_port, _nb_execute_unit); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/include/Parameters.h
r88 r120 44 44 public : bool ** _table_execute_type ; //[nb_execute_unit][nb_type] 45 45 public : bool ** _table_execute_thread ; //[nb_execute_unit][nb_thread] 46 public : bool * _num_thread_valid ; //[nb_thread] 46 47 47 48 public : uint32_t _max_nb_read_unit_port ; … … 83 84 bool ** table_execute_type , 84 85 bool ** table_execute_thread , 86 bool * num_thread_valid , 85 87 bool is_toplevel=false ); 86 88 // public : Parameters (Parameters & param) ; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/src/Parameters.cpp
r109 r120 38 38 bool ** table_execute_type , 39 39 bool ** table_execute_thread , 40 bool * num_thread_valid , 40 41 bool is_toplevel ) 41 42 { … … 56 57 _table_execute_type = table_execute_type ; 57 58 _table_execute_thread = table_execute_thread; 59 _num_thread_valid = num_thread_valid ; 58 60 59 61 log_printf(TRACE,Read_unit_to_Execution_unit,FUNCTION," * table_routing [nb_read_unit][nb_execute_unit][nb_execute_unit_port]"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Network/Read_unit_to_Execution_unit/src/Parameters_msg_error.cpp
r109 r120 41 41 // TYPE_BRANCH | X | | | 42 42 // TYPE_MEMORY | | | X | 43 44 43 bool type_present [_nb_thread][_nb_type]; 45 44 for (uint32_t i=0; i<_nb_thread; i++) … … 49 48 for (uint32_t i=0; i<_nb_execute_unit; i++) 50 49 for (uint32_t j=0; j<_nb_thread; j++) 51 if (_table_execute_thread [i][j] == true) 50 if (_num_thread_valid [j] and 51 (_table_execute_thread [i][j] == true)) 52 52 // this execute_unit execute this thread ! 53 53 for (Ttype_t k=0; k<_nb_type; k++) … … 66 66 if (not is_type_valid(j)) 67 67 for (uint32_t i=0; i<_nb_thread; i++) 68 if (type_present [i][j]) 68 if (_num_thread_valid [j] and 69 (type_present [i][j])) 69 70 test.error(toString(_("The thread '%d' can execute the type's operation '%s' but this type is invalid.\n"),i,toString(j).c_str())); 70 71 … … 72 73 if (is_type_valid(j) and not is_type_optionnal(j)) 73 74 for (uint32_t i=0; i<_nb_thread; i++) 74 if (not type_present [i][j]) 75 if (_num_thread_valid [i] and 76 (not type_present [i][j])) 75 77 test.error(toString(_("The thread '%d' can't access at the execute_unit to execute the type's operation '%s' (and this type is not optional !).\n"),i,toString(j).c_str())); 76 78 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Parameters.h
r115 r120 103 103 public : uint32_t * _translate_num_execute_unit ; //[nb_execute_unit] 104 104 105 public : bool * _num_thread_valid ; //[nb_thread] 106 105 107 public : uint32_t _nb_execute_unit ; 106 108 public : uint32_t * _nb_execute_unit_port ; … … 198 200 uint32_t * translate_num_execute_unit ,//[nb_execute_unit] 199 201 202 bool * num_thread_valid ,//[nb_thread] 203 200 204 bool is_toplevel=false 201 205 ); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp
r117 r120 73 73 bool * is_load_store_unit ,//[nb_execute_unit] 74 74 uint32_t * translate_num_execute_unit ,//[nb_execute_unit] 75 76 bool * num_thread_valid ,//[nb_thread] 75 77 76 78 bool is_toplevel … … 133 135 _translate_num_execute_unit = translate_num_execute_unit; 134 136 137 _num_thread_valid = num_thread_valid; 138 135 139 _nb_execute_unit = _nb_functionnal_unit + _nb_load_store_unit; 136 140 … … 481 485 _read_unit_to_execution_unit_table_routing , 482 486 _read_unit_to_execution_unit_table_execute_type, 483 _read_unit_to_execution_unit_table_thread ); 487 _read_unit_to_execution_unit_table_thread , 488 _num_thread_valid); 484 489 485 490 log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : execution_unit_to_write_unit"); … … 499 504 _execution_unit_to_write_unit_priority , 500 505 _execution_unit_to_write_unit_table_routing, 501 _execution_unit_to_write_unit_table_thread ); 506 _execution_unit_to_write_unit_table_thread , 507 _num_thread_valid); 502 508 503 509 log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : register_unit");
Note: See TracChangeset
for help on using the changeset viewer.
