Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop
- Timestamp:
- Jan 31, 2008, 6:46:41 PM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop
- Files:
-
- 31 deleted
- 56 edited
- 7 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/include/Functionnal_unit.h
r72 r75 55 55 56 56 #ifdef STATISTICS 57 p rivate: Stat * _stat;57 public : Stat * _stat; 58 58 59 59 private : counter_t * _stat_use_functionnal_unit; … … 162 162 #ifdef STATISTICS 163 163 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 164 public : std::string statistics_print (uint32_t depth);165 164 #endif 166 165 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_allocation.cpp
r73 r75 21 21 void Functionnal_unit::allocation (void) 22 22 { 23 string rename;24 25 23 log_printf(FUNC,Functionnal_unit,FUNCTION,"Begin"); 26 24 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_statistics_declaration.cpp
r72 r75 25 25 log_printf(FUNC,Functionnal_unit,FUNCTION,"Begin"); 26 26 27 _stat = new Stat (static_cast<st ring>(_name),27 _stat = new Stat (static_cast<std::string>(_name), 28 28 "Functionnal_unit", 29 29 param_statistics); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/include/Cache.h
r71 r75 27 27 private : const uint32_t _miss_rate; 28 28 private : const uint32_t _miss_penality; 29 private : list<cache_rsp_t> _list_respons;29 private : std::list<cache_rsp_t> _list_respons; 30 30 31 31 public : Cache_t (uint32_t miss_rate, uint32_t miss_penality): … … 59 59 60 60 // find good place 61 list<cache_rsp_t>::iterator i;61 std::list<cache_rsp_t>::iterator i; 62 62 for(i = _list_respons.begin(); (i != _list_respons.end()) and (i->_cycle<=cycle); i++); 63 63 … … 82 82 public : void end_cycle (void) 83 83 { 84 for( list<cache_rsp_t>::iterator i = _list_respons.begin(); i != _list_respons.end(); i++)84 for(std::list<cache_rsp_t>::iterator i = _list_respons.begin(); i != _list_respons.end(); i++) 85 85 { 86 86 i->_cycle --; … … 90 90 public : void print (void) 91 91 { 92 for( list<cache_rsp_t>::iterator i = _list_respons.begin(); i != _list_respons.end(); i++)92 for(std::list<cache_rsp_t>::iterator i = _list_respons.begin(); i != _list_respons.end(); i++) 93 93 { 94 94 std::cout << "{" << i->_cycle << "}\t" -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/include/Memory.h
r72 r75 53 53 } 54 54 55 cout << "=====[ Memory's information ]" <<endl56 << " * _nb_context : " << _nb_context <<endl57 << " * _nb_word : " << _nb_word <<endl58 << " * _size_word : " << _size_word <<endl59 << " * _shift_addr : " << _shift_addr <<endl60 << " * _mask_addr : " << hex << _mask_addr << dec <<endl;55 std::cout << "=====[ Memory's information ]" << std::endl 56 << " * _nb_context : " << _nb_context << std::endl 57 << " * _nb_word : " << _nb_word << std::endl 58 << " * _size_word : " << _size_word << std::endl 59 << " * _shift_addr : " << _shift_addr << std::endl 60 << " * _mask_addr : " << std::hex << _mask_addr << std::dec << std::endl; 61 61 } 62 62 … … 71 71 morpheo::behavioural::Tdcache_data_t data) 72 72 { 73 cout << "<Memory::access>" <<endl74 << " * context : " << context <<endl75 << " * address : " << hex << address << dec <<endl76 << " * type : " << type <<endl77 << " * wdata : " << hex << data << dec <<endl;73 std::cout << "<Memory::access>" << std::endl 74 << " * context : " << context << std::endl 75 << " * address : " << std::hex << address << std::dec << std::endl 76 << " * type : " << type << std::endl 77 << " * wdata : " << std::hex << data << std::dec << std::endl; 78 78 79 79 morpheo::behavioural::Tdcache_data_t rdata; … … 90 90 rdata = other (context, address, type); 91 91 92 cout << " * rdata : " << hex << rdata << dec <<endl;92 std::cout << " * rdata : " << std::hex << rdata << std::dec << std::endl; 93 93 94 94 return rdata; … … 161 161 morpheo::behavioural::Tdcache_data_t data) 162 162 { 163 cout << " * write" <<endl;163 std::cout << " * write" << std::endl; 164 164 165 165 if (context>_nb_context) … … 172 172 morpheo::behavioural::Tdcache_address_t MSB = address >> _shift_addr; 173 173 174 cout <<hex175 << " * LSB : " << LSB << endl176 << " * MSB : " << MSB << endl177 << dec;174 std::cout << std::hex 175 << " * LSB : " << LSB << std::endl 176 << " * MSB : " << MSB << std::endl 177 << std::dec; 178 178 179 179 morpheo::behavioural::Tdcache_data_t data_old = _data [context][MSB]; … … 193 193 uint32_t index_max = index_min+memory_size; 194 194 195 cout << " * type : " << type <<endl196 << " * memory_size : " << memory_size << endl197 << " * index_min : " << index_min << endl198 << " * index_max : " << index_max << endl;195 std::cout << " * type : " << type << std::endl 196 << " * memory_size : " << memory_size << std::endl 197 << " * index_min : " << index_min << std::endl 198 << " * index_max : " << index_max << std::endl; 199 199 200 200 morpheo::behavioural::Tdcache_data_t data_insert = data<<index_min; // the data is aligned at LSB 201 201 202 // cout << "read :" <<endl203 // << " * context : " << context << endl204 // << hex205 // << " * address : " << address << endl206 // << " * LSB : " << LSB << endl207 // << " * MSB : " << MSB << endl208 // << dec209 // << " * index_min : " << index_min << endl210 // << " * index_max : " << index_max << endl211 // << " * type : " << type << endl;202 // std::cout << "read :" << std::endl 203 // << " * context : " << context << std::endl 204 // << std::hex 205 // << " * address : " << address << std::endl 206 // << " * LSB : " << LSB << std::endl 207 // << " * MSB : " << MSB << std::endl 208 // << std::dec 209 // << " * index_min : " << index_min << std::endl 210 // << " * index_max : " << index_max << std::endl 211 // << " * type : " << type << std::endl; 212 212 213 213 if (index_max > _size_word) … … 218 218 _data [context][MSB] = data_new; 219 219 220 cout <<hex221 << " * data_old : " << data_old <<endl222 << " * data_new : " << data_new <<endl223 <<dec;220 std::cout << std::hex 221 << " * data_old : " << data_old << std::endl 222 << " * data_new : " << data_new << std::endl 223 << std::dec; 224 224 225 225 … … 277 277 } 278 278 std::cout << " - " 279 << hex279 << std::hex 280 280 << i->_address << " : " 281 281 << i->_data_old << " -> " 282 282 << i->_data_new << std::endl 283 << hex;283 << std::hex; 284 284 } 285 285 } -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/include/MemoryRequest.h
r71 r75 126 126 { 127 127 return os << "<" << morpheo::toString(x._cycle) << "> : " 128 << "{" << morpheo::toString(static_cast<uint32_t>(x._packet_id)) << "}" << endl129 << "\t * context / front_end / ooo_engine : " << morpheo::toString(static_cast<uint32_t>(x._context_id )) << " - " << morpheo::toString(static_cast<uint32_t>(x._front_end_id )) << " - " << morpheo::toString(static_cast<uint32_t>(x._ooo_engine_id)) << endl130 << "\t * operation / type / write_spec_ko : " << morpheo::toString(static_cast<uint32_t>(x._operation)) << " " << morpheo::toString(static_cast<uint32_t>(x._type)) << " " << morpheo::toString(static_cast<uint32_t>(x._write_spec_ko)) << endl131 << "\t * ptr_write store/load : " << morpheo::toString(static_cast<uint32_t>(x._store_queue_ptr_write)) << " " << morpheo::toString(static_cast<uint32_t>(x._load_queue_ptr_write)) << endl132 << "\t * immediat / data_ra / data_rb : " << morpheo::toString(static_cast<uint32_t>(x._immediat)) << " - " << morpheo::toString(static_cast<uint32_t>(x._data_ra)) << " - " << morpheo::toString(static_cast<uint32_t>(x._data_rb)) << endl133 << "\t * write_rd / num_reg_rd : " << morpheo::toString(static_cast<uint32_t>(x._write_rd)) << " " << morpheo::toString(static_cast<uint32_t>(x._num_reg_rd)) << endl134 << "\t * data_wait : " << morpheo::toString(static_cast<uint32_t>(x._data_wait)) << endl;128 << "{" << morpheo::toString(static_cast<uint32_t>(x._packet_id)) << "}" << std::endl 129 << "\t * context / front_end / ooo_engine : " << morpheo::toString(static_cast<uint32_t>(x._context_id )) << " - " << morpheo::toString(static_cast<uint32_t>(x._front_end_id )) << " - " << morpheo::toString(static_cast<uint32_t>(x._ooo_engine_id)) << std::endl 130 << "\t * operation / type / write_spec_ko : " << morpheo::toString(static_cast<uint32_t>(x._operation)) << " " << morpheo::toString(static_cast<uint32_t>(x._type)) << " " << morpheo::toString(static_cast<uint32_t>(x._write_spec_ko)) << std::endl 131 << "\t * ptr_write store/load : " << morpheo::toString(static_cast<uint32_t>(x._store_queue_ptr_write)) << " " << morpheo::toString(static_cast<uint32_t>(x._load_queue_ptr_write)) << std::endl 132 << "\t * immediat / data_ra / data_rb : " << morpheo::toString(static_cast<uint32_t>(x._immediat)) << " - " << morpheo::toString(static_cast<uint32_t>(x._data_ra)) << " - " << morpheo::toString(static_cast<uint32_t>(x._data_rb)) << std::endl 133 << "\t * write_rd / num_reg_rd : " << morpheo::toString(static_cast<uint32_t>(x._write_rd)) << " " << morpheo::toString(static_cast<uint32_t>(x._num_reg_rd)) << std::endl 134 << "\t * data_wait : " << morpheo::toString(static_cast<uint32_t>(x._data_wait)) << std::endl; 135 135 } 136 136 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h
r71 r75 30 30 #include "Behavioural/include/Vhdl.h" 31 31 #endif 32 33 using namespace std;34 using namespace morpheo::behavioural::generic::queue_control;35 32 36 33 namespace morpheo { … … 51 48 // -----[ fields ]---------------------------------------------------- 52 49 // Parameters 53 protected : const st ring _name;50 protected : const std::string _name; 54 51 55 52 protected : const Parameters * _param; … … 194 191 sc_module_name name, 195 192 #else 196 st ringname,193 std::string name, 197 194 #endif 198 195 #ifdef STATISTICS … … 221 218 #ifdef STATISTICS 222 219 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 223 public : string statistics_print (uint32_t depth);224 220 #endif 225 221 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_allocation.cpp
r72 r75 24 24 void Load_store_unit::allocation (void) 25 25 { 26 string rename;27 28 26 log_printf(FUNC,Load_store_unit,FUNCTION,"Begin"); 29 27 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp
r72 r75 660 660 #if DEBUG>=DEBUG_TRACE 661 661 // ***** dump store queue 662 cout << "Dump STORE_QUEUE :" <<endl663 << "ptr_read : " << toString(static_cast<uint32_t>(reg_STORE_QUEUE_PTR_READ)) <<endl;662 std::cout << "Dump STORE_QUEUE :" << std::endl 663 << "ptr_read : " << toString(static_cast<uint32_t>(reg_STORE_QUEUE_PTR_READ)) << std::endl; 664 664 665 665 for (uint32_t i=0; i<_param->_size_store_queue; i++) 666 666 { 667 667 uint32_t j = (reg_STORE_QUEUE_PTR_READ+i)%_param->_size_store_queue; 668 cout << "{" << j << "}" <<endl669 << _store_queue[j] <<endl;668 std::cout << "{" << j << "}" << std::endl 669 << _store_queue[j] << std::endl; 670 670 } 671 671 672 672 // ***** dump speculative_access queue 673 cout << "Dump SPECULATIVE_ACCESS_QUEUE :" <<endl;673 std::cout << "Dump SPECULATIVE_ACCESS_QUEUE :" << std::endl; 674 674 675 675 for (uint32_t i=0; i<_param->_size_speculative_access_queue; i++) 676 676 { 677 677 uint32_t j = (*_speculative_access_queue_control)[i]; 678 cout << "{" << j << "}" <<endl679 << _speculative_access_queue[j] << endl;678 std::cout << "{" << j << "}" << std::endl 679 << _speculative_access_queue[j] << std::endl; 680 680 } 681 681 682 682 // ***** dump load queue 683 cout << "Dump LOAD_QUEUE :" <<endl684 << "ptr_read_check_priority : " << toString(static_cast<uint32_t>(reg_LOAD_QUEUE_CHECK_PRIORITY)) << endl;683 std::cout << "Dump LOAD_QUEUE :" << std::endl 684 << "ptr_read_check_priority : " << toString(static_cast<uint32_t>(reg_LOAD_QUEUE_CHECK_PRIORITY)) << std::endl; 685 685 686 686 for (uint32_t i=0; i<_param->_size_load_queue; i++) 687 687 { 688 688 uint32_t j = i; 689 cout << "{" << j << "}" <<endl690 << _load_queue[j] << endl;689 std::cout << "{" << j << "}" << std::endl 690 << _load_queue[j] << std::endl; 691 691 } 692 692 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h
r68 r75 77 77 public : ~Parameters () ; 78 78 79 public : st ringmsg_error (void);79 public : std::string msg_error (void); 80 80 81 public : st ring print (uint32_t depth);82 public : friend ostream& operator<< (ostream& output_stream,83 81 public : std::string print (uint32_t depth); 82 public : friend std::ostream& operator<< (std::ostream& output_stream, 83 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Parameters & x); 84 84 }; 85 85 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Read_queue.h
r66 r75 21 21 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h" 22 22 #ifdef STATISTICS 23 #include "Behavioural/ Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Statistics.h"23 #include "Behavioural/include/Stat.h" 24 24 #endif 25 25 #include "Behavioural/include/Component.h" … … 27 27 #include "Behavioural/include/Vhdl.h" 28 28 #endif 29 30 using namespace std;31 29 32 30 namespace morpheo { … … 60 58 public : Tspecial_address_t _num_reg_re ; 61 59 62 friend ostream& operator<< (ostream& output_stream,60 friend std::ostream& operator<< (std::ostream& output_stream, 63 61 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Tread_queue_entry_t & x) 64 62 { 65 output_stream << " * _context_id : " << toString(x._context_id ) << endl66 << " * _front_end_id : " << toString(x._front_end_id ) << endl67 << " * _ooo_engine_id : " << toString(x._ooo_engine_id) << endl68 << " * _rob_id : " << toString(x._rob_id ) << endl69 << " * _operation : " << toString(x._operation ) << endl70 << " * _type : " << toString(x._type ) << endl71 << " * _has_immediat : " << toString(x._has_immediat ) << endl72 << " * _immediat : " << toString(x._immediat ) << endl73 << " * _read_ra : " << toString(x._read_ra ) << endl74 << " * _num_reg_ra : " << toString(x._num_reg_ra ) << endl75 << " * _read_rb : " << toString(x._read_rb ) << endl76 << " * _num_reg_rb : " << toString(x._num_reg_rb ) << endl77 << " * _read_rc : " << toString(x._read_rc ) << endl78 << " * _num_reg_rc : " << toString(x._num_reg_rc ) << endl79 << " * _write_rd : " << toString(x._write_rd ) << endl80 << " * _num_reg_rd : " << toString(x._num_reg_rd ) << endl81 << " * _write_re : " << toString(x._write_re ) << endl82 << " * _num_reg_re : " << toString(x._num_reg_re ) << endl;63 output_stream << " * _context_id : " << toString(x._context_id ) << std::endl 64 << " * _front_end_id : " << toString(x._front_end_id ) << std::endl 65 << " * _ooo_engine_id : " << toString(x._ooo_engine_id) << std::endl 66 << " * _rob_id : " << toString(x._rob_id ) << std::endl 67 << " * _operation : " << toString(x._operation ) << std::endl 68 << " * _type : " << toString(x._type ) << std::endl 69 << " * _has_immediat : " << toString(x._has_immediat ) << std::endl 70 << " * _immediat : " << toString(x._immediat ) << std::endl 71 << " * _read_ra : " << toString(x._read_ra ) << std::endl 72 << " * _num_reg_ra : " << toString(x._num_reg_ra ) << std::endl 73 << " * _read_rb : " << toString(x._read_rb ) << std::endl 74 << " * _num_reg_rb : " << toString(x._num_reg_rb ) << std::endl 75 << " * _read_rc : " << toString(x._read_rc ) << std::endl 76 << " * _num_reg_rc : " << toString(x._num_reg_rc ) << std::endl 77 << " * _write_rd : " << toString(x._write_rd ) << std::endl 78 << " * _num_reg_rd : " << toString(x._num_reg_rd ) << std::endl 79 << " * _write_re : " << toString(x._write_re ) << std::endl 80 << " * _num_reg_re : " << toString(x._num_reg_re ) << std::endl; 83 81 84 82 return output_stream; … … 156 154 } 157 155 158 friend ostream& operator<< (ostream& output_stream,156 friend std::ostream& operator<< (std::ostream& output_stream, 159 157 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Tread_queue_head_entry_t & x) 160 158 { 161 output_stream << " * _context_id : " << x._context_id << endl162 << " * _front_end_id : " << x._front_end_id << endl163 << " * _ooo_engine_id : " << x._ooo_engine_id<< endl164 << " * _rob_id : " << x._rob_id << endl165 << " * _operation : " << x._operation << endl166 << " * _type : " << x._type << endl167 << " * _has_immediat : " << x._has_immediat << endl168 << " * _immediat : " << x._immediat << endl169 << " * _read_ra : " << x._read_ra << endl170 << " * _read_ra_val : " << x._read_ra_val << endl171 << " * _num_reg_ra : " << x._num_reg_ra << endl172 << " * _data_ra_val : " << x._data_ra_val << endl173 << " * _data_ra : " << x._data_ra << endl174 << " * _read_rb : " << x._read_rb << endl175 << " * _read_rb_val : " << x._read_rb_val << endl176 << " * _num_reg_rb : " << x._num_reg_rb << endl177 << " * _data_rb_val : " << x._data_rb_val << endl178 << " * _data_rb : " << x._data_rb << endl179 << " * _read_rc : " << x._read_rc << endl180 << " * _read_rc_val : " << x._read_rc_val << endl181 << " * _num_reg_rc : " << x._num_reg_rc << endl182 << " * _data_rc_val : " << x._data_rc_val << endl183 << " * _data_rc : " << x._data_rc << endl184 << " * _write_rd : " << x._write_rd << endl185 << " * _num_reg_rd : " << x._num_reg_rd << endl186 << " * _write_re : " << x._write_re << endl187 << " * _num_reg_re : " << x._num_reg_re << endl;159 output_stream << " * _context_id : " << x._context_id << std::endl 160 << " * _front_end_id : " << x._front_end_id << std::endl 161 << " * _ooo_engine_id : " << x._ooo_engine_id<< std::endl 162 << " * _rob_id : " << x._rob_id << std::endl 163 << " * _operation : " << x._operation << std::endl 164 << " * _type : " << x._type << std::endl 165 << " * _has_immediat : " << x._has_immediat << std::endl 166 << " * _immediat : " << x._immediat << std::endl 167 << " * _read_ra : " << x._read_ra << std::endl 168 << " * _read_ra_val : " << x._read_ra_val << std::endl 169 << " * _num_reg_ra : " << x._num_reg_ra << std::endl 170 << " * _data_ra_val : " << x._data_ra_val << std::endl 171 << " * _data_ra : " << x._data_ra << std::endl 172 << " * _read_rb : " << x._read_rb << std::endl 173 << " * _read_rb_val : " << x._read_rb_val << std::endl 174 << " * _num_reg_rb : " << x._num_reg_rb << std::endl 175 << " * _data_rb_val : " << x._data_rb_val << std::endl 176 << " * _data_rb : " << x._data_rb << std::endl 177 << " * _read_rc : " << x._read_rc << std::endl 178 << " * _read_rc_val : " << x._read_rc_val << std::endl 179 << " * _num_reg_rc : " << x._num_reg_rc << std::endl 180 << " * _data_rc_val : " << x._data_rc_val << std::endl 181 << " * _data_rc : " << x._data_rc << std::endl 182 << " * _write_rd : " << x._write_rd << std::endl 183 << " * _num_reg_rd : " << x._num_reg_rd << std::endl 184 << " * _write_re : " << x._write_re << std::endl 185 << " * _num_reg_re : " << x._num_reg_re << std::endl; 188 186 189 187 return output_stream; … … 198 196 // -----[ fields ]---------------------------------------------------- 199 197 // Parameters 200 protected : const st ring_name;198 protected : const std::string _name; 201 199 protected : const Parameters * _param; 202 200 203 201 #ifdef STATISTICS 204 p rivate : Statistics* _stat;202 public : Stat * _stat; 205 203 #endif 206 204 … … 302 300 // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 303 301 protected : Tread_queue_head_entry_t * _queue_head; 304 protected : queue<Tread_queue_entry_t *> * _queue;302 protected : std::queue<Tread_queue_entry_t *> * _queue; 305 303 306 304 // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ … … 328 326 sc_module_name name, 329 327 #else 330 st ringname,328 std::string name, 331 329 #endif 332 330 #ifdef STATISTICS … … 349 347 #endif 350 348 #ifdef STATISTICS 351 public : string statistics (uint32_t depth);349 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 352 350 #endif 353 351 … … 357 355 private : void vhdl_body (Vhdl * & vhdl); 358 356 #endif 359 360 #if def VHDL_TESTBENCH361 private : void vhdl_testbench_transition(void);357 358 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 359 private : void end_cycle (void); 362 360 #endif 363 361 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Parameters_msg_error.cpp
r68 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h" 9 9 #include <sstream> 10 using namespace std;11 10 12 11 namespace morpheo { … … 20 19 21 20 22 st ring Parameters::msg_error(void)21 std::string Parameters::msg_error(void) 23 22 { 24 23 log_printf(FUNC,Read_queue,"msg_error","Begin"); 25 24 26 st ring msg = "";25 std::string msg = ""; 27 26 28 27 // if (_size_queue < 2) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Parameters_print.cpp
r66 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h" 9 9 #include "Behavioural/include/XML.h" 10 using namespace std;11 10 12 11 namespace morpheo { … … 20 19 21 20 22 st ring Parameters::print (uint32_t depth)21 std::string Parameters::print (uint32_t depth) 23 22 { 24 23 log_printf(FUNC,Read_queue,"print","Begin"); … … 47 46 }; 48 47 49 ostream& operator<< (ostream& output_stream ,50 48 std::ostream& operator<< (std::ostream& output_stream , 49 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Parameters & x) 51 50 { 52 51 output_stream << x.print(0); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue.cpp
r68 r75 39 39 40 40 #ifdef STATISTICS 41 log_printf(INFO,Read_queue,"Read_queue","Allocation of statistics"); 42 43 // Allocation of statistics 44 _stat = new Statistics (static_cast<string>(_name), 45 param_statistics , 46 param); 41 log_printf(INFO,Read_queue,FUNCTION,"Allocation of statistics"); 42 43 statistics_declaration(param_statistics); 47 44 #endif 48 45 … … 217 214 log_printf(INFO,Read_queue,"~Read_queue","Generate Statistics file"); 218 215 219 _stat->generate_file(statistics(0));220 221 216 delete _stat; 222 217 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_allocation.cpp
r68 r75 21 21 void Read_queue::allocation (void) 22 22 { 23 string rename;24 25 23 log_printf(FUNC,Read_queue,"allocation","Begin"); 26 24 … … 238 236 239 237 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 240 _queue = new queue<Tread_queue_entry_t *>;238 _queue = new std::queue<Tread_queue_entry_t *>; 241 239 _queue_head = new Tread_queue_head_entry_t; 242 240 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_end_cycle.cpp
r59 r75 1 #if def VHDL_TESTBENCH1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 2 2 /* 3 3 * $Id$ … … 19 19 20 20 21 void Read_queue:: vhdl_testbench_transition()21 void Read_queue::end_cycle () 22 22 { 23 23 log_printf(FUNC,Read_queue,"vhdl_testbench_transition","Begin"); 24 24 25 #ifdef STATISTICS 26 _stat->end_cycle(); 27 #endif 28 29 #ifdef VHDL_TESTBENCH 25 30 // Evaluation before read the ouput signal 26 // sc_start(0); 27 31 // sc_start(0); 28 32 _interfaces->testbench(); 33 #endif 29 34 30 35 log_printf(FUNC,Read_queue,"vhdl_testbench_transition","End"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_statistics_declaration.cpp
r59 r75 18 18 namespace read_queue { 19 19 20 #undef FUNCTION 21 #define FUNCTION "Read_queue::statistics_declaration" 22 void Read_queue::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) 23 { 24 log_printf(FUNC,Read_queue,FUNCTION,"Begin"); 20 25 21 string Read_queue::statistics (uint32_t depth) 22 { 23 log_printf(FUNC,Read_queue,"statistics","Begin"); 24 25 string txt = _stat->print(depth); 26 _stat = new Stat (static_cast<std::string>(_name), 27 "Read_queue", 28 param_statistics); 26 29 27 log_printf(FUNC,Read_queue,"statistics","End"); 28 29 return txt; 30 log_printf(FUNC,Read_queue,FUNCTION,"End"); 30 31 }; 31 32 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp
r68 r75 138 138 } 139 139 140 #ifdef STATISTICS 141 _stat->add(); 142 #endif 143 144 #ifdef VHDL_TESTBENCH 145 vhdl_testbench_transition (); 140 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 141 end_cycle (); 146 142 #endif 147 143 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_vhdl.cpp
r68 r75 35 35 ); 36 36 37 st ring queue_name = _name + "_queue";37 std::string queue_name = _name + "_queue"; 38 38 queue = new morpheo::behavioural::generic::queue::Queue 39 39 (queue_name.c_str() -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_vhdl_body.cpp
r68 r75 208 208 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 209 209 { 210 st ring cmp;210 std::string cmp; 211 211 212 212 if (_param->_have_port_ooo_engine_id) … … 228 228 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 229 229 { 230 st ring cmp;230 std::string cmp; 231 231 232 232 if (_param->_have_port_ooo_engine_id) … … 248 248 for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--) 249 249 { 250 st ring cmp;250 std::string cmp; 251 251 252 252 if (_param->_have_port_ooo_engine_id) … … 278 278 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 279 279 { 280 st ring cmp;280 std::string cmp; 281 281 282 282 if (_param->_have_port_ooo_engine_id) … … 298 298 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 299 299 { 300 st ring cmp;300 std::string cmp; 301 301 302 302 if (_param->_have_port_ooo_engine_id) … … 318 318 for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--) 319 319 { 320 st ring cmp;320 std::string cmp; 321 321 322 322 if (_param->_have_port_ooo_engine_id) … … 343 343 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 344 344 { 345 st ring cmp;345 std::string cmp; 346 346 347 347 if (_param->_have_port_ooo_engine_id) … … 365 365 for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--) 366 366 { 367 st ring cmp;367 std::string cmp; 368 368 369 369 if (_param->_have_port_ooo_engine_id) … … 387 387 for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--) 388 388 { 389 st ring cmp;389 std::string cmp; 390 390 391 391 if (_param->_have_port_ooo_engine_id) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/configuration_multi_port_bypass_memory.cfg
r71 r75 8 8 32 32 +1 # size_general_data 9 9 2 2 +1 # size_special_data 10 256 256*2 # nb_general_register11 32 32+1 # nb_special_register10 16 16 *2 # nb_general_register 11 8 8 +1 # nb_special_register 12 12 8 8 +1 # nb_operation 13 13 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/configuration_multi_port_bypass_write.cfg
r71 r75 8 8 32 32 +1 # size_general_data 9 9 2 2 +1 # size_special_data 10 256 256*2 # nb_general_register11 32 32+1 # nb_special_register10 16 16 *2 # nb_general_register 11 8 8 +1 # nb_special_register 12 12 8 8 +1 # nb_operation 13 13 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/configuration_multi_port_retire2.cfg
r71 r75 8 8 32 32 +1 # size_general_data 9 9 2 2 +1 # size_special_data 10 256 256*2 # nb_general_register11 32 32+1 # nb_special_register10 18 16 *2 # nb_general_register 11 8 8 +1 # nb_special_register 12 12 8 8 +1 # nb_operation 13 13 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/configuration_multi_port_retire4.cfg
r71 r75 8 8 32 32 +1 # size_general_data 9 9 2 2 +1 # size_special_data 10 256 256 *2 # nb_general_register11 32 32+1 # nb_special_register10 16 16 *2 # nb_general_register 11 8 8 +1 # nb_special_register 12 12 8 8 +1 # nb_operation 13 13 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/configuration_multi_port_write.cfg
r71 r75 8 8 32 32 +1 # size_general_data 9 9 2 2 +1 # size_special_data 10 256 256*2 # nb_general_register11 32 32+1 # nb_special_register10 16 16 *2 # nb_general_register 11 8 8 +1 # nb_special_register 12 12 8 8 +1 # nb_operation 13 13 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/src/test.cpp
r69 r75 9 9 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/SelfTest/include/test.h" 10 10 #include "Common/include/Test.h" 11 #include "Common/include/BitManipulation.h" 11 12 12 13 #define NB_ITERATION 2 … … 368 369 { 369 370 _gpr_val [i][j] = ((rand()%100) < percent_registerfile_valid); 370 _gpr [i][j] = ran d()%((1<<_param->_size_general_data)-1);371 _gpr [i][j] = range<Tgeneral_data_t>(rand(),_param->_size_general_data); 371 372 } 372 373 for (uint32_t i=0; i<_param->_nb_special_register; i++) 373 374 { 374 375 _spr_val [i][j] = ((rand()%100) < percent_registerfile_valid); 375 _spr [i][j] = ran d()%(1<<_param->_size_special_data);376 _spr [i][j] = range<Tspecial_data_t>(rand(),_param->_size_special_data); 376 377 } 377 378 } … … 479 480 Tcontext_t ooo_engine = rand()% _param->_nb_ooo_engine; 480 481 Tcontrol_t val = (_gpr_val [num_reg][ooo_engine]== 0)?((rand()%100) < percent_transaction_registerfile):0; 481 Tgeneral_data_t data = ran d()%((1<<_param->_size_general_data)-1);482 Tgeneral_data_t data = range<Tgeneral_data_t>(rand(),_param->_size_general_data); 482 483 483 484 val = (val and can_gpr_use [ooo_engine][num_reg] and need_gpr [ooo_engine][num_reg]); … … 505 506 Tcontext_t ooo_engine = rand()% _param->_nb_ooo_engine; 506 507 Tcontrol_t val = (_spr_val [num_reg][ooo_engine]== 0)?((rand()%100) < percent_transaction_registerfile):0; 507 Tspecial_data_t data = ran d()%(1<<_param->_size_special_data);508 Tspecial_data_t data = range<Tspecial_data_t>(rand(),_param->_size_special_data); 508 509 509 510 val = (val and can_spr_use [ooo_engine][num_reg] and need_spr[ooo_engine][num_reg]); … … 534 535 Tgeneral_address_t gpr_num_reg = rand()% _param->_nb_general_register; 535 536 Tcontrol_t gpr_val = (_gpr_val [gpr_num_reg][ooo_engine]== 0)?((rand()%100) < percent_transaction_bypass):0; 536 Tgeneral_data_t gpr_data = ran d()%((1<<_param->_size_general_data)-1);537 Tgeneral_data_t gpr_data = range<Tgeneral_data_t>(rand(),_param->_size_general_data); 537 538 538 539 gpr_val = (gpr_val and can_gpr_use [ooo_engine][gpr_num_reg] and need_gpr[ooo_engine][gpr_num_reg]); … … 554 555 Tspecial_address_t spr_num_reg = rand()% _param->_nb_special_register; 555 556 Tcontrol_t spr_val = (_spr_val [spr_num_reg][ooo_engine]== 0)?((rand()%100) < percent_transaction_bypass):0; 556 Tspecial_data_t spr_data = ran d()%(1<<_param->_size_special_data);557 Tspecial_data_t spr_data = range<Tspecial_data_t>(rand(),_param->_size_special_data); 557 558 558 559 spr_val = (spr_val and can_spr_use [ooo_engine][spr_num_reg] and need_spr[ooo_engine][spr_num_reg]); … … 582 583 Tgeneral_address_t num_reg = rand()% _param->_nb_general_register; 583 584 Tcontrol_t val = (_gpr_val [num_reg][ooo_engine]== 0)?((rand()%100) < percent_transaction_bypass):0; 584 Tgeneral_data_t data = ran d()%((1<<_param->_size_general_data)-1);585 Tgeneral_data_t data = range<Tgeneral_data_t>(rand(),_param->_size_general_data); 585 586 586 587 val = (val and can_gpr_use [ooo_engine][num_reg] and need_gpr [ooo_engine][num_reg]); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/include/Parameters.h
r69 r75 85 85 public : ~Parameters () ; 86 86 87 public : string msg_error(void);87 public : std::string msg_error (void); 88 88 89 public : st ring print (uint32_t depth);90 public : friend ostream& operator<< (ostream& output_stream,91 89 public : std::string print (uint32_t depth); 90 public : friend std::ostream& operator<< (std::ostream& output_stream, 91 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::reservation_station::Parameters & x); 92 92 }; 93 93 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/include/Reservation_station.h
r69 r75 23 23 #include "Behavioural/include/Types.h" 24 24 #ifdef STATISTICS 25 #include "Behavioural/ Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/include/Statistics.h"25 #include "Behavioural/include/Stat.h" 26 26 #endif 27 27 #include "Behavioural/include/Component.h" … … 29 29 #include "Behavioural/include/Vhdl.h" 30 30 #endif 31 32 using namespace std;33 using namespace morpheo::behavioural::generic::queue_control;34 31 35 32 namespace morpheo { … … 69 66 public : Tspecial_address_t _num_reg_re ; 70 67 71 friend ostream& operator<< (ostream& output_stream,68 friend std::ostream& operator<< (std::ostream& output_stream, 72 69 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::reservation_station::Treservation_station_entry_t & x) 73 70 { 74 output_stream << " * _context_id : " << toString(x._context_id ) << endl75 << " * _front_end_id : " << toString(x._front_end_id ) << endl76 << " * _ooo_engine_id : " << toString(x._ooo_engine_id ) << endl77 << " * _rob_id : " << toString(x._rob_id ) << endl78 << " * _operation : " << toString(x._operation ) << endl79 << " * _type : " << toString(x._type ) << endl80 << " * _has_immediat : " << toString(x._has_immediat ) << endl81 << " * _immediat : " << toString(x._immediat ) << endl82 // << " * _read_ra : " << toString(x._read_ra ) << endl83 << " * _num_reg_ra : " << toString(x._num_reg_ra ) << endl84 << " * _data_ra_val : " << toString(x._data_ra_val ) << endl85 << " * _data_ra : " << toString(x._data_ra ) << endl86 // << " * _read_rb : " << toString(x._read_rb ) << endl87 << " * _num_reg_rb : " << toString(x._num_reg_rb ) << endl88 << " * _data_rb_val : " << toString(x._data_rb_val ) << endl89 << " * _data_rb : " << toString(x._data_rb ) << endl90 // << " * _read_rc : " << toString(x._read_rc ) << endl91 << " * _num_reg_rc : " << toString(x._num_reg_rc ) << endl92 << " * _data_rc_val : " << toString(x._data_rc_val ) << endl93 << " * _data_rc : " << toString(x._data_rc ) << endl94 << " * _write_rd : " << toString(x._write_rd ) << endl95 << " * _num_reg_rd : " << toString(x._num_reg_rd ) << endl96 << " * _write_re : " << toString(x._write_re ) << endl97 << " * _num_reg_re : " << toString(x._num_reg_re ) << endl;71 output_stream << " * _context_id : " << toString(x._context_id ) << std::endl 72 << " * _front_end_id : " << toString(x._front_end_id ) << std::endl 73 << " * _ooo_engine_id : " << toString(x._ooo_engine_id ) << std::endl 74 << " * _rob_id : " << toString(x._rob_id ) << std::endl 75 << " * _operation : " << toString(x._operation ) << std::endl 76 << " * _type : " << toString(x._type ) << std::endl 77 << " * _has_immediat : " << toString(x._has_immediat ) << std::endl 78 << " * _immediat : " << toString(x._immediat ) << std::endl 79 // << " * _read_ra : " << toString(x._read_ra ) << std::endl 80 << " * _num_reg_ra : " << toString(x._num_reg_ra ) << std::endl 81 << " * _data_ra_val : " << toString(x._data_ra_val ) << std::endl 82 << " * _data_ra : " << toString(x._data_ra ) << std::endl 83 // << " * _read_rb : " << toString(x._read_rb ) << std::endl 84 << " * _num_reg_rb : " << toString(x._num_reg_rb ) << std::endl 85 << " * _data_rb_val : " << toString(x._data_rb_val ) << std::endl 86 << " * _data_rb : " << toString(x._data_rb ) << std::endl 87 // << " * _read_rc : " << toString(x._read_rc ) << std::endl 88 << " * _num_reg_rc : " << toString(x._num_reg_rc ) << std::endl 89 << " * _data_rc_val : " << toString(x._data_rc_val ) << std::endl 90 << " * _data_rc : " << toString(x._data_rc ) << std::endl 91 << " * _write_rd : " << toString(x._write_rd ) << std::endl 92 << " * _num_reg_rd : " << toString(x._num_reg_rd ) << std::endl 93 << " * _write_re : " << toString(x._write_re ) << std::endl 94 << " * _num_reg_re : " << toString(x._num_reg_re ) << std::endl; 98 95 99 96 return output_stream; … … 109 106 // -----[ fields ]---------------------------------------------------- 110 107 // Parameters 111 protected : const st ring _name;108 protected : const std::string _name; 112 109 113 110 protected : const Parameters * _param; 114 //#ifdef STATISTICS 115 // protected : const morpheo::behavioural::Parameters_Statistics * _param_statistics; 116 //#endif 117 118 #ifdef STATISTICS 119 private : Statistics * _stat; 111 112 #ifdef STATISTICS 113 public : Stat * _stat; 120 114 #endif 121 115 … … 233 227 public : Reservation_station ( 234 228 #ifdef SYSTEMC 235 sc_module_name name,229 sc_module_name name, 236 230 #else 237 string name,231 string name, 238 232 #endif 239 233 #ifdef STATISTICS 240 morpheo::behavioural::Parameters_Statistics * param_statistics,241 #endif 242 Parameters * param );234 morpheo::behavioural::Parameters_Statistics * param_statistics, 235 #endif 236 Parameters * param ); 243 237 public : ~Reservation_station (void); 244 238 … … 250 244 public : void genMoore (void); 251 245 #endif 252 #ifdef STATISTICS 253 public : string statistics (uint32_t depth); 246 247 #ifdef STATISTICS 248 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 254 249 #endif 255 250 … … 260 255 #endif 261 256 257 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 262 258 private : void end_cycle (void); 259 #endif 263 260 }; 264 261 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Parameters_msg_error.cpp
r69 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/include/Parameters.h" 9 9 #include <sstream> 10 using namespace std;11 10 12 11 namespace morpheo { … … 22 21 #undef FUNCTION 23 22 #define FUNCTION "Reservation_station::msg_error" 24 st ring Parameters::msg_error(void)23 std::string Parameters::msg_error(void) 25 24 { 26 25 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); 27 26 28 st ring msg = "";27 std::string msg = ""; 29 28 30 29 // if (_size_queue < 2) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Parameters_print.cpp
r69 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/include/Parameters.h" 9 9 #include "Behavioural/include/XML.h" 10 using namespace std;11 10 12 11 namespace morpheo { … … 22 21 #undef FUNCTION 23 22 #define FUNCTION "Reservation_station::print" 24 st ring Parameters::print (uint32_t depth)23 std::string Parameters::print (uint32_t depth) 25 24 { 26 25 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); … … 54 53 #undef FUNCTION 55 54 #define FUNCTION "Reservation_station::operator<<" 56 ostream& operator<< (ostream& output_stream ,57 55 std::ostream& operator<< (std::ostream& output_stream , 56 morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::reservation_station::Parameters & x) 58 57 { 59 58 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station.cpp
r55 r75 31 31 _name (name) 32 32 ,_param (param) 33 // #ifdef STATISTICS34 // ,_param_statistics (param_statistics)35 // #endif36 33 { 37 34 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); … … 46 43 log_printf(INFO,Reservation_station,FUNCTION,"Allocation of statistics"); 47 44 48 // Allocation of statistics 49 _stat = new Statistics (static_cast<string>(_name), 50 param_statistics , 51 param); 45 statistics_declaration(param_statistics); 52 46 #endif 53 47 … … 95 89 log_printf(INFO,Reservation_station,FUNCTION,"Generate Statistics file"); 96 90 97 _stat->generate_file(statistics(0));98 99 91 delete _stat; 100 92 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_allocation.cpp
r69 r75 24 24 void Reservation_station::allocation (void) 25 25 { 26 string rename;27 28 26 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); 29 27 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_end_cycle.cpp
r69 r75 1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 1 2 /* 2 3 * $Id$ … … 25 26 26 27 #ifdef STATISTICS 27 _stat-> add();28 _stat->end_cycle(); 28 29 #endif 29 30 … … 45 46 }; // end namespace behavioural 46 47 }; // end namespace morpheo 48 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_statistics_declaration.cpp
r59 r75 18 18 namespace reservation_station { 19 19 20 21 20 #undef FUNCTION 22 #define FUNCTION "Reservation_station::statistics "23 string Reservation_station::statistics (uint32_t depth)21 #define FUNCTION "Reservation_station::statistics_declaration" 22 void Reservation_station::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) 24 23 { 25 24 log_printf(FUNC,Reservation_station,FUNCTION,"Begin"); 26 25 27 string txt = _stat->print(depth); 26 _stat = new Stat (static_cast<std::string>(_name), 27 "Reservation_station", 28 param_statistics); 28 29 29 30 log_printf(FUNC,Reservation_station,FUNCTION,"End"); 30 31 return txt;32 31 }; 33 32 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_vhdl_body.cpp
r70 r75 22 22 void Reservation_station::vhdl_body (Vhdl * & vhdl) 23 23 { 24 st ring range_retire, range_insert;24 std::string range_retire, range_insert; 25 25 26 26 if (_param->_size_queue == 1) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/include/Execute_queue.h
r74 r75 137 137 138 138 // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 139 private : queue<execute_queue_entry_t *> * _queue;139 private : std::queue<execute_queue_entry_t *> * _queue; 140 140 // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 141 141 private : Tcontrol_t internal_EXECUTE_QUEUE_IN_ACK ; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_allocation.cpp
r73 r75 24 24 void Execute_queue::allocation (void) 25 25 { 26 string rename;27 28 26 log_printf(FUNC,Execute_queue,FUNCTION,"Begin"); 29 27 … … 98 96 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 99 97 100 _queue = new queue<execute_queue_entry_t *>;98 _queue = new std::queue<execute_queue_entry_t *>; 101 99 102 100 #ifdef POSITION -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_statistics_declaration.cpp
r73 r75 25 25 log_printf(FUNC,Execute_queue,FUNCTION,"Begin"); 26 26 27 _stat = new Stat (static_cast<st ring>(_name),27 _stat = new Stat (static_cast<std::string>(_name), 28 28 "Execute_queue", 29 29 param_statistics); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/include/Write_queue.h
r74 r75 179 179 180 180 // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 181 protected : list<write_queue_entry_t *> * _queue;181 protected : std::list<write_queue_entry_t *> * _queue; 182 182 183 183 // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp
r74 r75 23 23 void Write_queue::allocation (void) 24 24 { 25 string rename;26 27 25 log_printf(FUNC,Write_queue,FUNCTION,"Begin"); 28 26 … … 139 137 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 140 138 141 _queue = newlist<write_queue_entry_t *>;139 _queue = new std::list<write_queue_entry_t *>; 142 140 143 141 #ifdef POSITION -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_genMoore.cpp
r73 r75 86 86 // -----[ Interface "bypass_write" ]---------------------------------- 87 87 { 88 list<write_queue_entry_t *>::iterator it = _queue->begin();88 std::list<write_queue_entry_t *>::iterator it = _queue->begin(); 89 89 for (uint32_t i=0; i<_param->_nb_bypass_write; i++) 90 90 { -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_statistics_declaration.cpp
r73 r75 25 25 log_printf(FUNC,Write_queue,FUNCTION,"Begin"); 26 26 27 _stat = new Stat (static_cast<st ring>(_name),27 _stat = new Stat (static_cast<std::string>(_name), 28 28 "Write_queue", 29 29 param_statistics); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_allocation.cpp
r74 r75 145 145 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 146 146 147 st ring name;147 std::string name; 148 148 149 149 { … … 184 184 { 185 185 name = _name+"_write_queue"; 186 cout << "Instance : " << name <<endl;186 std::cout << "Instance : " << name << std::endl; 187 187 188 188 #ifdef POSITION … … 196 196 197 197 #ifdef POSITION 198 _component->interface_map (name ," WRITE_QUEUE_IN",199 _name," WRITE_UNIT_IN");198 _component->interface_map (name ,"write_queue_in", 199 _name,"write_unit_in"); 200 200 #endif 201 201 … … 226 226 { 227 227 #ifdef POSITION 228 _component->interface_map (name ," WRITE_QUEUE_OUT",229 _name+"_execute_queue", " EXECUTE_QUEUE_IN");228 _component->interface_map (name ,"write_queue_out", 229 _name+"_execute_queue", "execute_queue_in"); 230 230 #endif 231 231 … … 250 250 { 251 251 #ifdef POSITION 252 _component->interface_map (name ," WRITE_QUEUE_OUT",253 _name," WRITE_UNIT_OUT");252 _component->interface_map (name ,"write_queue_out", 253 _name,"write_unit_out"); 254 254 #endif 255 255 … … 275 275 { 276 276 #ifdef POSITION 277 _component->interface_map (name ," GPR_WRITE_"+toString(i),278 _name," GPR_WRITE_"+toString(i));277 _component->interface_map (name ,"gpr_write_"+toString(i), 278 _name,"gpr_write_"+toString(i)); 279 279 #endif 280 280 … … 290 290 { 291 291 #ifdef POSITION 292 _component->interface_map (name ," SPR_WRITE_"+toString(i),293 _name," SPR_WRITE_"+toString(i));292 _component->interface_map (name ,"spr_write_"+toString(i), 293 _name,"spr_write_"+toString(i)); 294 294 #endif 295 295 … … 306 306 { 307 307 #ifdef POSITION 308 _component->interface_map (name ," BYPASS_WRITE_"+toString(i),309 _name," BYPASS_WRITE_"+toString(i));308 _component->interface_map (name ,"bypass_write_"+toString(i), 309 _name,"bypass_write_"+toString(i)); 310 310 #endif 311 311 … … 324 324 { 325 325 name = _name+"_execute_queue"; 326 cout << "Instance : " << name <<endl;326 std::cout << "Instance : " << name << std::endl; 327 327 328 328 #ifdef POSITION … … 336 336 337 337 #ifdef POSITION 338 _component->interface_map (name ," WRITE_QUEUE_IN",339 _name+"_write_queue"," WRITE_UNIT_IN");338 _component->interface_map (name ,"execute_queue_in", 339 _name+"_write_queue","write_queue_in"); 340 340 #endif 341 341 … … 358 358 359 359 #ifdef POSITION 360 _component->interface_map (name ," EXECUTE_QUEUE_OUT",361 _name," WRITE_UNIT_OUT_");360 _component->interface_map (name ,"execute_queue_out", 361 _name,"write_unit_out"); 362 362 #endif 363 363 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_statistics_declaration.cpp
r74 r75 24 24 log_printf(FUNC,Write_unit,FUNCTION,"Begin"); 25 25 26 _stat = new Stat (static_cast<st ring>(_name),26 _stat = new Stat (static_cast<std::string>(_name), 27 27 "Write_unit", 28 28 param_statistics); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Makefile.deps
r74 r75 42 42 #-----[ Rules ]-------------------------------------------- 43 43 44 #.NOTPARALLEL : Register_unit_library Register_unit_library_clean44 .NOTPARALLEL : Register_unit_library Register_unit_library_clean 45 45 46 46 Register_unit_library : $(Register_unit_DEPENDENCIES) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h
r60 r75 50 50 public : ~Parameters () ; 51 51 52 public : string msg_error(void);52 public : std::string msg_error (void); 53 53 54 public : st ring print (uint32_t depth);55 public : friend ostream& operator<< (ostream& output_stream,56 54 public : std::string print (uint32_t depth); 55 public : friend std::ostream& operator<< (std::ostream& output_stream, 56 morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x); 57 57 }; 58 58 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Register_unit_Glue.h
r61 r75 20 20 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h" 21 21 #ifdef STATISTICS 22 #include "Behavioural/ Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Statistics.h"22 #include "Behavioural/include/Stat.h" 23 23 #endif 24 24 #include "Behavioural/include/Component.h" … … 27 27 #endif 28 28 #include "Behavioural/include/Usage.h" 29 30 using namespace std;31 29 32 30 namespace morpheo { … … 47 45 // -----[ fields ]---------------------------------------------------- 48 46 // Parameters 49 protected : const st ring _name;47 protected : const std::string _name; 50 48 protected : const Parameters * _param; 51 49 private : const Tusage_t _usage; 52 50 53 //#ifdef STATISTICS 54 // protected : const morpheo::behavioural::Parameters_Statistics * _param_statistics; 55 //#endif 56 57 #ifdef STATISTICS 58 private : Statistics * _stat; 51 #ifdef STATISTICS 52 public : Stat * _stat; 59 53 #endif 60 54 … … 169 163 sc_module_name name, 170 164 #else 171 st ring name,165 std::string name, 172 166 #endif 173 167 #ifdef STATISTICS … … 183 177 184 178 #ifdef SYSTEMC 185 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)186 179 public : void transition (void); 187 180 public : void genMealy_gpr_read (void); … … 199 192 public : void genMealy_insert (void); 200 193 public : void genMealy_retire (void); 201 202 //#endif203 194 #endif 204 #ifdef STATISTICS 205 public : string statistics (uint32_t depth); 195 196 #ifdef STATISTICS 197 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 206 198 #endif 207 199 … … 212 204 #endif 213 205 214 #if def VHDL_TESTBENCH215 private : void vhdl_testbench_transition(void);206 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 207 private : void end_cycle (void); 216 208 #endif 217 209 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Parameters_msg_error.cpp
r60 r75 9 9 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h" 10 10 #include <sstream> 11 using namespace std;12 11 13 12 namespace morpheo { … … 22 21 #undef FUNCTION 23 22 #define FUNCTION "Register_unit_Glue::msg_error" 24 st ring Parameters::msg_error(void)23 std::string Parameters::msg_error(void) 25 24 { 26 25 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); 27 26 28 st ring msg = "";27 std::string msg = ""; 29 28 30 29 return msg; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Parameters_print.cpp
r60 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h" 9 9 #include "Behavioural/include/XML.h" 10 using namespace std;11 10 12 11 namespace morpheo { … … 21 20 #undef FUNCTION 22 21 #define FUNCTION "Register_unit_Glue::print" 23 st ring Parameters::print (uint32_t depth)22 std::string Parameters::print (uint32_t depth) 24 23 { 25 24 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); … … 56 55 #undef FUNCTION 57 56 #define FUNCTION "Register_unit_Glue::operator<<" 58 ostream& operator<< (ostream& output_stream ,59 57 std::ostream& operator<< (std::ostream& output_stream , 58 morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x) 60 59 { 61 60 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue.cpp
r61 r75 24 24 sc_module_name name, 25 25 #else 26 st ring name,26 std::string name, 27 27 #endif 28 28 #ifdef STATISTICS … … 35 35 ,_param (param) 36 36 ,_usage (usage) 37 // #ifdef STATISTICS38 // ,_param_statistics (param_statistics)39 // #endif40 37 { 41 38 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); … … 48 45 49 46 // Allocation of statistics 50 _stat = new Statistics (static_cast<string>(_name), 51 param_statistics , 52 param); 47 statistics_declaration(param_statistics); 53 48 #endif 54 49 … … 549 544 log_printf(INFO,Register_unit_Glue,FUNCTION,"Generate Statistics file"); 550 545 551 _stat->generate_file(statistics(0));552 546 delete _stat; 553 547 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_allocation.cpp
r60 r75 22 22 void Register_unit_Glue::allocation (void) 23 23 { 24 string rename;25 26 24 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); 27 25 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_end_cycle.cpp
r60 r75 1 #if def VHDL_TESTBENCH1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 2 2 /* 3 3 * $Id$ … … 17 17 namespace register_unit_glue { 18 18 19 20 19 #undef FUNCTION 21 #define FUNCTION "Register_unit_Glue:: vhdl_testbench_transition"22 void Register_unit_Glue::vhdl_testbench_transition()20 #define FUNCTION "Register_unit_Glue::end_cycle" 21 void Register_unit_Glue::end_cycle () 23 22 { 24 23 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); 25 24 25 #ifdef STATISTICS 26 _stat->end_cycle(); 27 #endif 28 29 #ifdef VHDL_TESTBENCH 26 30 // Evaluation before read the ouput signal 27 // sc_start(0); 28 31 // sc_start(0); 29 32 _interfaces->testbench(); 33 #endif 30 34 31 35 log_printf(FUNC,Register_unit_Glue,FUNCTION,"End"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_statistics_declaration.cpp
r60 r75 17 17 namespace register_unit_glue { 18 18 19 20 19 #undef FUNCTION 21 #define FUNCTION "Register_unit_Glue::statistics "22 string Register_unit_Glue::statistics (uint32_t depth)20 #define FUNCTION "Register_unit_Glue::statistics_declaration" 21 void Register_unit_Glue::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) 23 22 { 24 23 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); 25 24 26 string txt = _stat->print(depth); 25 _stat = new Stat (static_cast<std::string>(_name), 26 "Register_unit_Glue", 27 param_statistics); 27 28 28 29 log_printf(FUNC,Register_unit_Glue,FUNCTION,"End"); 29 30 return txt;31 30 }; 32 31 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_transition.cpp
r60 r75 1 1 #ifdef SYSTEMC 2 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)3 2 /* 4 3 * $Id$ … … 25 24 log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin"); 26 25 27 #ifdef STATISTICS 28 _stat->add(); 29 #endif 30 31 #ifdef VHDL_TESTBENCH 32 vhdl_testbench_transition (); 26 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 27 end_cycle(); 33 28 #endif 34 29 … … 45 40 }; // end namespace morpheo 46 41 #endif 47 //#endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Parameters.h
r60 r75 79 79 public : ~Parameters () ; 80 80 81 public : string msg_error (void); 82 83 public : string print (uint32_t depth); 84 public : friend ostream& operator<< (ostream& output_stream, 85 morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::Parameters & x); 81 public : std::string msg_error (void); 82 public : std::string print (uint32_t depth); 83 public : friend std::ostream& operator<< (std::ostream& output_stream, 84 morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::Parameters & x); 86 85 }; 87 86 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Register_unit.h
r60 r75 24 24 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Parameters.h" 25 25 #ifdef STATISTICS 26 #include "Behavioural/ Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Statistics.h"26 #include "Behavioural/include/Stat.h" 27 27 #endif 28 28 #include "Behavioural/include/Component.h" … … 32 32 #include "Behavioural/include/Usage.h" 33 33 34 using namespace std;35 36 34 namespace morpheo { 37 35 namespace behavioural { 38 39 36 namespace core { 40 37 namespace multi_execute_loop { … … 50 47 // -----[ fields ]---------------------------------------------------- 51 48 // Parameters 52 protected : const st ring _name;49 protected : const std::string _name; 53 50 protected : const Parameters * _param; 54 51 private : const Tusage_t _usage; 55 52 56 53 #ifdef STATISTICS 57 protected : morpheo::behavioural::Parameters_Statistics * _param_statistics; 58 #endif 59 60 #ifdef STATISTICS 61 private : Statistics * _stat; 54 public : Stat * _stat; 62 55 #endif 63 56 … … 143 136 sc_module_name name, 144 137 #else 145 st ring name,138 std::string name, 146 139 #endif 147 140 #ifdef STATISTICS … … 153 146 public : ~Register_unit (void); 154 147 155 private : void allocation (void); 148 private : void allocation ( 149 #ifdef STATISTICS 150 morpheo::behavioural::Parameters_Statistics * param_statistics 151 #else 152 void 153 #endif 154 ); 156 155 private : void deallocation (void); 157 156 … … 161 160 //#endif 162 161 #endif 163 #ifdef STATISTICS164 public : string statistics (uint32_t depth);165 #endif166 162 167 163 #if VHDL … … 171 167 #endif 172 168 173 #ifdef VHDL_TESTBENCH 174 private : void vhdl_testbench_transition (void); 169 #ifdef STATISTICS 170 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 171 #endif 172 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 173 private : void end_cycle (void); 175 174 #endif 176 175 }; 176 177 177 178 178 }; // end namespace register_unit -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters_msg_error.cpp
r60 r75 6 6 */ 7 7 8 #include "Behavioural/include/Types.h"9 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Parameters.h" 10 #include <sstream>11 using namespace std;12 9 13 10 namespace morpheo { … … 21 18 #undef FUNCTION 22 19 #define FUNCTION "Register_unit::msg_error" 23 st ring Parameters::msg_error(void)20 std::string Parameters::msg_error(void) 24 21 { 25 22 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 26 23 27 st ring msg = "";24 std::string msg = ""; 28 25 29 26 return msg; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters_print.cpp
r60 r75 8 8 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Parameters.h" 9 9 #include "Behavioural/include/XML.h" 10 using namespace std;11 10 12 11 namespace morpheo { … … 20 19 #undef FUNCTION 21 20 #define FUNCTION "Register_unit::print" 22 st ring Parameters::print (uint32_t depth)21 std::string Parameters::print (uint32_t depth) 23 22 { 24 23 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); … … 73 72 #undef FUNCTION 74 73 #define FUNCTION "Register_unit::operator<<" 75 ostream& operator<< (ostream& output_stream ,76 74 std::ostream& operator<< (std::ostream& output_stream , 75 morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::Parameters & x) 77 76 { 78 77 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit.cpp
r60 r75 34 34 ,_param (param) 35 35 ,_usage (usage) 36 #ifdef STATISTICS37 ,_param_statistics (param_statistics)38 #endif39 36 { 40 37 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 41 38 42 39 log_printf(INFO,Register_unit,FUNCTION,"Allocation"); 43 allocation (); 40 allocation ( 41 #ifdef STATISTICS 42 param_statistics 43 #endif 44 ); 44 45 45 46 #ifdef STATISTICS … … 47 48 48 49 // Allocation of statistics 49 _stat = new Statistics (static_cast<string>(_name), 50 param_statistics , 51 param); 50 statistics_declaration(param_statistics); 52 51 #endif 53 52 … … 84 83 #ifdef STATISTICS 85 84 log_printf(INFO,Register_unit,FUNCTION,"Generate Statistics file"); 86 87 _stat->generate_file(statistics(0));88 85 delete _stat; 89 86 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp
r65 r75 19 19 #undef FUNCTION 20 20 #define FUNCTION "Register_unit::allocation" 21 void Register_unit::allocation (void) 21 void Register_unit::allocation ( 22 #ifdef STATISTICS 23 morpheo::behavioural::Parameters_Statistics * param_statistics 24 #else 25 void 26 #endif 27 ) 22 28 { 23 string rename, name_component;24 25 29 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 26 30 … … 249 253 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 250 254 251 st ring name;255 std::string name; 252 256 253 257 component_gpr = new morpheo::behavioural::generic::registerfile::RegisterFile::RegisterFile * [_param->_nb_ooo_engine]; … … 263 267 (name.c_str() 264 268 #ifdef STATISTICS 265 , _param_statistics269 ,param_statistics 266 270 #endif 267 271 ,_param->_param_gpr [i] … … 283 287 (name.c_str() 284 288 #ifdef STATISTICS 285 , _param_statistics289 ,param_statistics 286 290 #endif 287 291 ,_param->_param_gpr_status [i] … … 303 307 (name.c_str() 304 308 #ifdef STATISTICS 305 , _param_statistics309 ,param_statistics 306 310 #endif 307 311 ,_param->_param_spr [i] … … 322 326 (name.c_str() 323 327 #ifdef STATISTICS 324 , _param_statistics328 ,param_statistics 325 329 #endif 326 330 ,_param->_param_spr_status [i] … … 343 347 (name.c_str() 344 348 #ifdef STATISTICS 345 , _param_statistics349 ,param_statistics 346 350 #endif 347 351 ,_param->_param_glue … … 358 362 359 363 // ~~~~~[ Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 360 364 std::string name_component; 365 361 366 for (uint32_t i=0; i<_param->_nb_ooo_engine; i++) 362 367 { 363 368 name_component = _name+"_gpr_"+toString(i); 364 369 365 cout << "Instance : " << name_component <<endl;370 std::cout << "Instance : " << name_component << std::endl; 366 371 367 372 #ifdef POSITION … … 420 425 name_component = _name+"_gpr_status_"+toString(i); 421 426 422 cout << "Instance : " << name_component <<endl;427 std::cout << "Instance : " << name_component << std::endl; 423 428 424 429 #ifdef POSITION … … 544 549 name_component = _name+"_spr_"+toString(i); 545 550 546 cout << "Instance : " << name_component <<endl;551 std::cout << "Instance : " << name_component << std::endl; 547 552 548 553 #ifdef POSITION … … 601 606 name_component = _name+"_spr_status_"+toString(i); 602 607 603 cout << "Instance : " << name_component <<endl;608 std::cout << "Instance : " << name_component << std::endl; 604 609 605 610 #ifdef POSITION … … 724 729 name_component = _name+"_glue"; 725 730 726 cout << "Instance : " << name_component <<endl;731 std::cout << "Instance : " << name_component << std::endl; 727 732 728 733 #ifdef POSITION … … 1034 1039 #endif 1035 1040 1036 // cout << *_component <<endl;1041 // std::cout << *_component << std::endl; 1037 1042 1038 1043 log_printf(FUNC,Register_unit,FUNCTION,"End"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_end_cycle.cpp
r60 r75 1 #if def VHDL_TESTBENCH1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 2 2 /* 3 3 * $Id$ … … 16 16 namespace register_unit { 17 17 18 19 18 #undef FUNCTION 20 #define FUNCTION "Register_unit:: vhdl_testbench_transition"21 void Register_unit::vhdl_testbench_transition()19 #define FUNCTION "Register_unit::end_cycle" 20 void Register_unit::end_cycle () 22 21 { 23 22 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 24 23 24 #ifdef STATISTICS 25 _stat->end_cycle(); 26 #endif 27 28 #ifdef VHDL_TESTBENCH 25 29 // Evaluation before read the ouput signal 26 // sc_start(0); 27 30 // sc_start(0); 28 31 _interfaces->testbench(); 32 #endif 29 33 30 34 log_printf(FUNC,Register_unit,FUNCTION,"End"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_statistics_declaration.cpp
r60 r75 16 16 namespace register_unit { 17 17 18 19 18 #undef FUNCTION 20 #define FUNCTION "Register_unit::statistics "21 string Register_unit::statistics (uint32_t depth)19 #define FUNCTION "Register_unit::statistics_declaration" 20 void Register_unit::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) 22 21 { 23 22 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 24 23 25 string txt = _stat->print(depth); 26 24 _stat = new Stat (static_cast<std::string>(_name), 25 "Register_unit", 26 param_statistics); 27 28 for (uint32_t i=0; i<_param->_nb_ooo_engine; i++) 29 { 30 _stat->add_stat(component_gpr [i]->_stat); 31 _stat->add_stat(component_gpr_status[i]->_stat); 32 _stat->add_stat(component_spr [i]->_stat); 33 _stat->add_stat(component_spr_status[i]->_stat); 34 } 35 _stat->add_stat(component_glue->_stat); 36 27 37 log_printf(FUNC,Register_unit,FUNCTION,"End"); 28 29 return txt;30 38 }; 31 39 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_transition.cpp
r60 r75 24 24 log_printf(FUNC,Register_unit,FUNCTION,"Begin"); 25 25 26 #ifdef STATISTICS 27 _stat->add(); 28 #endif 29 30 #ifdef VHDL_TESTBENCH 31 vhdl_testbench_transition (); 26 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 27 end_cycle(); 32 28 #endif 33 29
Note: See TracChangeset
for help on using the changeset viewer.