Changeset 65

Timestamp:

Dec 5, 2007, 1:40:16 PM (17 years ago)

Author:

rosiere

Message:

register_unit : systemc et VHDL ok

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural

Files:

• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/configuration.cfg (deleted)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/configuration.cfg.save (deleted)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/configuration_min.cfg (added)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/configuration_mono_context.cfg (added)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/configuration_multi_context.cfg (added)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/src/test.cpp (modified) (1 diff)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters.cpp (modified) (1 diff)
• Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp (modified) (6 diffs)
• Generic/RegisterFile/RegisterFile_Multi_Banked/SelfTest/Makefile.mkf (deleted)
• Generic/Select/Select_Priority_Fixed/SelfTest/Makefile.mkf (deleted)
• include/Signal.h (modified) (2 diffs)
• include/Vhdl.h (modified) (2 diffs)
• src/Component_port_map.cpp (modified) (2 diffs)
• src/Component_vhdl_instance.cpp (modified) (2 diffs)
• src/Signal.cpp (modified) (2 diffs)
• src/Signal_get_connect_from_signal.cpp (modified) (1 diff)
• src/Signal_get_connect_to_signal.cpp (modified) (1 diff)
• src/Signal_link.cpp (modified) (3 diffs)
• src/Signal_set_size.cpp (added)
• src/Vhdl_set_body_component_port_map.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/SelfTest/src/test.cpp

@@ -374 +374 @@
   LABEL("Initialisation");
 
+  in_NRESET->write(0);
+  SC_START(5);
+  in_NRESET->write(1);
+
   for (uint32_t i=0; i<_param->_nb_gpr_read ; i++)
     in_GPR_READ_VAL  [i]->write(0);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters.cpp

@@ -58 +58 @@
 
     _size_gpr_address = log2(nb_general_register [0]);
-    
+
     for (uint32_t i=1; i<nb_ooo_engine; i++)
-      if (log2(nb_general_register [i]) > _size_gpr_address)
-        _size_gpr_address = log2(nb_general_register [i]);
+      {
+        uint32_t new_size = log2(nb_general_register [i]);
+        if (new_size > _size_gpr_address)
+          _size_gpr_address = new_size;
+      }
 
     _size_spr_address = log2(nb_special_register [0]);
-    
+
     for (uint32_t i=1; i<nb_ooo_engine; i++)
-      if (log2(nb_special_register [i]) > _size_spr_address)
-        _size_spr_address = log2(nb_special_register [i]);
+      {
+        uint32_t new_size = log2(nb_special_register [i]);
+        if (new_size > _size_spr_address)
+          _size_spr_address = new_size;
+      }
+
 
     _param_gpr         = new morpheo::behavioural::generic::registerfile::Parameters * [_nb_ooo_engine];

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp

@@ -72 +72 @@
         if (_param->_have_port_ooo_engine_id == true)
           in_GPR_READ_OOO_ENGINE_ID [i]= interface->set_signal_in <Tcontext_t        > ("ooo_engine_id" , log2(_param->_nb_ooo_engine));
-        in_GPR_READ_NUM_REG       [i]= interface->set_signal_in <Tgeneral_address_t> ("num_reg"       , log2(_param->_size_gpr_address));
+        in_GPR_READ_NUM_REG       [i]= interface->set_signal_in <Tgeneral_address_t> ("num_reg"       , _param->_size_gpr_address);
         out_GPR_READ_DATA          [i]= interface->set_signal_out<Tgeneral_data_t   > ("data"          , _param->_size_general_data);
         out_GPR_READ_DATA_VAL      [i]= interface->set_signal_out<Tcontrol_t        > ("data_val"      , 1);
@@ -99 +99 @@
         if (_param->_have_port_ooo_engine_id == true)
           in_GPR_WRITE_OOO_ENGINE_ID [i]= interface->set_signal_in <Tcontext_t        > ("ooo_engine_id" , log2(_param->_nb_ooo_engine));
