Changeset 77 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src

Timestamp:

Feb 5, 2008, 5:21:20 PM (16 years ago)

Author:

rosiere

Message:

• Add two component :
  • network between read unit and execute unit
  • network between execute unit and write unit
• remove parameters "nb_operation" and "nb_type"
• in write_queue add the special case : load_speculative

Location:

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

Files:

• Parameters.cpp (modified) (5 diffs)
• Parameters_print.cpp (modified) (1 diff)
• Write_queue_allocation.cpp (modified) (1 diff)
• Write_queue_deallocation.cpp (modified) (1 diff)
• Write_queue_transition.cpp (modified) (2 diffs)

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

@@ -29 +29 @@
                           uint32_t size_special_data  ,
                           uint32_t nb_special_register,
-                          uint32_t nb_operation       ,
-                          uint32_t nb_type            ,
                           uint32_t nb_bypass_write    ):
     _size_queue              (size_queue         ),
@@ -41 +39 @@
     _size_special_data       (size_special_data  ),
     _nb_special_register     (nb_special_register),
-    _nb_operation            (nb_operation       ),
-    _nb_type                 (nb_type            ),
     _nb_bypass_write         (nb_bypass_write    ),
 
@@ -54 +50 @@
     _size_general_register   (log2(_nb_general_register)),
     _size_special_register   (log2(_nb_special_register)),
-    _size_operation          (log2(_nb_operation       )),
-    _size_type               (log2(_nb_type            )),
 
     _have_port_context_id    (_size_context_id    > 0),
@@ -79 +73 @@
     _size_special_data       (param._size_special_data      ),
     _nb_special_register     (param._nb_special_register    ),
-    _nb_operation            (param._nb_operation           ),
-    _nb_type                 (param._nb_type                ),
     _nb_bypass_write         (param._nb_bypass_write        ),
 
@@ -92 +84 @@
     _size_general_register   (param._size_general_register  ),
     _size_special_register   (param._size_special_register  ),
-    _size_operation          (param._size_operation         ),
-    _size_type               (param._size_type              ),
 
     _have_port_context_id    (param._have_port_context_id   ),

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

@@ -37 +37 @@
     xml.singleton_begin("size_special_data  "); xml.attribut("value",toString(_size_special_data  )); xml.singleton_end();
     xml.singleton_begin("nb_special_register"); xml.attribut("value",toString(_nb_special_register)); xml.singleton_end();
-    xml.singleton_begin("nb_operation       "); xml.attribut("value",toString(_nb_operation       )); xml.singleton_end();
-    xml.singleton_begin("nb_type            "); xml.attribut("value",toString(_nb_type            )); xml.singleton_end();
     xml.singleton_begin("nb_bypass_write    "); xml.attribut("value",toString(_nb_bypass_write    )); xml.singleton_end();
     xml.balise_close();

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

@@ -60 +60 @@
        ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_PACKET_ID    ,"packet_id"    ,Tpacket_t         ,_param->_size_packet_id        );
 //     ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_OPERATION    ,"operation"    ,Toperation_t      ,_param->_size_operation        );
-//     ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_TYPE         ,"type"         ,Ttype_t           ,_param->_size_type             );
+       ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_TYPE         ,"type"         ,Ttype_t           ,_param->_size_type             );
        ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_WRITE_RD     ,"write_rd"     ,Tcontrol_t        ,1                              );
        ALLOC_SIGNAL_IN ( in_WRITE_QUEUE_IN_NUM_REG_RD   ,"num_reg_rd"   ,Tgeneral_address_t,_param->_size_general_register );

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

@@ -41 +41 @@
         delete      in_WRITE_QUEUE_IN_PACKET_ID    ;
 //      delete      in_WRITE_QUEUE_IN_OPERATION    ;
-//      delete      in_WRITE_QUEUE_IN_TYPE         ;
+        delete      in_WRITE_QUEUE_IN_TYPE         ;
         delete      in_WRITE_QUEUE_IN_WRITE_RD     ;
         delete      in_WRITE_QUEUE_IN_NUM_REG_RD   ;

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

@@ -53 +53 @@
                (_param->_have_port_packet_id    )?PORT_READ(in_WRITE_QUEUE_IN_PACKET_ID    ):0,
              //PORT_READ(in_WRITE_QUEUE_IN_OPERATION    ),
-             //PORT_READ(in_WRITE_QUEUE_IN_TYPE         ),
+               PORT_READ(in_WRITE_QUEUE_IN_TYPE         ),
                PORT_READ(in_WRITE_QUEUE_IN_WRITE_RD     ),
                PORT_READ(in_WRITE_QUEUE_IN_NUM_REG_RD   ),
@@ -67 +67 @@
           }
 
-        // Test if pop
-        if (internal_WRITE_QUEUE_OUT_VAL and PORT_READ(in_WRITE_QUEUE_OUT_ACK))
+        // Test if pop :
+        //  * transaction on write_queue_out interface
+        //  * have a speculative load and all register is write in registerfile
+        if ( (internal_WRITE_QUEUE_OUT_VAL and PORT_READ(in_WRITE_QUEUE_OUT_ACK)) or
+             ((_queue->empty() == false)                                         and
+              (_queue->front()->_type      == TYPE_MEMORY)                       and
+              (_queue->front()->_exception == EXCEPTION_MEMORY_LOAD_SPECULATIVE) and
+              (_queue->front()->_write_rd  == 0)                                 and
+              (_queue->front()->_write_re  == 0)))
           {
             delete _queue->front();