Changeset 77 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue

Timestamp:

Feb 5, 2008, 5:21:20 PM (16 years ago)

Author:

rosiere

Message:

• Add two component :
  • network between read unit and execute unit
  • network between execute unit and write unit
• remove parameters "nb_operation" and "nb_type"
• in write_queue add the special case : load_speculative

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue

Files:

• Makefile.deps (modified) (1 diff)
• SelfTest/configuration.cfg (modified) (1 diff)
• SelfTest/src/main.cpp (modified) (4 diffs)
• include/Parameters.h (modified) (3 diffs)
• src/Parameters.cpp (modified) (5 diffs)
• src/Parameters_print.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/Makefile.deps

@@ -25 +25 @@
                                         $(Behavioural_DIR_LIBRARY)
 
-Execute_queue_DEPENDENCIES      =       Behavioural_library
+#-----[ Rules ]--------------------------------------------
 
-Execute_queue_CLEAN             =       Behavioural_library_clean
-
-#-----[ Rules ]--------------------------------------------
-#.NOTPARALLEL                   : Execute_queue_library Execute_queue_library_clean
-
-Execute_queue_library           : $(Execute_queue_DEPENDENCIES)
+Execute_queue_library           :
                                 @\
+                                $(MAKE) Behavioural_library; \
                                 $(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile;
 
-Execute_queue_library_clean     : $(Execute_queue_CLEAN)
+Execute_queue_library_clean     :
                                 @\
+                                $(MAKE) Behavioural_library_clean; \
                                 $(MAKE) --directory=$(Execute_queue_DIR) --makefile=Makefile clean;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/SelfTest/configuration.cfg

@@ -7 +7 @@
 32      32      *2 # uint32_t size_general_data  
 2       2       *2 # uint32_t size_special_data  
-10      10      *2 # uint32_t nb_operation       
-4       4       *2 # uint32_t nb_type            

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/SelfTest/src/main.cpp

@@ -8 +8 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/SelfTest/include/test.h"
 
-#define NB_PARAMS 9
+#define NB_PARAMS 7
 
 void usage (int argc, char * argv[])
@@ -21 +21 @@
   err (_(" * size_general_data   (uint32_t)\n"));
   err (_(" * size_special_data   (uint32_t)\n"));
-  err (_(" * nb_operation        (uint32_t)\n"));
-  err (_(" * nb_type             (uint32_t)\n"));
 
   exit (1);
@@ -46 +44 @@
   const uint32_t size_general_data   = atoi(argv[x++]);
   const uint32_t size_special_data   = atoi(argv[x++]);
-  const uint32_t nb_operation        = atoi(argv[x++]);
-  const uint32_t nb_type             = atoi(argv[x++]);
 
   try 
@@ -58 +54 @@
          nb_packet          ,
          size_general_data  ,
-         size_special_data  ,
-         nb_operation       ,
-         nb_type            );
+         size_special_data  );
       
       msg(_("%s"),param->print(1).c_str());

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/include/Parameters.h

@@ -33 +33 @@
   public : const uint32_t            _size_general_data            ;
   public : const uint32_t            _size_special_data            ;
-  public : const uint32_t            _nb_operation                 ;
-  public : const uint32_t            _nb_type                      ;
 
   public : const uint32_t            _size_context_id              ;
@@ -40 +38 @@
   public : const uint32_t            _size_ooo_engine_id           ;
   public : const uint32_t            _size_packet_id               ;
-  public : const uint32_t            _size_operation               ;
-  public : const uint32_t            _size_type                    ;
 
   public : const bool                _have_port_context_id         ;
@@ -55 +51 @@
                         uint32_t nb_packet          ,
                         uint32_t size_general_data  ,
-                        uint32_t size_special_data  ,
-                        uint32_t nb_operation       ,
-                        uint32_t nb_type            );
+                        uint32_t size_special_data  );
   public : Parameters  (Parameters & param) ;
   public : ~Parameters () ;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Parameters.cpp

@@ -26 +26 @@
                           uint32_t nb_packet          ,
                           uint32_t size_general_data  ,
-                          uint32_t size_special_data  ,
-                          uint32_t nb_operation       ,
-                          uint32_t nb_type            ):
+                          uint32_t size_special_data  ):
     _size_queue              (size_queue         ),
     _nb_context              (nb_context         ),
@@ -36 +34 @@
     _size_general_data       (size_general_data  ),
     _size_special_data       (size_special_data  ),
-    _nb_operation            (nb_operation       ),
-    _nb_type                 (nb_type            ),
 
     _size_context_id         (log2(_nb_context         )),
@@ -43 +39 @@
     _size_ooo_engine_id      (log2(_nb_ooo_engine      )),
     _size_packet_id          (log2(_nb_packet          )),
-    _size_operation          (log2(_nb_operation       )),
-    _size_type               (log2(_nb_type            )),
 
     _have_port_context_id    (_size_context_id    > 0),
@@ -66 +60 @@
     _size_general_data       (param._size_general_data      ),
     _size_special_data       (param._size_special_data      ),
-    _nb_operation            (param._nb_operation           ),
-    _nb_type                 (param._nb_type                ),
 
     _size_context_id         (param._size_context_id        ),
@@ -73 +65 @@
     _size_ooo_engine_id      (param._size_ooo_engine_id     ),
     _size_packet_id          (param._size_packet_id         ),
-    _size_operation          (param._size_operation         ),
-    _size_type               (param._size_type              ),
 
     _have_port_context_id    (param._have_port_context_id   ),

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Parameters_print.cpp

@@ -35 +35 @@
     xml.singleton_begin("size_general_data  "); xml.attribut("value",toString(_size_general_data  )); xml.singleton_end();
     xml.singleton_begin("size_special_data  "); xml.attribut("value",toString(_size_special_data  )); xml.singleton_end();
-    xml.singleton_begin("nb_operation       "); xml.attribut("value",toString(_nb_operation       )); xml.singleton_end();
-    xml.singleton_begin("nb_type            "); xml.attribut("value",toString(_nb_type            )); xml.singleton_end();
     xml.balise_close();