Changeset 87 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src

Timestamp:

May 15, 2008, 9:23:42 PM (16 years ago)

Author:

rosiere

Message:

Test Decod and Decod_unit.

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src

Files:

• Decod_genMealy.cpp (modified) (6 diffs)
• Decod_transition.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (2 diffs)
• Parameters_msg_error.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp

@@ -48 +48 @@
         internal_CONTEXT_ADDRESS_PREVIOUS [i] = reg_CONTEXT_ADDRESS_PREVIOUS [i];
         internal_CONTEXT_IS_DELAY_SLOT    [i] = reg_CONTEXT_IS_DELAY_SLOT    [i];
-
+        
         can_continue                      [i] = PORT_READ(in_CONTEXT_DECOD_ENABLE [i]);
         can_continue_next                 [i] = PORT_READ(in_CONTEXT_DECOD_ENABLE [i]);
@@ -57 +57 @@
     //-----------------------------------
     // scan all decod "slot_out"
+    log_printf(TRACE,Decod,FUNCTION,"KANE LIVE");    
     std::list<select_t>::iterator it=select.begin();
     for (uint32_t i=0; i<_param->_nb_inst_decod; i++)
@@ -64 +65 @@
                (context_event_val == false)) // Have not a context_event (spr_access, exception, ...)
           {
+            log_printf(TRACE,Decod,FUNCTION,"loop");    
+
             predict_val [i] = false;
-            context_event_val = false;
 
             Tcontext_t x = it->_context ;
@@ -123 +125 @@
                 if (type == TYPE_BRANCH)
                   {
+                    log_printf(TRACE,Decod,FUNCTION,"  * type is branch");
+
                     predict_val [i]     = ifetch_ack  [x][y] // and decod_val [i]
                       ;
@@ -173 +177 @@
                 if (have_transaction)
                   {
-#ifdef STATISTICS
-                    (*_stat_sum_inst_decod) ++;
-#endif
                     internal_CONTEXT_ADDRESS_PREVIOUS [x] = addr;
                     internal_CONTEXT_IS_DELAY_SLOT    [x] = (type == TYPE_BRANCH); // next is a delay slot if current have branch type
@@ -182 +183 @@
                 can_continue [x] &= have_transaction; // to have a in order decod !!! if a previous instruction can decod, also next instruction can't decod.
               }
+
+            log_printf(TRACE,Decod,FUNCTION,"  - num_(decod, context, fetch) : %d %d %d",i, x, y);
+            log_printf(TRACE,Decod,FUNCTION,"    - ifetch_ack        : %d",ifetch_ack  [x][y]);
+            log_printf(TRACE,Decod,FUNCTION,"    - context_event_val : %d",context_event_val );
+            log_printf(TRACE,Decod,FUNCTION,"    - predict_val       : %d",predict_val [i]   );
+            log_printf(TRACE,Decod,FUNCTION,"    - decod_val         : %d",decod_val   [i]   );
             
             it ++;
           }
       }
-
     //-----------------------------------
     // Write output

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_transition.cpp

@@ -29 +29 @@
 
         for (uint32_t i=0; i<_param->_nb_context; i++)
-          reg_CONTEXT_ADDRESS_PREVIOUS [i] = 0xfc; // 0x100-4. (0x100 : reset address)
+          {
+            reg_CONTEXT_ADDRESS_PREVIOUS [i] = 0xfc; // 0x100-4. (0x100 : reset address)
+            reg_CONTEXT_IS_DELAY_SLOT    [i] = 0;
+          }
       }
     else
@@ -94 +97 @@
           if (internal_CONTEXT_HAVE_TRANSACTION[i])
             {
+#ifdef STATISTICS
+              (*_stat_sum_inst_decod) ++;
+#endif
+
               reg_CONTEXT_ADDRESS_PREVIOUS [i] = internal_CONTEXT_ADDRESS_PREVIOUS [i];
               reg_CONTEXT_IS_DELAY_SLOT    [i] = internal_CONTEXT_IS_DELAY_SLOT    [i];

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Parameters.cpp

@@ -1 +1 @@
 /*
+
  * $Id$
  *
@@ -53 +54 @@
     _max_nb_inst_fetch                     = max<uint32_t>(nb_inst_fetch,nb_context);
 
-    _size_address_inst                     = size_address-2;
+    _size_address_inst                     = size_general_data-2;
     _size_context_id                       = log2(nb_context          );
     _size_depth                            = log2(nb_branch_speculated);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Parameters_msg_error.cpp

@@ -8 +8 @@
 #include "Behavioural/include/Types.h"
 #include "Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/include/Parameters.h"
+#include "Common/include/Max.h"
 #include <sstream>
 
@@ -42 +43 @@
       test.error(_("nb_context_select must be in [1:nb_context].\n"));
 
+    uint32_t sum_inst_fetch = 0;
+    for (uint32_t i=0; i<_nb_context_select; i++)
+      sum_inst_fetch += max<uint32_t>(_nb_inst_fetch,_nb_context,i+1);
+
+    if (sum_inst_fetch < _nb_inst_decod)
+      test.error(_("The sum of the _nb_context_select most nb_inst_fetch must be greater that _nb_inst_decod"));
+
     if ((_priority != PRIORITY_ROUND_ROBIN))
       test.error(toString(_("Unsupported priority scheme. Supported scheme are : %s.\n"),toString(PRIORITY_ROUND_ROBIN).c_str()));