Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest

Files:

• Makefile (modified) (1 diff)
• include/test.h (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/test.cpp (modified) (9 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/Makefile

@@ -24 +24 @@
 library_clean                   : Read_queue_library_clean
 
+local_clean                     :
+
 include                         ../Makefile.deps
 include                         $(DIR_MORPHEO)/Behavioural/Makefile.flags

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/include/test.h

@@ -16 +16 @@
 
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Read_queue.h"
+#include "Common/include/Time.h"
 
 using namespace std;
@@ -30 +31 @@
               morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Parameters * param);
 
-class Time 
-{
-private : timeval time_begin;
-// private : timeval time_end;
-  
-public  : Time ()
-  {
-    gettimeofday(&time_begin     ,NULL);
-  };
-
-public  : ~Time ()
-  {
-    cout << *this;
-  };
-
-public  : friend ostream& operator<< (ostream& output_stream,
-                                      const Time & x)
-  {
-    timeval time_end;
-    
-    gettimeofday(&time_end       ,NULL);
-    
-    uint32_t nb_cycles = static_cast<uint32_t>(sc_simulation_time());
-
-    double average = static_cast<double>(nb_cycles) / static_cast<double>(time_end.tv_sec-x.time_begin.tv_sec);
-    
-    output_stream << nb_cycles << "\t(" << average << " cycles / seconds )" << endl;
-
-    return output_stream;
-  }
-};

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/src/main.cpp

@@ -77 +77 @@
          ,size_store_queue
          ,size_load_queue 
+         ,true //is_toplevel
           );
       

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/src/test.cpp

@@ -23 +23 @@
 #endif
 
+  Tusage_t _usage = USE_ALL;
+
+//   _usage = usage_unset(_usage,USE_SYSTEMC              );
+//   _usage = usage_unset(_usage,USE_VHDL                 );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH       );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT);
+//   _usage = usage_unset(_usage,USE_POSITION             );
+//   _usage = usage_unset(_usage,USE_STATISTICS           );
+//   _usage = usage_unset(_usage,USE_INFORMATION          );
+
   Read_queue * _Read_queue = new Read_queue (name.c_str(),
 #ifdef STATISTICS
@@ -28 +38 @@
 #endif
                                              _param,
-                                             USE_ALL);
+                                             _usage);
   
 #ifdef SYSTEMC
@@ -200 +210 @@
   if(_param->_have_port_ooo_engine_id)
     (*(_Read_queue-> in_READ_QUEUE_IN_OOO_ENGINE_ID  )) (*(READ_QUEUE_IN_OOO_ENGINE_ID  ));
-  if(_param->_have_port_rob_id       )
+  if(_param->_have_port_rob_ptr       )
     (*(_Read_queue-> in_READ_QUEUE_IN_ROB_ID         )) (*(READ_QUEUE_IN_ROB_ID         ));
   (*(_Read_queue-> in_READ_QUEUE_IN_OPERATION      )) (*(READ_QUEUE_IN_OPERATION      ));
@@ -228 +238 @@
   if(_param->_have_port_ooo_engine_id)
     (*(_Read_queue->out_READ_QUEUE_OUT_OOO_ENGINE_ID )) (*(READ_QUEUE_OUT_OOO_ENGINE_ID )); 
-  if(_param->_have_port_rob_id       )
+  if(_param->_have_port_rob_ptr       )
     (*(_Read_queue->out_READ_QUEUE_OUT_ROB_ID        )) (*(READ_QUEUE_OUT_ROB_ID        )); 
   (*(_Read_queue->out_READ_QUEUE_OUT_OPERATION     )) (*(READ_QUEUE_OUT_OPERATION     )); 
@@ -388 +398 @@
               if(_param->_have_port_front_end_id )
                 READ_QUEUE_IN_FRONT_END_ID   ->write((3*_ooo_engine_id [request_in])%_param->_nb_front_end);
-              if(_param->_have_port_rob_id       )
+              if(_param->_have_port_rob_ptr       )
                 READ_QUEUE_IN_ROB_ID      ->write(request_in);
               READ_QUEUE_IN_OPERATION   ->write(0);
@@ -504 +514 @@
             {
               Tpacket_t  rob_id;
-              if(_param->_have_port_rob_id       )
+              if(_param->_have_port_rob_ptr       )
                 rob_id = READ_QUEUE_OUT_ROB_ID->read();
               else
@@ -551 +561 @@
   TEST_OK ("End of Simulation");
   delete _time;
+
   cout << "<" << name << "> ............ Stop Simulation" << endl;
 
@@ -564 +575 @@
    if(_param->_have_port_ooo_engine_id )
      delete    READ_QUEUE_IN_OOO_ENGINE_ID;
-   if(_param->_have_port_rob_id       )
+   if(_param->_have_port_rob_ptr       )
      delete    READ_QUEUE_IN_ROB_ID    ;
    delete    READ_QUEUE_IN_OPERATION    ;
@@ -592 +603 @@
    if(_param->_have_port_ooo_engine_id )
      delete    READ_QUEUE_OUT_OOO_ENGINE_ID;
-   if(_param->_have_port_rob_id       )
+   if(_param->_have_port_rob_ptr       )
      delete    READ_QUEUE_OUT_ROB_ID      ;
    delete    READ_QUEUE_OUT_OPERATION   ;