Changeset 101 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit

Timestamp:

Jan 15, 2009, 6:19:08 PM (15 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit

Files:

• Execute_queue/include/Execute_queue.h (modified) (2 diffs)
• Execute_queue/src/Execute_queue_allocation.cpp (modified) (1 diff)
• Execute_queue/src/Execute_queue_deallocation.cpp (modified) (1 diff)
• Execute_queue/src/Execute_queue_genMoore.cpp (modified) (2 diffs)
• Execute_queue/src/Execute_queue_transition.cpp (modified) (6 diffs)
• Execute_queue/src/Execute_queue_vhdl.cpp (modified) (1 diff)
• Write_queue/src/Write_queue_genMoore.cpp (modified) (2 diffs)
• Write_queue/src/Write_queue_transition.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/include/Execute_queue.h

@@ -14 +14 @@
 
 #include <iostream>
-#include <queue>
+#include <list>
 #include "Common/include/ToString.h"
 #include "Common/include/Debug.h"
@@ -99 +99 @@
     
     // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-  private   : std::queue<execute_queue_entry_t *> * _queue;
+  private   : std::list<execute_queue_entry_t *> * _queue;
     // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   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

@@ -96 +96 @@
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-     _queue = new std::queue<execute_queue_entry_t *>;
+     _queue = new std::list<execute_queue_entry_t *>;
 
 #ifdef POSITION

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_deallocation.cpp

@@ -72 +72 @@
       {
         delete _queue->front();
-        _queue->pop();
+        _queue->pop_front();
       }
     delete _queue;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_genMoore.cpp

@@ -23 +23 @@
   void Execute_queue::genMoore (void)
   {
-    log_printf(FUNC,Execute_queue,FUNCTION,"Begin");
+    log_begin(Execute_queue,FUNCTION);
+    log_function(Execute_queue,FUNCTION,_name.c_str());
 
     // -----[ Interface "execute_queue_in" ]--------------------------------
@@ -59 +60 @@
     }
 
-    log_printf(FUNC,Execute_queue,FUNCTION,"End");
+    log_end(Execute_queue,FUNCTION);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_transition.cpp

@@ -23 +23 @@
   void Execute_queue::transition (void)
   {
-    log_printf(FUNC,Execute_queue,FUNCTION,"Begin");
+    log_begin(Execute_queue,FUNCTION);
+    log_function(Execute_queue,FUNCTION,_name.c_str());
 
     if (PORT_READ(in_NRESET) == 0)
@@ -32 +33 @@
         // > 2) flush all slot in one cycle
 
-        while (_queue->empty() == false)
-          _queue->pop();
+        _queue->clear();
       }
     else
@@ -53 +53 @@
                PORT_READ(in_EXECUTE_QUEUE_IN_DATA         ));
             
-            _queue->push(entry);
+            _queue->push_back(entry);
           }
 
@@ -60 +60 @@
           {
             delete _queue->front();
-            _queue->pop();
+            _queue->pop_front();
           }
       }
@@ -69 +69 @@
 #endif
     
+#if DEBUG_Execute_queue and (DEBUG >= DEBUG_TRACE)
+    log_printf(TRACE,Execute_queue,FUNCTION,"  * Dump Execute_queue");
+    {
+      uint32_t i=0;
+      for (std::list<execute_queue_entry_t *>::iterator it=_queue->begin();
+           it!=_queue->end();
+           ++it)
+        {
+          log_printf(TRACE,Execute_queue,FUNCTION,"  [%d] %.2d %.2d %.2d, %.4d, %.1d, %.2d %.1d, %.8x %.8x",
+                     i,
+                     (*it)->_context_id   ,
+                     (*it)->_front_end_id ,
+                     (*it)->_ooo_engine_id,
+                     (*it)->_packet_id    ,
+                   //(*it)->_operation    ,
+                   //(*it)->_type         ,
+                     (*it)->_flags        ,
+                     (*it)->_exception    ,
+                     (*it)->_no_sequence  ,
+                     (*it)->_address      ,
+                     (*it)->_data
+                     );
+          i++;
+        }
+    }
+#endif
+
 
 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
@@ -74 +101 @@
 #endif
 
-    log_printf(FUNC,Execute_queue,FUNCTION,"End");
+    log_end(Execute_queue,FUNCTION);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Execute_queue_vhdl.cpp

@@ -35 +35 @@
       (_param->_size_queue,
        _param->_size_internal_queue,
-       0
+       0,
+       false,
+       false
        );
     

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_genMoore.cpp

@@ -23 +23 @@
   void Write_queue::genMoore (void)
   {
-    log_printf(FUNC,Write_queue,FUNCTION,"Begin");
+    log_begin(Write_queue,FUNCTION);
+    log_function(Write_queue,FUNCTION,_name.c_str());
     
     // -----[ Interface "Write_queue_in" ]--------------------------------
@@ -109 +110 @@
         }
     }
-    log_printf(FUNC,Write_queue,FUNCTION,"End");
+    log_end(Write_queue,FUNCTION);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_transition.cpp

@@ -24 +24 @@
   void Write_queue::transition (void)
   {
-    log_printf(FUNC,Write_queue,FUNCTION,"Begin");
+    log_begin(Write_queue,FUNCTION);
+    log_function(Write_queue,FUNCTION,_name.c_str());
 
     if (PORT_READ(in_NRESET) == 0)
@@ -87 +88 @@
 #endif
 
+#if DEBUG_Write_queue and (DEBUG >= DEBUG_TRACE)
+    log_printf(TRACE,Write_queue,FUNCTION,"  * Dump Write_queue");
+    {
+      uint32_t i=0;
+      
+      for (std::list<write_queue_entry_t *>::iterator it=_queue->begin();
+           it!=_queue->end();
+           ++it)
+        {
+          log_printf(TRACE,Write_queue,FUNCTION,"  [%d] %.2d %.2d %.2d, %.4d, %.1d %.4d %.8x, %.1d %.4d %.1d, %.2d %.1d, %.8x",
+                     i,
+                     (*it)->_context_id   ,
+                     (*it)->_front_end_id ,
+                     (*it)->_ooo_engine_id,
+                     (*it)->_packet_id    ,
+                   //(*it)->_operation    ,
+                   //(*it)->_type         ,
+                     (*it)->_write_rd     ,
+                     (*it)->_num_reg_rd   ,
+                     (*it)->_data_rd      ,
+                     (*it)->_write_re     ,
+                     (*it)->_num_reg_re   ,
+                     (*it)->_data_re      ,
+                     (*it)->_exception    ,
+                     (*it)->_no_sequence  ,
+                     (*it)->_address      );
+          i++;
+        }
+    }
+#endif
+
 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     end_cycle ();
 #endif
 
-    log_printf(FUNC,Write_queue,FUNCTION,"End");
+    log_end(Write_queue,FUNCTION);
   };