Changeset 112 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim

Timestamp:

Mar 18, 2009, 11:36:26 PM (15 years ago)

Author:

rosiere

Message:

1) Stat_list : fix retire old and new register bug
2) Stat_list : remove read_counter and valid flag, because validation of destination is in retire step (not in commit step)
3) Model : add class Model (cf Morpheo.sim)
4) Allocation : alloc_interface_begin and alloc_interface_end to delete temporary array.
5) Script : add distexe.sh
6) Add Comparator, Multiplier, Divider. But this component are not implemented
7) Software : add Dhrystone

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim

Files:

• Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_allocation.cpp (modified) (4 diffs)
• Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_deallocation.cpp (modified) (2 diffs)
• src/Victim_allocation.cpp (modified) (2 diffs)
• src/Victim_deallocation.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_allocation.cpp

@@ -2 +2 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -28 +28 @@
     _interfaces = entity->set_interfaces();
 
-    // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
       Interface_fifo * interface = _interfaces->set_interface(""
@@ -40 +40 @@
     }
 
-    // ~~~~~[ Interface : "access" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~[ Interface : "access" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
-      ALLOC1_INTERFACE("access",IN,WEST, "Access", _param->_nb_access);
+      ALLOC1_INTERFACE_BEGIN("access",IN,WEST, "Access", _param->_nb_access);
 
       ALLOC1_VALACK_IN ( in_ACCESS_VAL    ,VAL);
@@ -50 +50 @@
       ALLOC1_SIGNAL_IN ( in_ACCESS_ENTITY ,"entity" ,Tentity_t ,log2(_param->_nb_entity   ));
       ALLOC1_SIGNAL_OUT(out_ACCESS_VICTIM ,"victim" ,Tentity_t ,log2(_param->_nb_entity   ));
+
+      ALLOC1_INTERFACE_END(_param->_nb_access);
     }
 
     if (usage_is_set(_usage,USE_SYSTEMC))
       {
-    // -----[ Register ]---------------------------------------------------
-    reg_TABLE = new entry_t *  [_param->_size_table];
-
-    for (uint32_t i=0; i<_param->_size_table; i++)
-      reg_TABLE [i] = new entry_t (_param->_nb_entity);
-    
-    // -----[ Internal ]---------------------------------------------------
-    internal_ACCESS_ACK    = new Tcontrol_t [_param->_nb_access];
-    internal_ACCESS_VICTIM = new Tentity_t  [_param->_nb_access];
+        // -----[ Register ]---------------------------------------------------
+        reg_TABLE = new entry_t *  [_param->_size_table];
+        
+        for (uint32_t i=0; i<_param->_size_table; i++)
+          reg_TABLE [i] = new entry_t (_param->_nb_entity);
+        
+        // -----[ Internal ]---------------------------------------------------
+        ALLOC1(internal_ACCESS_ACK   ,Tcontrol_t,_param->_nb_access);
+        ALLOC1(internal_ACCESS_VICTIM,Tentity_t ,_param->_nb_access);
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_deallocation.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Victim/Victim_Pseudo_LRU/include/Victim_Pseudo_LRU.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -20 +21 @@
     delete     in_CLOCK;
     delete     in_NRESET;
-    // -----[ Interface access ]-------------------------------------------
-    delete []  in_ACCESS_VAL    ;
-    delete [] out_ACCESS_ACK    ;
-    if (_param->_size_address>1)
-    delete []  in_ACCESS_ADDRESS;
-    delete []  in_ACCESS_HIT    ;
-    delete []  in_ACCESS_ENTITY ;
-    delete [] out_ACCESS_VICTIM ;
-    
-    // -----[ Register ]---------------------------------------------------
-    delete [] reg_TABLE;
 
-    // -----[ Internal ]---------------------------------------------------
-    delete [] internal_ACCESS_ACK   ;
-    delete [] internal_ACCESS_VICTIM;
+    DELETE1_SIGNAL( in_ACCESS_VAL    ,_param->_nb_access,1);
+    DELETE1_SIGNAL(out_ACCESS_ACK    ,_param->_nb_access,1);
+    DELETE1_SIGNAL( in_ACCESS_HIT    ,_param->_nb_access,1);
+    DELETE1_SIGNAL( in_ACCESS_ADDRESS,_param->_nb_access,log2(_param->_size_address));
+    DELETE1_SIGNAL( in_ACCESS_ENTITY ,_param->_nb_access,log2(_param->_nb_entity   ));
+    DELETE1_SIGNAL(out_ACCESS_VICTIM ,_param->_nb_access,log2(_param->_nb_entity   ));
+
+    DELETE1(reg_TABLE             ,_param->_size_table);
+    DELETE1(internal_ACCESS_ACK   ,_param->_nb_access);
+    DELETE1(internal_ACCESS_VICTIM,_param->_nb_access);
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/src/Victim_allocation.cpp

@@ -31 +31 @@
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
-      __ALLOC_SIGNAL(in_CLOCK ,"in_CLOCK" ,SC_CLOCK          );
-      __ALLOC_SIGNAL(in_NRESET,"in_NRESET",SC_IN (Tcontrol_t));
+      __ALLOC0_SIGNAL(in_CLOCK ,"in_CLOCK" ,SC_CLOCK          );
+      __ALLOC0_SIGNAL(in_NRESET,"in_NRESET",SC_IN (Tcontrol_t));
     }
 
     // ~~~~~[ Interface : "Access" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
-      __ALLOC1_INTERFACE("ACCESS",_param->_nb_access);
+      __ALLOC1_INTERFACE_BEGIN("ACCESS",_param->_nb_access);
 
       __ALLOC1_SIGNAL_IN ( in_ACCESS_VAL    ,"VAL"    ,Tcontrol_t);
@@ -46 +46 @@
       __ALLOC1_SIGNAL_IN ( in_ACCESS_ENTITY ,"ENTITY" ,Tentity_t );
       __ALLOC1_SIGNAL_OUT(out_ACCESS_VICTIM ,"VICTIM" ,Tentity_t );
+
+      __ALLOC1_INTERFACE_END(_param->_nb_access);
     }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/src/Victim_deallocation.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Victim/include/Victim.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {