Changeset 125
- Timestamp:
- Jun 17, 2009, 6:22:02 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (modified) (2 diffs)
-
IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (modified) (1 diff)
-
IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (modified) (1 diff)
-
IPs/systemC/processor/Morpheo/Files/Morpheo.sim (modified) (2 diffs)
-
Platforms/Test/Makefile (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp
r124 r125 17 17 namespace ooo_engine { 18 18 namespace commit_unit { 19 20 21 19 22 20 #undef FUNCTION … … 354 352 _param->_nb_inst_insert, 355 353 _param->_nb_rename_unit_select); 356 354 357 355 #ifdef POSITION 358 356 if (usage_is_set(_usage,USE_POSITION)) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp
r124 r125 168 168 DELETE2_SIGNAL(out_SPR_WRITE_SR_OV ,_param->_nb_front_end, _param->_nb_context[it1],1); 169 169 170 #ifdef DEBUG_TEST 170 171 DELETE0_SIGNAL(out_INFO_ROB_EMPTY ,1); 172 #endif 171 173 172 174 // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
r124 r125 10 10 #define MORPHEO_MAJOR_VERSION "0" 11 11 #define MORPHEO_MINOR_VERSION "2" 12 #define MORPHEO_REVISION "12 4"12 #define MORPHEO_REVISION "125" 13 13 #define MORPHEO_CODENAME "Castor" 14 14 -
trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
r124 r125 28 28 <parameter name="debug_cycle_start" value="0" /> 29 29 <parameter name="debug_cycle_stop" value="10000000"/> 30 <parameter name="debug_nb_cycle" value=" 10000000"/>30 <parameter name="debug_nb_cycle" value="2"/> 31 31 32 32 <parameter name="debug_log_file_generate" value="0" /> … … 34 34 <parameter name="debug_idle_time" value="3" /> 35 35 36 <component name="Comparator" model="systemc" debug=" 0" />37 <component name="Counter" model="systemc" debug=" 0" />38 <component name="Divider" model="systemc" debug=" 0" />39 <component name="Multiplier" model="systemc" debug=" 0" />40 <component name="Priority" model="systemc" debug=" 0" />41 <component name="Queue_Control" model="systemc" debug=" 0" />42 <component name="Queue" model="systemc" debug=" 0" />43 <component name="RegisterFile_Monolithic" model="systemc" debug=" 0" />44 <component name="RegisterFile_Multi_Banked" model="systemc" debug=" 0" />45 <component name="RegisterFile" model="systemc" debug=" 0" />46 <component name="Select_Priority_Fixed" model="systemc" debug=" 0" />47 <component name="Select" model="systemc" debug=" 0" />48 <component name="Shifter" model="systemc" debug=" 0" />49 <component name="Sort" model="systemc" debug=" 0" />50 <component name="Victim_Pseudo_LRU" model="systemc" debug=" 0" />51 <component name="Victim" model="systemc" debug=" 0" />52 <component name="Execute_loop_Glue" model="systemc" debug=" 0" />53 <component name="Functionnal_unit" model="systemc" debug=" 0" />54 <component name="Load_store_unit" model="systemc" debug=" 0" />55 <component name="Read_queue" model="systemc" debug=" 0" />56 <component name="Reservation_station" model="systemc" debug=" 0" />57 <component name="Read_unit" model="systemc" debug=" 0" />58 <component name="Execute_queue" model="systemc" debug=" 0" />59 <component name="Write_queue" model="systemc" debug=" 0" />60 <component name="Write_unit" model="systemc" debug=" 0" />61 <component name="Execution_unit_to_Write_unit" model="systemc" debug=" 0" />62 <component name="Read_unit_to_Execution_unit" model="systemc" debug=" 0" />63 <component name="Register_unit_Glue" model="systemc" debug=" 0" />64 <component name="Register_unit" model="systemc" debug=" 0" />65 <component name="Execute_loop" model="systemc" debug=" 0" />66 <component name="Commit_unit" model="systemc" debug=" 0" />67 <component name="Issue_queue" model="systemc" debug=" 0" />68 <component name="OOO_Engine_Glue" model="systemc" debug=" 0" />69 <component name="Reexecute_unit" model="systemc" debug=" 0" />70 <component name="Load_Store_pointer_unit" model="systemc" debug=" 0" />71 <component name="Dependency_checking_unit" model="systemc" debug=" 0" />72 <component name="Free_List_unit" model="systemc" debug=" 0" />73 <component name="Register_Address_Translation_unit" model="systemc" debug=" 0" />74 <component name="Register_translation_unit_Glue" model="systemc" debug=" 0" />75 <component name="Stat_List_unit" model="systemc" debug=" 0" />76 <component name="Register_translation_unit" model="systemc" debug=" 0" />77 <component name="Rename_unit_Glue" model="systemc" debug=" 0" />78 <component name="Rename_select" model="systemc" debug=" 0" />79 <component name="Rename_unit" model="systemc" debug=" 0" />80 <component name="Special_Register_unit" model="systemc" debug=" 0" />81 <component name="OOO_Engine" model="systemc" debug=" 0" />82 <component name="Context_State" model="systemc" debug=" 0" />83 <component name="Decod" model="systemc" debug=" 0" />84 <component name="Decod_queue" model="systemc" debug=" 0" />85 <component name="Decod_unit" model="systemc" debug=" 0" />86 <component name="Front_end_Glue" model="systemc" debug=" 0" />87 <component name="Address_management" model="systemc" debug=" 0" />88 <component name="Ifetch_queue" model="systemc" debug=" 0" />89 <component name="Ifetch_unit_Glue" model="systemc" debug=" 0" />90 <component name="Ifetch_unit" model="systemc" debug=" 0" />91 <component name="Branch_Target_Buffer_Glue" model="systemc" debug=" 0" />92 <component name="Branch_Target_Buffer_Register" model="systemc" debug=" 0" />93 <component name="Branch_Target_Buffer" model="systemc" debug=" 0" />94 <component name="Direction_Glue" model="systemc" debug=" 0" />95 <component name="Direction" model="systemc" debug=" 0" />96 <component name="Two_Level_Branch_Predictor" model="systemc" debug=" 0" />97 <component name="Meta_Predictor_Glue" model="systemc" debug=" 0" />98 <component name="Meta_Predictor" model="systemc" debug=" 0" />99 <component name="Prediction_unit_Glue" model="systemc" debug=" 0" />100 <component name="Return_Address_Stack" model="systemc" debug=" 0" />101 <component name="Update_Prediction_Table" model="systemc" debug=" 0" />102 <component name="Prediction_unit" model="systemc" debug=" 0" />103 <component name="Front_end" model="systemc" debug=" 0" />104 <component name="Icache_Access" model="systemc" debug=" 0" />105 <component name="Dcache_Access" model="systemc" debug=" 0" />106 <component name="Core_Glue" model="systemc" debug=" 0" />107 <component name="Core" model="systemc" debug=" 0" />108 <component name="TopLevel" model="systemc" debug=" 0" />36 <component name="Comparator" model="systemc" debug="1" /> 37 <component name="Counter" model="systemc" debug="1" /> 38 <component name="Divider" model="systemc" debug="1" /> 39 <component name="Multiplier" model="systemc" debug="1" /> 40 <component name="Priority" model="systemc" debug="1" /> 41 <component name="Queue_Control" model="systemc" debug="1" /> 42 <component name="Queue" model="systemc" debug="1" /> 43 <component name="RegisterFile_Monolithic" model="systemc" debug="1" /> 44 <component name="RegisterFile_Multi_Banked" model="systemc" debug="1" /> 45 <component name="RegisterFile" model="systemc" debug="1" /> 46 <component name="Select_Priority_Fixed" model="systemc" debug="1" /> 47 <component name="Select" model="systemc" debug="1" /> 48 <component name="Shifter" model="systemc" debug="1" /> 49 <component name="Sort" model="systemc" debug="1" /> 50 <component name="Victim_Pseudo_LRU" model="systemc" debug="1" /> 51 <component name="Victim" model="systemc" debug="1" /> 52 <component name="Execute_loop_Glue" model="systemc" debug="1" /> 53 <component name="Functionnal_unit" model="systemc" debug="1" /> 54 <component name="Load_store_unit" model="systemc" debug="1" /> 55 <component name="Read_queue" model="systemc" debug="1" /> 56 <component name="Reservation_station" model="systemc" debug="1" /> 57 <component name="Read_unit" model="systemc" debug="1" /> 58 <component name="Execute_queue" model="systemc" debug="1" /> 59 <component name="Write_queue" model="systemc" debug="1" /> 60 <component name="Write_unit" model="systemc" debug="1" /> 61 <component name="Execution_unit_to_Write_unit" model="systemc" debug="1" /> 62 <component name="Read_unit_to_Execution_unit" model="systemc" debug="1" /> 63 <component name="Register_unit_Glue" model="systemc" debug="1" /> 64 <component name="Register_unit" model="systemc" debug="1" /> 65 <component name="Execute_loop" model="systemc" debug="1" /> 66 <component name="Commit_unit" model="systemc" debug="1" /> 67 <component name="Issue_queue" model="systemc" debug="1" /> 68 <component name="OOO_Engine_Glue" model="systemc" debug="1" /> 69 <component name="Reexecute_unit" model="systemc" debug="1" /> 70 <component name="Load_Store_pointer_unit" model="systemc" debug="1" /> 71 <component name="Dependency_checking_unit" model="systemc" debug="1" /> 72 <component name="Free_List_unit" model="systemc" debug="1" /> 73 <component name="Register_Address_Translation_unit" model="systemc" debug="1" /> 74 <component name="Register_translation_unit_Glue" model="systemc" debug="1" /> 75 <component name="Stat_List_unit" model="systemc" debug="1" /> 76 <component name="Register_translation_unit" model="systemc" debug="1" /> 77 <component name="Rename_unit_Glue" model="systemc" debug="1" /> 78 <component name="Rename_select" model="systemc" debug="1" /> 79 <component name="Rename_unit" model="systemc" debug="1" /> 80 <component name="Special_Register_unit" model="systemc" debug="1" /> 81 <component name="OOO_Engine" model="systemc" debug="1" /> 82 <component name="Context_State" model="systemc" debug="1" /> 83 <component name="Decod" model="systemc" debug="1" /> 84 <component name="Decod_queue" model="systemc" debug="1" /> 85 <component name="Decod_unit" model="systemc" debug="1" /> 86 <component name="Front_end_Glue" model="systemc" debug="1" /> 87 <component name="Address_management" model="systemc" debug="1" /> 88 <component name="Ifetch_queue" model="systemc" debug="1" /> 89 <component name="Ifetch_unit_Glue" model="systemc" debug="1" /> 90 <component name="Ifetch_unit" model="systemc" debug="1" /> 91 <component name="Branch_Target_Buffer_Glue" model="systemc" debug="1" /> 92 <component name="Branch_Target_Buffer_Register" model="systemc" debug="1" /> 93 <component name="Branch_Target_Buffer" model="systemc" debug="1" /> 94 <component name="Direction_Glue" model="systemc" debug="1" /> 95 <component name="Direction" model="systemc" debug="1" /> 96 <component name="Two_Level_Branch_Predictor" model="systemc" debug="1" /> 97 <component name="Meta_Predictor_Glue" model="systemc" debug="1" /> 98 <component name="Meta_Predictor" model="systemc" debug="1" /> 99 <component name="Prediction_unit_Glue" model="systemc" debug="1" /> 100 <component name="Return_Address_Stack" model="systemc" debug="1" /> 101 <component name="Update_Prediction_Table" model="systemc" debug="1" /> 102 <component name="Prediction_unit" model="systemc" debug="1" /> 103 <component name="Front_end" model="systemc" debug="1" /> 104 <component name="Icache_Access" model="systemc" debug="1" /> 105 <component name="Dcache_Access" model="systemc" debug="1" /> 106 <component name="Core_Glue" model="systemc" debug="1" /> 107 <component name="Core" model="systemc" debug="1" /> 108 <component name="TopLevel" model="systemc" debug="1" /> 109 109 110 <component name="Behavioural" model="systemc" debug=" 0" />111 <component name="Interface" model="systemc" debug=" 0" />112 <component name="Allocation" model="systemc" debug=" 0" />110 <component name="Behavioural" model="systemc" debug="1" /> 111 <component name="Interface" model="systemc" debug="1" /> 112 <component name="Allocation" model="systemc" debug="1" /> 113 113 </parameters> -
trunk/Platforms/Test/Makefile
r124 r125 43 43 ENTITY = Test 44 44 45 DIR_TMP= $(MORPHEO_TMP)46 DIR_INC= include47 DIR_SRC= src48 DIR_OBJ = $(DIR_TMP)/obj49 DIR_LIB = $(DIR_TMP)/lib50 DIR_BIN = $(DIR_TMP)/bin51 DIR_LOG = $(DIR_TMP)/log52 DIR_DATA = ./data53 DIR_LOGS = $(patsubst $(DIR_DATA)/%,$(DIR_LOG)/%,$(wildcard $(DIR_DATA)/*))54 55 DIR_SOFT = $(MORPHEO_TOPLEVEL)/Softwares45 PATH_TMP = $(MORPHEO_TMP) 46 PATH_INC = include 47 PATH_SRC = src 48 PATH_OBJ = $(PATH_TMP)/obj 49 PATH_LIB = $(PATH_TMP)/lib 50 PATH_BIN = $(PATH_TMP)/bin 51 PATH_LOG = $(PATH_TMP)/log 52 PATH_DATA = ./data 53 PATH_LOGS = $(patsubst $(PATH_DATA)/%,$(PATH_LOG)/%,$(wildcard $(PATH_DATA)/*)) 54 55 PATH_SOFT = $(MORPHEO_TOPLEVEL)/Softwares 56 56 57 57 #MORPHEO - define in $(MORPHEO_TOPLEVEL)/IPs/systemC/processor/Morpheo/Makefile.deps … … 71 71 #---------------------------------------------------------- 72 72 #---------------------------------------------------------- 73 SOURCES = $(wildcard $(DIR_SRC)/*.cpp) 74 OBJECTS = $(patsubst $(DIR_SRC)/%.cpp,$(DIR_OBJ)/%.o,$(SOURCES)) 75 LOGS = $(patsubst $(DIR_DATA)/%.cfg,$(DIR_LOG)/%.log,$(wildcard $(DIR_DATA)/$(DATA)/*.cfg)) 76 EXEC = $(DIR_BIN)/soft.x 77 EXEC_PREFIX = $(NICE) -n $(PRIORITY) 78 #$(VALGRIND) 73 SOURCES = $(wildcard $(PATH_SRC)/*.cpp) 74 OBJECTS = $(patsubst $(PATH_SRC)/%.cpp,$(PATH_OBJ)/%.o,$(SOURCES)) 75 LOGS = $(patsubst $(PATH_DATA)/%.cfg,$(PATH_LOG)/%.log,$(wildcard $(PATH_DATA)/$(DATA)/*.cfg)) 76 EXEC = $(PATH_BIN)/soft.x 77 EXEC_PREFIX = $(NICE) -n $(PRIORITY) $(VALGRIND) 78 79 SCRIPT = make.sh 79 80 80 81 #-----[ Compilation ]-------------------------------------- … … 82 83 $(MORPHEO_INCDIR) \ 83 84 $(ENVIRONMENT_INCDIR) \ 84 -I$( DIR_INC)85 -I$(PATH_INC) 85 86 86 87 #LIBDIR = $(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC)) \ … … 89 90 90 91 LIBDIR = $(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC)) \ 91 -L$( DIR_LIB)92 -L$(PATH_LIB) 92 93 93 94 LIBNAME = $(ENVIRONMENT_LIBNAME) \ … … 106 107 #---------------------------------------------------------- 107 108 108 vpath %.h $( DIR_INC)109 vpath %.cpp $( DIR_SRC)110 vpath %.o $( DIR_OBJ)111 vpath %.cfg $( DIR_DATA)/*/112 113 .PRECIOUS : $( DIR_OBJ)/%.o $(DIR_BIN)/%.x $(DIR_LOG)/%.log109 vpath %.h $(PATH_INC) 110 vpath %.cpp $(PATH_SRC) 111 vpath %.o $(PATH_OBJ) 112 vpath %.cfg $(PATH_DATA)/*/ 113 114 .PRECIOUS : $(PATH_OBJ)/%.o $(PATH_BIN)/%.x $(PATH_LOG)/%.log 114 115 115 116 all : $(EXEC) 116 117 117 $( DIR_BIN)/%.x : $(DIR_OBJ) $(DIR_BIN)118 $(PATH_BIN)/%.x : $(PATH_OBJ) $(PATH_BIN) 118 119 @\ 119 120 $(ECHO) "Linkage : $*";\ … … 139 140 declare -i clean=$(CLEAN); \ 140 141 if $(TEST) $${clean} -ne 0 -a "$(DATA)" != "$(DATA_ALL)"; then \ 141 $(RM) $( DIR_LOG)/$(DATA); \142 $(RM) $(PATH_LOG)/$(DATA); \ 142 143 fi; \ 143 $(MAKE) $( DIR_LOGS); \144 $(MAKE) $(PATH_LOGS); \ 144 145 declare logs="$(LOGS)"; \ 145 146 $(MAKE) $${logs}; \ … … 171 172 $(MAKE) run DATA=bench; 172 173 173 $(DIR_LOG)/%.log : $(DIR_DATA)/%.cfg $(EXEC) 174 distexe : 175 @\ 176 $(RM) $(SCRIPT); \ 177 for log in $(LOGS); do \ 178 $(ECHO) -n "cd $(MORPHEO_TOPLEVEL); source environment.sh; cd -; path=\"${PWD}\"; " >> $(SCRIPT); \ 179 if $(TEST) $(CLEAN) -ne 0; then \ 180 $(ECHO) -n "$(RM) $${log}; " >> $(SCRIPT); \ 181 fi; \ 182 $(ECHO) "$(MAKE) -C "'$${path}'" $${log} PRIORITY=$(PRIORITY);" >> $(SCRIPT); \ 183 done 184 185 $(PATH_LOG)/%.log : $(PATH_DATA)/%.cfg $(EXEC) 174 186 @\ 175 187 file=$$($(BASENAME) $<); \ … … 202 214 soft : 203 215 @\ 204 $(MAKE) --directory=$( DIR_SOFT) --makefile=Makefile;216 $(MAKE) --directory=$(PATH_SOFT) --makefile=Makefile; 205 217 206 218 #-----[ Rules ]-------------------------------------------- 207 219 208 $( DIR_OBJ)/%.o : %.cpp220 $(PATH_OBJ)/%.o : %.cpp 209 221 @\ 210 222 $(ECHO) "Compilation : $*";\ 211 223 $(CXX) $(PLATFORMS_CXX_FLAGS) -c -o $@ $<; 212 224 213 $( DIR_OBJ) $(DIR_BIN) $(DIR_LOGS) :225 $(PATH_OBJ) $(PATH_BIN) $(PATH_LOGS) : 214 226 @\ 215 227 $(ECHO) "Create directory : $@";\ … … 222 234 $(ECHO) "Delete temporary files in directory $(PWD)";\ 223 235 $(RM) $(OBJECTS) $(EXEC) $(LOGS) \ 224 *~ $( DIR_SRC)/*~ $(DIR_INC)/*~ $(DIR_DATA)/*/*~ *.res *.txt\236 *~ $(PATH_SRC)/*~ $(PATH_INC)/*~ $(PATH_DATA)/*/*~ *.res *.txt\ 225 237 *core* \ 226 238 tty* \ … … 234 246 @\ 235 247 $(ECHO) "Delete generated files in directory $(PWD)";\ 236 $(RM) $( DIR_OBJ) $(DIR_BIN) $(DIR_LOG);\237 $(MAKE) --directory=$( DIR_SOFT) --makefile=Makefile clean_all; \248 $(RM) $(PATH_OBJ) $(PATH_BIN) $(PATH_LOG) $(SCRIPT);\ 249 $(MAKE) --directory=$(PATH_SOFT) --makefile=Makefile clean_all; \ 238 250 $(MAKE) --directory=$(ENVIRONMENT_DIR) --makefile=Makefile clean_all; \ 239 251 $(MAKE) --directory=$(MORPHEO_DIR) --makefile=Makefile clean_all; … … 246 258 $(ECHO) " * all (default rules) : create software";\ 247 259 $(ECHO) " * run : execute platforms with test configuration";\ 248 $(ECHO) " set DATA to select a specific directory in $( DIR_DATA) (default : all)";\260 $(ECHO) " set DATA to select a specific directory in $(PATH_DATA) (default : all)";\ 249 261 $(ECHO) " set PRIORITY to nice the execution (default : 0)";\ 250 262 $(ECHO) " set CLEAN to remove previous log (default : 0)";\ … … 253 265 $(ECHO) " * debug : cf 'make run DATA=debug'";\ 254 266 $(ECHO) " * bench : cf 'make run DATA=bench'";\ 267 $(ECHO) " * distexe : Generate an command file to distexe. It's as run command, but just generate an script with all make";\ 255 268 $(ECHO) " * lib : make library";\ 256 269 $(ECHO) " * soft : make software";\
Note: See TracChangeset
for help on using the changeset viewer.
