Changeset 41 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select

Timestamp:

Jun 7, 2007, 9:13:47 PM (17 years ago)

Author:

rosiere

Message:

Vhdl_Testbench : Modification du testbench. Maintenant complétement encapsuler dans la classe "Interfaces".
Suppression de la class Vhdl_Testbench dans un avenir proche :D
Suppression du répertoire Configuration.old

Location:

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

Files:

• SelfTest/src/test.cpp (modified) (1 diff)
• include/Select_Priority_Fixed.h (modified) (3 diffs)
• src/Select_Priority_Fixed.cpp (modified) (2 diffs)
• src/Select_Priority_Fixed_allocation.cpp (modified) (3 diffs)
• src/Select_Priority_Fixed_deallocation.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_vhdl_port.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_vhdl_testbench_label.cpp (deleted)
• src/Select_Priority_Fixed_vhdl_testbench_transition.cpp (modified) (1 diff)

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

@@ -90 +90 @@
  
   sc_start(0);
-//_Select_Priority_Fixed->vhdl_testbench_label("Initialisation");
 //cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Initialisation" << endl;
 
-  _Select_Priority_Fixed->vhdl_testbench_label("Loop of Test");
   cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Loop of Test" << endl;
 
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
     {
-      _Select_Priority_Fixed->vhdl_testbench_label("Iteration "+toString(iteration));
-
       entity    = 0;
       bool find = false;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h

@@ -30 +30 @@
 #include "Behavioural/include/Vhdl.h"
 #endif
-#ifdef VHDL_TESTBENCH
-#include "Behavioural/include/Vhdl_Testbench.h"
-#endif
 
 using namespace std;
@@ -59 +56 @@
 #ifdef STATISTICS
   private   : Statistics                     * _stat;
-#endif
-
-#ifdef VHDL_TESTBENCH
-  private   : Vhdl_Testbench                 * _vhdl_testbench;
 #endif
 
@@ -132 +125 @@
   private : void     vhdl_testbench_transition (void);
 #endif
-  public  : void     vhdl_testbench_label      (string label);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed.cpp

@@ -45 +45 @@
                             param_statistics          ,
                             param);
-#endif
-
-#ifdef VHDL_TESTBENCH
-    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Creation of a testbench");
-
-    _vhdl_testbench = new Vhdl_Testbench (_name);
 #endif
 
@@ -100 +94 @@
     log_printf(FUNC,Select_Priority_Fixed,"~Select_Priority_Fixed","Begin");
 
-#ifdef VHDL_TESTBENCH
-    log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Testbench  file");
-
-    // generate the test bench
-    _vhdl_testbench->generate_file();
-    delete _vhdl_testbench;
-#endif
-
 #ifdef STATISTICS
     log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Statistics file");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_allocation.cpp

@@ -17 +17 @@
   void Select_Priority_Fixed::allocation (void)
   {
-    string rename;
-
     log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
 
@@ -27 +25 @@
                                              "Select_Priority_Fixed",
                                              COMBINATORY            );
-
+    
     _interfaces = entity->set_interfaces();
 #else
@@ -37 +35 @@
     Interface_fifo * interface_ = _interfaces->set_interface("", IN  ,WEST, "Generalist interface");
 
-     in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);
+     in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, CLOCK_VHDL_NO);
      in_NRESET       = interface_->set_signal_in  <Tcontrol_t> ("nreset",1);
      in_VAL          = new SC_IN (Tcontrol_t)           * [_param._nb_entity];

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_deallocation.cpp

@@ -34 +34 @@
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-    cout << *_interfaces << endl;
-
 #ifdef POSITION
     delete _position;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_port.cpp

@@ -21 +21 @@
     _interfaces->set_port(vhdl);
 
-#ifdef VHDL_TESTBENCH
-    _interfaces->set_port(_vhdl_testbench);                     
-   _vhdl_testbench->set_clock    ("in_CLOCK",true);
-#endif    
-
    log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_testbench_transition.cpp

@@ -23 +23 @@
     sc_start(0);
 
-    _interfaces->testbench(_vhdl_testbench);
-
-    // add_test :
-    //  - True  : the cycle must be compare with the output of systemC
-    //  - False : no test
-    _vhdl_testbench->add_test(true);
-
-    _vhdl_testbench->new_cycle (); // always at the end
+    _interfaces->testbench();
 
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","End");