-        in_GPR_WRITE_NUM_REG       [i]= interface->set_signal_in <Tgeneral_address_t> ("num_reg"       , log2(_param->_size_gpr_address));
+        in_GPR_WRITE_NUM_REG       [i]= interface->set_signal_in <Tgeneral_address_t> ("num_reg"       , _param->_size_gpr_address);
         in_GPR_WRITE_DATA          [i]= interface->set_signal_in <Tgeneral_data_t   > ("data"          , _param->_size_general_data);
       }
@@ -126 +126 @@
         if (_param->_have_port_ooo_engine_id == true)
           in_SPR_READ_OOO_ENGINE_ID [i]= interface->set_signal_in <Tcontext_t        > ("ooo_engine_id" , log2(_param->_nb_ooo_engine));
-        in_SPR_READ_NUM_REG       [i]= interface->set_signal_in <Tspecial_address_t> ("num_reg"       , log2(_param->_size_spr_address));
+        in_SPR_READ_NUM_REG       [i]= interface->set_signal_in <Tspecial_address_t> ("num_reg"       , _param->_size_spr_address);
         out_SPR_READ_DATA          [i]= interface->set_signal_out<Tspecial_data_t   > ("data"          , _param->_size_special_data);
         out_SPR_READ_DATA_VAL      [i]= interface->set_signal_out<Tcontrol_t        > ("data_val"      , 1);
@@ -153 +153 @@
         if (_param->_have_port_ooo_engine_id == true)
           in_SPR_WRITE_OOO_ENGINE_ID [i]= interface->set_signal_in <Tcontext_t        > ("ooo_engine_id" , log2(_param->_nb_ooo_engine));
-        in_SPR_WRITE_NUM_REG       [i]= interface->set_signal_in <Tspecial_address_t> ("num_reg"       , log2(_param->_size_spr_address));
+        in_SPR_WRITE_NUM_REG       [i]= interface->set_signal_in <Tspecial_address_t> ("num_reg"       , _param->_size_spr_address);
         in_SPR_WRITE_DATA          [i]= interface->set_signal_in <Tspecial_data_t   > ("data"          , _param->_size_special_data);
       }
@@ -190 +190 @@
             out_INSERT_ROB_ACK        [i][j] = interface->set_signal_valack_out (ACK);
             in_INSERT_ROB_RD_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("rd_use"    , 1);
-            in_INSERT_ROB_RD_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_num_reg", log2(_param->_size_gpr_address));
+            in_INSERT_ROB_RD_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_num_reg", _param->_size_gpr_address);
             in_INSERT_ROB_RE_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("re_use"    , 1);
-            in_INSERT_ROB_RE_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_num_reg", log2(_param->_size_spr_address));
+            in_INSERT_ROB_RE_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_num_reg", _param->_size_spr_address);
              
           }
@@ -238 +238 @@
             out_RETIRE_ROB_ACK            [i][j] = interface->set_signal_valack_out (ACK);
             in_RETIRE_ROB_RD_OLD_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("rd_old_use"    , 1);
-            in_RETIRE_ROB_RD_OLD_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_old_num_reg", log2(_param->_size_gpr_address));
+            in_RETIRE_ROB_RD_OLD_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_old_num_reg", _param->_size_gpr_address);
             in_RETIRE_ROB_RE_OLD_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("re_old_use"    , 1);
-            in_RETIRE_ROB_RE_OLD_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_old_num_reg", log2(_param->_size_spr_address));
+            in_RETIRE_ROB_RE_OLD_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_old_num_reg", _param->_size_spr_address);
             in_RETIRE_ROB_RD_NEW_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("rd_new_use"    , 1);
-            in_RETIRE_ROB_RD_NEW_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_new_num_reg", log2(_param->_size_gpr_address));
+            in_RETIRE_ROB_RD_NEW_NUM_REG [i][j] = interface->set_signal_in <Tgeneral_address_t> ("rd_new_num_reg", _param->_size_gpr_address);
             in_RETIRE_ROB_RE_NEW_USE     [i][j] = interface->set_signal_in <Tcontrol_t        > ("re_new_use"    , 1);
