Changeset 78 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src

Timestamp:

Mar 27, 2008, 11:04:49 AM (16 years ago)

Author:

rosiere

Message:

Add :

• Execute_loop (must be test systemC)
• Prediction
  • Direction : predifined scheme
  • Branch Target Buffer
• iFetch_unit
  • ifetch_queue
  • pc management
• Decod_unit
  • coming soon : support for custom operation
• Rename_unit
  • RAT
  • Free_list
  • Dependence RAW check
  • Load store unit pointer
• New Environnement (hierarchy_memory will remove in a next version)

Modif :

• Manage Custom Operation
• All component in execute_loop to use the new statistics management

Not Finish :

• Return Address Stack
• Environnement

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src

Files:

• Functionnal_unit_allocation.cpp (modified) (3 diffs)
• Functionnal_unit_deallocation.cpp (modified) (2 diffs)
• Functionnal_unit_genMoore.cpp (modified) (1 diff)
• Parameters.cpp (modified) (6 diffs)
• Parameters_msg_error.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_allocation.cpp

@@ -71 +71 @@
        in_EXECUTE_IN_OPERATION     = interface->set_signal_in <Toperation_t      > ("operation"    , _param->_size_operation    );
        in_EXECUTE_IN_TYPE          = interface->set_signal_in <Ttype_t           > ("type"         , _param->_size_type         );
+       in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE = interface->set_signal_in <Tlsq_ptr_t> ("store_queue_ptr_write",log2(_param->_size_store_queue));
+       if (_param->_have_port_load_queue_ptr)
+       in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE  = interface->set_signal_in <Tlsq_ptr_t> ("load_queue_ptr_write" ,log2(_param->_size_load_queue));
        in_EXECUTE_IN_HAS_IMMEDIAT  = interface->set_signal_in <Tcontrol_t        > ("has_immediat" , 1);
        in_EXECUTE_IN_IMMEDIAT      = interface->set_signal_in <Tgeneral_data_t   > ("immediat"     , _param->_size_general_data);
@@ -102 +105 @@
        out_EXECUTE_OUT_PACKET_ID      = interface->set_signal_out<Tpacket_t         > ("packet_id"    ,_param->_size_packet_id    );
      //out_EXECUTE_OUT_OPERATION      = interface->set_signal_out<Toperation_t      > ("operation"    ,_param->_size_operation    );
-     //out_EXECUTE_OUT_TYPE           = interface->set_signal_out<Ttype_t           > ("type"         ,_param->_size_type         );
+       out_EXECUTE_OUT_TYPE           = interface->set_signal_out<Ttype_t           > ("type"         ,_param->_size_type         );
        out_EXECUTE_OUT_WRITE_RD       = interface->set_signal_out<Tcontrol_t        > ("write_rd"     ,1);
        out_EXECUTE_OUT_NUM_REG_RD     = interface->set_signal_out<Tgeneral_address_t> ("num_reg_rd"   ,_param->_size_general_register);
@@ -111 +114 @@
        out_EXECUTE_OUT_EXCEPTION      = interface->set_signal_out<Texception_t      > ("exception"    ,_param->_size_exception);
        out_EXECUTE_OUT_NO_SEQUENCE    = interface->set_signal_out<Tcontrol_t        > ("no_sequence"  ,1);
-       out_EXECUTE_OUT_ADDRESS        = interface->set_signal_out<Tgeneral_data_t   > ("address     " ,_param->_size_general_data);
+       out_EXECUTE_OUT_ADDRESS        = interface->set_signal_out<Tgeneral_data_t   > ("address"      ,_param->_size_general_data);
      }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_deallocation.cpp

@@ -41 +41 @@
         delete  in_EXECUTE_IN_OPERATION     ;
         delete  in_EXECUTE_IN_TYPE          ;
+        delete  in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE;
+        if (_param->_have_port_load_queue_ptr)
+        delete  in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE ;
         delete  in_EXECUTE_IN_HAS_IMMEDIAT  ;
         delete  in_EXECUTE_IN_IMMEDIAT      ;
@@ -62 +65 @@
         delete out_EXECUTE_OUT_PACKET_ID      ; 
       //delete out_EXECUTE_OUT_OPERATION      ; 
-      //delete out_EXECUTE_OUT_TYPE           ; 
+        delete out_EXECUTE_OUT_TYPE           ; 
         delete out_EXECUTE_OUT_WRITE_RD       ; 
         delete out_EXECUTE_OUT_NUM_REG_RD     ; 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_genMoore.cpp

@@ -37 +37 @@
     PORT_WRITE(out_EXECUTE_OUT_PACKET_ID    ,_execute_operation->_packet_id    );
   //PORT_WRITE(out_EXECUTE_OUT_OPERATION    ,_execute_operation->_operation    );
-  //PORT_WRITE(out_EXECUTE_OUT_TYPE         ,_execute_operation->_type         );
+    PORT_WRITE(out_EXECUTE_OUT_TYPE         ,_execute_operation->_type         );
     PORT_WRITE(out_EXECUTE_OUT_WRITE_RD     ,_execute_operation->_write_rd     );
     PORT_WRITE(out_EXECUTE_OUT_NUM_REG_RD   ,_execute_operation->_num_reg_rd   );

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters.cpp

@@ -28 +28 @@
                           uint32_t           size_special_data  ,
                           uint32_t           nb_special_register,
+                          uint32_t           size_store_queue   ,
+                          uint32_t           size_load_queue    ,
                           execute_timing_t** timing             ,
                           morpheo::behavioural::custom::custom_information_t (*get_custom_information) (uint32_t)) :
@@ -38 +40 @@
     _size_special_data       (size_special_data     ),
     _nb_special_register     (nb_special_register   ),
-    
+    _size_store_queue        (size_store_queue      ),
+    _size_load_queue         (size_load_queue       ),
+
     _size_context_id         (log2(nb_context      )),
     _size_front_end_id       (log2(nb_front_end    )),
     _size_ooo_engine_id      (log2(nb_ooo_engine   )),
     _size_packet_id          (log2(nb_packet       )),
-    _size_general_register   (log2(_size_general_register)),
-    _size_special_register   (log2(_size_special_register)),
+    _size_general_register   (log2(nb_general_register)),
+    _size_special_register   (log2(nb_special_register)),
 
     _have_port_context_id    (_size_context_id    > 0),
@@ -50 +54 @@
     _have_port_ooo_engine_id (_size_ooo_engine_id > 0),
     _have_port_packet_id     (_size_packet_id     > 0),
+    _have_port_load_queue_ptr(_size_load_queue    > 1),
 
     _have_groupe_MAC         ( (timing[TYPE_SPECIAL][OPERATION_SPECIAL_L_MAC  ]._latence > 0) or
@@ -58 +63 @@
 
     _timing                 = timing;
-    _get_custom_information = get_custom_information;
+
+    if (get_custom_information == NULL)
+      _get_custom_information = &(morpheo::behavioural::custom::default_get_custom_information);
+    else
+      _get_custom_information = get_custom_information;
 
     test();
@@ -76 +85 @@
     _size_special_data       (param._size_special_data      ),
     _nb_special_register     (param._nb_special_register    ),
+    _size_store_queue        (param._size_store_queue       ),
+    _size_load_queue         (param._size_load_queue        ),
 
     _size_context_id         (param._size_context_id        ),
@@ -88 +99 @@
     _have_port_ooo_engine_id (param._have_port_ooo_engine_id),
     _have_port_packet_id     (param._have_port_packet_id    ),
+    _have_port_load_queue_ptr(param._have_port_load_queue_ptr),
 
     _have_groupe_MAC         (param._have_groupe_MAC        )

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters_msg_error.cpp

@@ -22 +22 @@
 #undef  FUNCTION
 #define FUNCTION "Functionnal_unit::msg_error"
-  std::string Parameters::msg_error(void)
+  Parameters_test Parameters::msg_error(void)
   {
     log_printf(FUNC,Functionnal_unit,FUNCTION,"Begin");
 
-    std::string msg = "";
+    Parameters_test test("Functionnal_unit");
 
     for (uint32_t i=0; i<_nb_type; i++)
       for (uint32_t j=0; j<_nb_operation; j++)
         if (_timing[i][j]._delay != _timing[i][j]._latence)
-          msg = "  - For the type '"+toString(i)+"', and the operation '"+toString(j)+"', the delay and the latence must be equal.";
+          test.error("For the type '"+toString(i)+"', and the operation '"+toString(j)+"', the delay and the latence must be equal.");
 
     if (_have_groupe_MAC and ((_timing[TYPE_SPECIAL][OPERATION_SPECIAL_L_MAC  ]._latence == 0) or
                               (_timing[TYPE_SPECIAL][OPERATION_SPECIAL_L_MACRC]._latence == 0) or
                               (_timing[TYPE_SPECIAL][OPERATION_SPECIAL_L_MSB  ]._latence == 0)))
-      msg = "  - The functionnal unit implement a MAC unit, the latence to operation OPERATION_ALU_L_MAC, OPERATION_ALU_L_MACRC and OPERATION_ALU_L_MSB must be higher than 0.";
-
-    return msg;
+      test.error("The functionnal unit implement a MAC unit, the latence to operation OPERATION_ALU_L_MAC, OPERATION_ALU_L_MACRC and OPERATION_ALU_L_MSB must be higher than 0.");
 
     log_printf(FUNC,Functionnal_unit,FUNCTION,"End");
+
+    return test;
   };