Changeset 123 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Timestamp:

Jun 8, 2009, 10:43:30 PM (15 years ago)

Author:

rosiere

Message:

1) Fix performance
2) add auto generation to SPECINT2000
3) add reset in genMoore and genMealy

Location:

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

Files:

• Comparator/src/Comparator_genMealy.cpp (modified) (2 diffs)
• Counter/src/Counter_genMealy.cpp (modified) (1 diff)
• Queue/src/Queue_genMoore.cpp (modified) (3 diffs)
• RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (modified) (1 diff)
• RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_genMealy_read.cpp (modified) (2 diffs)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked.cpp (modified) (1 diff)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_full_crossbar_genMealy_read.cpp (modified) (2 diffs)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_full_crossbar_genMealy_write.cpp (modified) (2 diffs)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_partial_crossbar_genMealy_read.cpp (modified) (2 diffs)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_partial_crossbar_genMealy_write.cpp (modified) (2 diffs)
• Shifter/src/Shifter.cpp (modified) (1 diff)
• Shifter/src/Shifter_genMealy_shift.cpp (modified) (1 diff)
• Sort/src/Sort.cpp (modified) (1 diff)
• Sort/src/Sort_genMealy.cpp (modified) (2 diffs)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_genMealy.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_transition.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Comparator_genMealy.cpp

@@ -21 +21 @@
     log_begin(Comparator,FUNCTION);
 
+    if (PORT_READ(in_NRESET))
+      {
     Tcontrol_t test;
     Tdata_t data_0 = PORT_READ(in_COMPARE_DATA_0);
@@ -71 +73 @@
 
     PORT_WRITE(out_COMPARE_TEST,test);
+      }
 
     log_end(Comparator,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_genMealy.cpp

@@ -18 +18 @@
     log_printf(FUNC,Counter,"genMealy","Begin");
 
+    if (PORT_READ(in_NRESET))
     for (uint32_t i=0; i<_param->_nb_port; i++)
       {

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_genMoore.cpp

@@ -20 +20 @@
     log_printf(FUNC,Queue,FUNCTION,"Begin");
 
+    if (PORT_READ(in_NRESET))
+      {
     //---------------------------------------------
     // Output
@@ -26 +28 @@
     internal_RETIRE_VAL = not _queue_control->empty();
     
-    PORT_WRITE(out_INSERT_ACK , internal_INSERT_ACK);
-    PORT_WRITE(out_RETIRE_VAL , internal_RETIRE_VAL);
     PORT_WRITE(out_RETIRE_DATA,_queue_data[(*_queue_control)[0]]);
 
@@ -49 +49 @@
     if (_param->_have_port_ptr_read )
     PORT_WRITE(out_PTR_READ , _queue_control->ptr_pop ());
+      }
+    else
+      {
+        // Reset
+        internal_INSERT_ACK = 0;
+        internal_RETIRE_VAL = 0;
+
+        for (uint32_t i=0; i<_param->_nb_port_slot; ++i)
+          PORT_WRITE(out_SLOT_VAL  [i], 0);
+      }
+
+    // Write output
+    PORT_WRITE(out_INSERT_ACK , internal_INSERT_ACK);
+    PORT_WRITE(out_RETIRE_VAL , internal_RETIRE_VAL);
+
 
     log_printf(FUNC,Queue,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp

@@ -33 +33 @@
     log_printf(FUNC,RegisterFile_Monolithic,"RegisterFile_Monolithic","Begin");
 
-#if DEBUG_RegisterFile_Monolithic == true
-    log_printf(INFO,RegisterFile_Monolithic,FUNCTION,_("<%s> Parameters"),_name.c_str());
+// #if DEBUG_RegisterFile_Monolithic == true
+//     log_printf(INFO,RegisterFile_Monolithic,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-    std::cout << *param << std::endl;
-#endif    
+//     std::cout << *param << std::endl;
+// #endif    
 
     log_printf(INFO,RegisterFile_Monolithic,"RegisterFile_Monolithic","Allocation");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_genMealy_read.cpp

@@ -22 +22 @@
     log_function(RegisterFile_Monolithic,FUNCTION,_name.c_str());
 
+    if (PORT_READ(in_NRESET))
+      {
     for (uint32_t i=0; i<_param->_nb_port_read; i++)
       {
@@ -73 +75 @@
         PORT_WRITE(out_READ_WRITE_RDATA[i],data);
       }
+      }
 
     log_end(RegisterFile_Monolithic,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked.cpp

@@ -34 +34 @@
     log_printf(FUNC,RegisterFile_Multi_Banked,FUNCTION,"Begin");
 
-#if DEBUG_RegisterFile_Multi_Banked == true
-    log_printf(INFO,RegisterFile_Multi_Banked,FUNCTION,_("<%s> Parameters"),_name.c_str());
+// #if DEBUG_RegisterFile_Multi_Banked == true
+//     log_printf(INFO,RegisterFile_Multi_Banked,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-    std::cout << *param << std::endl;
-#endif    
+//     std::cout << *param << std::endl;
+// #endif    
 
     log_printf(INFO,RegisterFile_Multi_Banked,FUNCTION,"Allocation");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_full_crossbar_genMealy_read.cpp

@@ -23 +23 @@
     log_begin(RegisterFile_Multi_Banked,FUNCTION);
     log_function(RegisterFile_Multi_Banked,FUNCTION,_name.c_str());
+
+    if (PORT_READ(in_NRESET))
+      {
 
     bool read_port_use [_param->_nb_bank][_param->_nb_port_read_by_bank];
@@ -79 +82 @@
         PORT_WRITE(out_READ_ACK [i], ack);
       }
+      }
+    else
+      for (uint32_t i=0; i<_param->_nb_port_read; i++)
+        PORT_WRITE(out_READ_ACK [i], false);
 
     log_end(RegisterFile_Multi_Banked,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_full_crossbar_genMealy_write.cpp

@@ -24 +24 @@
     log_function(RegisterFile_Multi_Banked,FUNCTION,_name.c_str());
 
+    if (PORT_READ(in_NRESET))
+      {
     bool write_port_use [_param->_nb_bank][_param->_nb_port_write_by_bank];
 
@@ -79 +81 @@
         PORT_WRITE(out_WRITE_ACK [i], ack);
       }
+      }
+    else
+      {
+        for (uint32_t i=0; i<_param->_nb_port_write; i++)
+          {
+            internal_WRITE_VAL [i] = 0;
+            PORT_WRITE(out_WRITE_ACK [i], 0);
+          }
+      }
 
     log_end(RegisterFile_Multi_Banked,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_partial_crossbar_genMealy_read.cpp

@@ -24 +24 @@
     log_function(RegisterFile_Multi_Banked,FUNCTION,_name.c_str());
 
+    if (PORT_READ(in_NRESET))
+      {
     bool read_port_use [_param->_nb_bank][_param->_nb_port_read_by_bank];
 
@@ -81 +83 @@
         PORT_WRITE(out_READ_ACK [i], ack);
       }
-
+      }
+    else
+      {
+        for (uint32_t i=0; i<_param->_nb_port_read; i++)
+          PORT_WRITE(out_READ_ACK [i],0);
+      }
     log_end(RegisterFile_Multi_Banked,FUNCTION);
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_partial_crossbar_genMealy_write.cpp

@@ -24 +24 @@
     log_function(RegisterFile_Multi_Banked,FUNCTION,_name.c_str());
 
+    if (PORT_READ(in_NRESET))
+      {
     bool write_port_use [_param->_nb_bank][_param->_nb_port_write_by_bank];
     for (uint32_t i=0; i<_param->_nb_bank; i++)
@@ -81 +83 @@
         PORT_WRITE(out_WRITE_ACK [i], ack);
       }
+      }
+    else
+      {
+        for (uint32_t i=0; i<_param->_nb_port_write; i++)
+          {
+            internal_WRITE_VAL [i] = 0;
+            PORT_WRITE(out_WRITE_ACK [i], 0);
+          }
+      }
 
     log_end(RegisterFile_Multi_Banked,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/src/Shifter.cpp

@@ -32 +32 @@
   {
 
-#if DEBUG_Shifter == true
-    log_printf(INFO,Shifter,FUNCTION,_("<%s> Parameters"),_name.c_str());
+// #if DEBUG_Shifter == true
+//     log_printf(INFO,Shifter,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-    std::cout << *param << std::endl;
-#endif    
+//     std::cout << *param << std::endl;
+// #endif    
 
     allocation ();

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/src/Shifter_genMealy_shift.cpp

@@ -18 +18 @@
   void Shifter::genMealy_shift (void)
   {
+    if (PORT_READ(in_NRESET))
     for (uint32_t i=0; i<_param->_nb_port; i++)
       {

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort.cpp

@@ -35 +35 @@
     log_printf(FUNC,Sort,FUNCTION,"Begin");
 
-#if DEBUG_Sort == true
-    log_printf(INFO,Sort,FUNCTION,_("<%s> Parameters"),_name.c_str());
+// #if DEBUG_Sort == true
+//     log_printf(INFO,Sort,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-    std::cout << *param << std::endl;
-#endif    
+//     std::cout << *param << std::endl;
+// #endif    
 
     log_printf(INFO,Sort,FUNCTION,"Allocation");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_genMealy.cpp

@@ -21 +21 @@
     log_printf(FUNC,Sort,FUNCTION,"Begin");
 
+    if (PORT_READ(in_NRESET))
+      {
     sort_t array [_param->_nb_input];
 
@@ -44 +46 @@
         PORT_WRITE (out_OUTPUT_DATA  [i],array[i].data );
       }
+      }
 
     log_printf(FUNC,Sort,FUNCTION,"End");

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

@@ -32 +32 @@
     log_printf(FUNC,Victim_Pseudo_LRU,"Victim_Pseudo_LRU","Begin");
 
-#if DEBUG_Victim_Pseudo_LRU == true
-    log_printf(INFO,Victim_Pseudo_LRU,FUNCTION,_("<%s> Parameters"),_name.c_str());
+// #if DEBUG_Victim_Pseudo_LRU == true
+//     log_printf(INFO,Victim_Pseudo_LRU,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-    std::cout << *param << std::endl;
-#endif    
+//     std::cout << *param << std::endl;
+// #endif    
 
     log_printf(TRACE,Victim_Pseudo_LRU,"Victim_Pseudo_LRU","Allocation");

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

@@ -17 +17 @@
   void Victim_Pseudo_LRU::genMealy (void)
   {
+    if (PORT_READ(in_NRESET))
     for (uint32_t i=0; i<_param->_nb_access; i++)
       {

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

@@ -22 +22 @@
           {
             Taddress_t address = (_param->_size_table>1)?PORT_READ(in_ACCESS_ADDRESS[i]):0;
-            Tentity_t  entity;
+            Tentity_t  entity  = 0;
 
             if (PORT_READ(in_ACCESS_HIT [i]))