-            in_RETIRE_ROB_RE_NEW_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_new_num_reg", log2(_param->_size_spr_address));
+            in_RETIRE_ROB_RE_NEW_NUM_REG [i][j] = interface->set_signal_in <Tspecial_address_t> ("re_new_num_reg", _param->_size_spr_address);
           }
       }

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h

@@ -55 +55 @@
   private   : const string          _name          ;
   private   : const direction_t     _direction     ;
-  private   : const uint32_t        _size          ;
   private   : const presence_port_t _presence_port ;
+  private   :       uint32_t        _size          ;
 
   private   : Signal *              _connect_to_signal;   // the actual implementaion, this signal link with one signal (but if signal is an output, it can be connect with many signal ...)
@@ -81 +81 @@
   public    : string            get_name                (void);
   public    : uint32_t          get_size                (void);
+  public    : void              set_size                (uint32_t size);
+  public    : void              set_size_max            (uint32_t size);
+
   public    : Signal *          get_connect_to_signal   (void);
   public    : Signal *          get_connect_from_signal (void);

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Vhdl.h

@@ -18 +18 @@
 #include "Common/include/ToString.h"
 #include "Common/include/Debug.h"
+#include "Common/include/ErrorMorpheo.h"
 
 using namespace std;
@@ -127 +128 @@
   public    : void             set_body_component_port_map (list<string> & list_port_map      ,
                                                             string         name_port          ,
-                                                            string         name_signal        );
+                                                            uint32_t       size_port          ,
+                                                            string         name_signal        ,
+                                                            uint32_t       size_signal        );
 
   private   : string           get_library_ieee            (uint32_t    depth                 );

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_port_map.cpp

@@ -88 +88 @@
           }
 
-        signal_dest  = signal_internal (entity_productor, signal_productor);
+        signal_dest= signal_internal (entity_productor, signal_productor);
+        signal_dest->set_size_max(signal_src->get_size());
+
         dest_is_port = false;
       }
@@ -131 +133 @@
     if (signal_src->get_direction() != OUT)
       throw (ErrorMorpheo ("<Component::port_map> the direction of the signal '"+signal_src->get_name()+"' must be OUT."));
+
+    Signal * signal_dest;
+
+    signal_dest= signal_internal (entity_src, signal_src);
+    signal_dest->set_size_max(signal_src->get_size());
     
     try
       {
-        signal_src->link(signal_internal (entity_src, signal_src),
+        signal_src->link(signal_dest,
                          false);
       }

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_vhdl_instance.cpp

@@ -140 +140 @@
 //                              else
 //                                {
-//                                  cout << "Kane à dit : " << signal_dest->get_name() << endl;
 //                                  // Test if output
 //                                  if (signal_dest->get_direction() == OUT)
@@ -156 +155 @@
 //                                    }                             
 //                                }
-                                
-                                  vhdl->set_body_component_port_map (list_port_map, name_src, name_dest);
+                                  
+                                  vhdl->set_body_component_port_map (list_port_map,
+                                                                     name_src , signal_src ->get_size(),
+                                                                     name_dest, signal_dest->get_size() );
                                 }
                               ++k;

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal.cpp

@@ -17 +17 @@
     _name          (name         ),
     _direction     (direction    ),
