Changeset 142 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim

Timestamp:

Aug 4, 2010, 10:09:03 PM (14 years ago)

Author:

rosiere

Message:

1) Full parallel compilation
2) Add statistics in ROB : list instruction affinity

Location:

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

Files:

• Makefile.deps (modified) (3 diffs)
• Victim_Pseudo_LRU/Makefile.deps (modified) (2 diffs)
• src/Victim_allocation.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Makefile.deps

@@ -8 +8 @@
 # DIR_MORPHEO must be defined
 
-Victim                  = yes
+Victim                          = yes
 
 ifndef Behavioural
@@ -48 +48 @@
 #                                       $(Victim_FIFO_LIBRARY)          \
 
-Victim_DIR_LIBRARY              =       -L$(Victim_DIR)/lib                     \
-                                        $(Victim_Pseudo_LRU_DIR_LIBRARY)        \
-                                        $(Behavioural_DIR_LIBRARY)
-
-#                                       $(Victim_Random_DIR_LIBRARY)            \
-#                                       $(Victim_Round_Robin_DIR_LIBRARY)       \
-#                                       $(Victim_NLU_DIR_LIBRARY)               \
-#                                       $(Victim_LRU_DIR_LIBRARY)               \
-#                                       $(Victim_FIFO_DIR_LIBRARY)              \
-
 #-----[ Rules ]--------------------------------------------
 
-Victim_library          :
+Victim_library_only                     :
+                                @\
+                                $(MAKE) --directory=$(Victim_DIR) --makefile=Makefile;
+
+Victim_library_clean_only       :
+                                @\
+                                $(MAKE) --directory=$(Victim_DIR) --makefile=Makefile clean;
+
+Victim_library                  : Victim_library_only
                                 @\
                                 $(MAKE) Behavioural_library;            \
-                                $(MAKE) Victim_Pseudo_LRU_library;      \
-                                $(MAKE) --directory=$(Victim_DIR) --makefile=Makefile;
+                                $(MAKE) Victim_Pseudo_LRU_library;
 
 #                               $(MAKE) Victim_Random_library;          \
@@ -72 +69 @@
 #                               $(MAKE) Victim_FIFO_library;            \
 
-Victim_library_clean    :
+Victim_library_clean            : Victim_library_clean_only
                                 @\
                                 $(MAKE) Behavioural_library_clean;              \
-                                $(MAKE) Victim_Pseudo_LRU_library_clean;        \
-                                $(MAKE) --directory=$(Victim_DIR) --makefile=Makefile clean;
+                                $(MAKE) Victim_Pseudo_LRU_library_clean;
 
 #                               $(MAKE) Victim_Random_library_clean;            \

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/Makefile.deps

@@ -2 +2 @@
 # $Id$
 # 
-# [ Description ]
+# [ Description ]
 # 
 # Makefile
@@ -11 +11 @@
 
 ifndef Behavioural
-include                         $(DIR_MORPHEO)/Behavioural/Makefile.deps
+include                                 $(DIR_MORPHEO)/Behavioural/Makefile.deps
 endif
 
-#-----[ Library ]------------------------------------------
+#-----[ Library ]------------------------------------------
 Victim_Pseudo_LRU_LIBRARY               =       -lVictim_Pseudo_LRU             \
                                                 $(Behavioural_LIBRARY)  
 
-Victim_Pseudo_LRU_DIR_LIBRARY           =       -L$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU/lib       \
-                                                $(Behavioural_DIR_LIBRARY)      
+#-----[ Rules ]--------------------------------------------
 
-#-----[ Rules ]--------------------------------------------
+Victim_Pseudo_LRU_library_only          :
+                                        @\
+                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile;
 
-Victim_Pseudo_LRU_library               :
-                                @\
-                                $(MAKE)  Behavioural_library; \
-                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile;
+Victim_Pseudo_LRU_library_clean_only    :
+                                        @\
+                                        $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean;
 
-Victim_Pseudo_LRU_library_clean :
-                                @\
-                                $(MAKE)  Behavioural_library_clean; \
-                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean;
+Victim_Pseudo_LRU_library               : Victim_Pseudo_LRU_library_only
+                                        @\
+                                        $(MAKE)  Behavioural_library;
+
+Victim_Pseudo_LRU_library_clean         : Victim_Pseudo_LRU_library_clean_only
+                                        @\
+                                        $(MAKE)  Behavioural_library_clean;

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

@@ -61 +61 @@
       case VICTIM_PSEUDO_LRU  :
         {
-          std::cout << "Create   : " << _name << std::endl;
+          log_printf(INFO,Victim,FUNCTION,_("Create   : %s"),_name.c_str());
 
           _component_victim_pseudo_lru = new morpheo::behavioural::generic::victim::victim_pseudo_lru::Victim_Pseudo_LRU
@@ -79 +79 @@
     // ~~~~~[ Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-    std::cout << "Instance : " << _name << std::endl;
+    log_printf(INFO,Victim,FUNCTION,_("Instance : %s"),_name.c_str());
 
     switch (_param->_victim_scheme)