Changeset 101 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest

Timestamp:

Jan 15, 2009, 6:19:08 PM (15 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

Location:

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

Files:

• config_min.cfg (modified) (1 diff)
• config_size_queue_log2.cfg (modified) (1 diff)
• config_size_queue_no_log2.cfg (modified) (1 diff)
• config_slot_out_size_queue_log2.cfg (modified) (1 diff)
• config_slot_out_size_queue_no_log2.cfg (modified) (1 diff)
• src/main.cpp (modified) (4 diffs)
• src/test.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/config_min.cfg

@@ -3 +3 @@
 1       1       *2      #_size_data 
 0       1       +1      #_nb_port_slot
+0       0       +1      #_have_port_write
+0       0       +1      #_have_port_read

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/config_size_queue_log2.cfg

@@ -3 +3 @@
 32      32      *2      #_size_data 
 0       0       *2      #_nb_port_slot
+1       1       +1      #_have_port_write
+1       1       +1      #_have_port_read

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/config_size_queue_no_log2.cfg

@@ -3 +3 @@
 32      32      *2      #_size_data 
 0       0       *2      #_nb_port_slot
+1       1       +1      #_have_port_write
+1       1       +1      #_have_port_read

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/config_slot_out_size_queue_log2.cfg

@@ -3 +3 @@
 32      32      *2      #_size_data 
 1       8       *2      #_nb_port_slot
+1       1       +1      #_have_port_write
+1       1       +1      #_have_port_read

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/config_slot_out_size_queue_no_log2.cfg

@@ -3 +3 @@
 32      32      *2      #_size_data 
 1       8       *2      #_nb_port_slot
+1       1       +1      #_have_port_write
+1       1       +1      #_have_port_read

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

@@ -8 +8 @@
 #include "Behavioural/Generic/Queue/SelfTest/include/test.h"
 
-#define NB_PARAMS 3
+#define NB_PARAMS 5
 
 void usage (int argc, char * argv[])
@@ -14 +14 @@
   cerr << "<Usage> " << argv[0] << " name_instance list_params" << endl
        << "list_params is :" << endl
-       << " - size_queue   (uint32_t)" << endl
-       << " - size_data    (uint32_t)" << endl
-       << " - nb_port_slot (uint32_t)" << endl
+       << " - size_queue      (uint32_t)" << endl
+       << " - size_data       (uint32_t)" << endl
+       << " - nb_port_slot    (uint32_t)" << endl
+       << " - have_port_write (bool    )" << endl
+       << " - have_port_read  (bool    )" << endl
        << "" << endl;
 
@@ -37 +39 @@
   uint32_t       x = 1;
   
-  const string   name         =      argv[x++];
-  const uint32_t size_queue   = atoi(argv[x++]);
-  const uint32_t size_data    = atoi(argv[x++]);
-  const uint32_t nb_port_slot = atoi(argv[x++]);
-
+  const string   name            =      argv[x++];
+  const uint32_t size_queue      = fromString<uint32_t>(argv[x++]);
+  const uint32_t size_data       = fromString<uint32_t>(argv[x++]);
+  const uint32_t nb_port_slot    = fromString<uint32_t>(argv[x++]);
+  const bool     have_port_write = fromString<bool>(argv[x++]);
+  const bool     have_port_read  = fromString<bool>(argv[x++]);
   try 
     {
@@ -47 +50 @@
         (size_queue,
          size_data ,
-         nb_port_slot
+         nb_port_slot,
+         have_port_write,
+         have_port_read 
         );
       

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

@@ -58 +58 @@
   ALLOC1_SC_SIGNAL(out_SLOT_VAL   ,"out_SLOT_VAL"   ,Tcontrol_t,_param->_nb_port_slot);
   ALLOC1_SC_SIGNAL(out_SLOT_DATA  ,"out_SLOT_DATA"  ,Tdata_t   ,_param->_nb_port_slot);
+  ALLOC0_SC_SIGNAL(out_PTR_WRITE  ,"out_PTR_WRITE"  ,Tptr_t    );
+  ALLOC0_SC_SIGNAL(out_PTR_READ   ,"out_PTR_READ"   ,Tptr_t    );
   
   /********************************************************
@@ -76 +78 @@
   INSTANCE1_SC_SIGNAL(_Queue,out_SLOT_VAL   ,_param->_nb_port_slot);
   INSTANCE1_SC_SIGNAL(_Queue,out_SLOT_DATA  ,_param->_nb_port_slot);
+  if (_param->_have_port_ptr_write)
+  INSTANCE0_SC_SIGNAL(_Queue,out_PTR_WRITE  );
+  if (_param->_have_port_ptr_read )
+  INSTANCE0_SC_SIGNAL(_Queue,out_PTR_READ   );
 
   cout << "<" << name << "> Start Simulation ............" << endl;
@@ -168 +174 @@
   DELETE1_SC_SIGNAL(out_SLOT_VAL   ,_param->_nb_port_slot);
   DELETE1_SC_SIGNAL(out_SLOT_DATA  ,_param->_nb_port_slot);
-
+  DELETE0_SC_SIGNAL(out_PTR_WRITE  );
+  DELETE0_SC_SIGNAL(out_PTR_READ   );
 #endif