-    _size          (size         ),
     _presence_port ((direction==INTERNAL)?PORT_VHDL_NO_TESTBENCH_NO:presence_port)
   {
     log_printf(FUNC,Behavioural,"Signal","Begin");
-    _is_allocate   = false;
-    _is_map_as_src = false;
-    _is_map_as_dest= false;
+    _size                = size;
+    _is_allocate         = false;
+    _is_map_as_src       = false;
+    _is_map_as_dest      = false;
     _connect_from_signal = NULL;
     _connect_to_signal   = NULL;
-    _sc_signal     = NULL;
-    _sc_signal_map = NULL;
-    _type_info     = UNKNOW;
+    _sc_signal           = NULL;
+    _sc_signal_map       = NULL;
+    _type_info           = UNKNOW;
 #ifdef VHDL_TESTBENCH
-    _list_value    = new list<string>;
+    _list_value          = new list<string>;
 #endif
     log_printf(FUNC,Behavioural,"Signal","End");
@@ -38 +38 @@
     _name          (signal._name         ),
     _direction     (signal._direction    ),
-    _size          (signal._size         ),
     _presence_port (signal._presence_port)
   {
     log_printf(FUNC,Behavioural,"Signal (copy)","Begin");
-    _is_allocate    = signal._is_allocate;
-    _is_map_as_src  = signal._is_map_as_src ;
-    _is_map_as_dest = signal._is_map_as_dest;
+    _size                = signal._size;
+    _is_allocate         = signal._is_allocate;
+    _is_map_as_src       = signal._is_map_as_src ;
+    _is_map_as_dest      = signal._is_map_as_dest;
     _connect_from_signal = signal._connect_from_signal;
     _connect_to_signal   = signal._connect_to_signal;
-    _sc_signal      = signal._sc_signal    ;
-    _sc_signal_map  = signal._sc_signal_map;
-    _type_info      = signal._type_info ;
+    _sc_signal           = signal._sc_signal    ;
+    _sc_signal_map       = signal._sc_signal_map;
+    _type_info           = signal._type_info ;
 #ifdef VHDL_TESTBENCH
-    _list_value     = signal._list_value;
+    _list_value          = signal._list_value;
 #endif
     log_printf(FUNC,Behavioural,"Signal (copy)","End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_get_connect_from_signal.cpp

@@ -17 +17 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
     Signal * _return = _connect_from_signal;
+
+    while ((_return != NULL) and
+           (_return->get_direction () == INTERNAL))
+      _return = _return->get_connect_from_signal();
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_get_connect_to_signal.cpp

@@ -17 +17 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
     Signal * _return = _connect_to_signal;
+
+    while ((_return != NULL) and
+           (_return->get_direction () == INTERNAL))
+      _return = _return->get_connect_to_signal();
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_link.cpp

@@ -29 +29 @@
       throw (ErrorMorpheo ("<Signal::mapping> Can't mapping signal \""+_name+"\" with \""+signal_dest->get_name()+"\", because the first signal is already mapped."));
 
-    //     log_printf(TRACE,Behavioural,FUNCTION, " * sc_signal (before) %.8x - %.8x", (uint32_t)(_sc_signal_map), (uint32_t)(signal_dest->_sc_signal_map));
-
     // List of all case
     //
@@ -55 +53 @@
     signal_dest->_is_map_as_dest      = true;
 
+    // an internal signal and port can't be a source. 
+    // also, to fill the connect_to_signal's field 
+    if ((signal_src->_direction == OUT) and 
+        (signal_dest->_direction == INTERNAL))
+      {
+        signal_dest->_connect_to_signal = signal_src;
+      }
+
     // vhdl_testbench : to read an output producte by a internal component
     // TODO : à vérifier !!!!!!!!!!!!
@@ -63 +69 @@
     connect (signal_dest);
 
-    //  log_printf(TRACE,Behavioural,FUNCTION, " * sc_signal (after ) %.8x - %.8x", (uint32_t)(_sc_signal_map), (uint32_t)(signal_dest->_sc_signal_map));
-    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_body_component_port_map.cpp

@@ -20 +20 @@
   void Vhdl::set_body_component_port_map (list<string> & list_port_map      ,
                                           string         name_port          ,
-                                          string         name_signal        )
+                                          uint32_t       size_port          ,
+                                          string         name_signal        ,
+                                          uint32_t       size_signal        )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(list_port_map, name_port + "\t=>" + name_signal);
+
+    if (size_port > size_signal)
+      throw (ErrorMorpheo ("<Vhdl::set_body_component_port_map> size of port '"+name_port+"' ("+toString(size_port)+") is greater than size of signal '"+name_signal+"' ("+toString(size_signal)+")."));
+
+    string str_size = "";
+
+    // test if size is different (possible if multi write
+    if (size_port != size_signal)
+      str_size = std_logic_range(size_port);
+    
+    set_list(list_port_map, name_port + "\t=>" + name_signal+str_size);
+      
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };