Changeset 127
- Timestamp:
- Jun 17, 2009, 11:21:10 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
IPs/systemC/Environment/Common/include/Debug.h (modified) (1 diff)
-
IPs/systemC/Environment/src/Environment_genMoore.cpp (modified) (1 diff)
-
IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (modified) (1 diff)
-
IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (modified) (1 diff)
-
IPs/systemC/processor/Morpheo/Files/Morpheo.sim (modified) (3 diffs)
-
IPs/systemC/processor/Morpheo/Files/debug.sim (modified) (2 diffs)
-
IPs/systemC/processor/Morpheo/Script/execute.sh (modified) (3 diffs)
-
Platforms/Test/Makefile (modified) (1 diff)
-
Platforms/Test/data/debug/debug.cfg (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/Environment/Common/include/Debug.h
r124 r127 3 3 4 4 #define DEBUG_true true 5 #define DEBUG_ENVIRONMENT true5 #define DEBUG_ENVIRONMENT false 6 6 #define DEBUG_CACHE false 7 7 #define DEBUG_DATA false -
trunk/IPs/systemC/Environment/src/Environment_genMoore.cpp
r124 r127 34 34 icache_rsp_val [i][j] = 0; 35 35 36 for (uint32_t j = 0; j+1 < component_buffer_irsp [i]->nb_slot_use(); j ++) 36 _cout(ENVIRONMENT, "buffer_irsp [%d] : nb_slot_use %d\n",i,component_buffer_irsp [i]->nb_slot_use()); 37 for (uint32_t j = 0; j+1 <= component_buffer_irsp [i]->nb_slot_use(); j ++) 37 38 { 38 39 // Test the number of element in the respons's buffer -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp
r125 r127 310 310 ALLOC1(internal_BRANCH_COMPLETE_NUM_BANK ,uint32_t ,_param->_nb_inst_branch_complete); 311 311 312 ALLOC2(internal_EVENT_ACK ,Tcontrol_t,_param->_nb_front_end,_param->_nb_context [it1]); 313 312 ALLOC2(internal_EVENT_ACK ,Tcontrol_t,_param->_nb_front_end,_param->_nb_context[it1]); 314 313 ALLOC2(internal_RETIRE_EVENT_VAL ,Tcontrol_t,_param->_nb_front_end,_param->_nb_context[it1]); 315 314 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
r125 r127 10 10 #define MORPHEO_MAJOR_VERSION "0" 11 11 #define MORPHEO_MINOR_VERSION "2" 12 #define MORPHEO_REVISION "12 5"12 #define MORPHEO_REVISION "127" 13 13 #define MORPHEO_CODENAME "Castor" 14 14 -
trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim
r125 r127 17 17 <parameter name="directory_log" value="/tmp/" /> 18 18 19 <parameter name="statistics_cycle_start" value="100000 "/>19 <parameter name="statistics_cycle_start" value="1000000" /> 20 20 <parameter name="statistics_period" value="0" /> 21 21 22 <parameter name="simulation_nb_cycle" value="1000000 "/>22 <parameter name="simulation_nb_cycle" value="10000000"/> 23 23 <parameter name="simulation_nb_instruction" value="0" /> 24 24 <parameter name="simulation_file_with_pid" value="0" /> … … 27 27 <parameter name="debug_level" value="3" /> 28 28 <parameter name="debug_cycle_start" value="0" /> 29 <parameter name="debug_cycle_stop" value=" 10000000"/>30 <parameter name="debug_nb_cycle" value="2 "/>29 <parameter name="debug_cycle_stop" value="20000000"/> 30 <parameter name="debug_nb_cycle" value="20000000"/> 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=" 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" />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" /> 109 109 110 <component name="Behavioural" model="systemc" debug=" 1" />111 <component name="Interface" model="systemc" debug=" 1" />112 <component name="Allocation" model="systemc" debug=" 1" />110 <component name="Behavioural" model="systemc" debug="0" /> 111 <component name="Interface" model="systemc" debug="0" /> 112 <component name="Allocation" model="systemc" debug="0" /> 113 113 </parameters> -
trunk/IPs/systemC/processor/Morpheo/Files/debug.sim
r124 r127 20 20 <parameter name="statistics_period" value="0" /> 21 21 22 <parameter name="simulation_nb_cycle" value="1000000" 22 <parameter name="simulation_nb_cycle" value="1000000" /> 23 23 <parameter name="simulation_nb_instruction" value="0" /> 24 24 <parameter name="simulation_file_with_pid" value="0" /> … … 26 26 27 27 <parameter name="debug_level" value="3" /> 28 <parameter name="debug_cycle_start" value="0" />29 <parameter name="debug_cycle_stop" value="50" />30 <parameter name="debug_nb_cycle" value="200000" 28 <parameter name="debug_cycle_start" value="0" /> 29 <parameter name="debug_cycle_stop" value="50" /> 30 <parameter name="debug_nb_cycle" value="200000" /> 31 31 32 32 <parameter name="debug_log_file_generate" value="0" /> -
trunk/IPs/systemC/processor/Morpheo/Script/execute.sh
r126 r127 88 88 done < ${FILE_CMD}; 89 89 90 local -i NB_DIGIT=0; 91 local -i x=${#COMMAND[*]}; 92 93 while test ${x} -ne 0; do 94 NB_DIGIT=$((${NB_DIGIT} + 1)); 95 x=$((${x} / 10)); 96 done; 97 90 98 echo " * {"$(my_date)"} <${ID}> is ready"; 91 99 … … 127 135 # Test if command is empty ! 128 136 if test ! -z "${COMMAND[${CPT}]}"; then 129 # echo " * {"$(my_date)"} <${ID}> execute command [${CPT}] : ${COMMAND[${CPT}]}"; 130 echo " * {"$(my_date)"} <${ID}> command [${CPT}] : execute"; 137 local NUM=$(printf %.${NB_DIGIT}d ${CPT}); 138 139 # echo " * {"$(my_date)"} <${ID}> execute command [${NUM}] : ${COMMAND[${CPT}]}"; 140 echo " * {"$(my_date)"} <${ID}> command [${NUM}] : execute"; 131 141 local PATH_CURRENT=${PWD}; 142 132 143 cd ${PATH_WORK} &> /dev/null; 133 mkdir "Task_${ CPT}" &> /dev/null;134 cd "Task_${ CPT}" &> /dev/null;144 mkdir "Task_${NUM}" &> /dev/null; 145 cd "Task_${NUM}" &> /dev/null; 135 146 echo "id : ${ID}" > ${OUTPUT_FILE_INFO}; 136 147 echo "host : ${HOSTNAME}" >> ${OUTPUT_FILE_INFO}; … … 143 154 ./${OUTPUT_FILE_CMD} &> ${OUTPUT_FILE_OUT}; 144 155 cd ${PATH_CURRENT} &> /dev/null; 145 echo " * {"$(my_date)"} <${ID}> command [${ CPT}] : done";156 echo " * {"$(my_date)"} <${ID}> command [${NUM}] : done"; 146 157 fi; 147 158 done; -
trunk/Platforms/Test/Makefile
r125 r127 75 75 LOGS = $(patsubst $(PATH_DATA)/%.cfg,$(PATH_LOG)/%.log,$(wildcard $(PATH_DATA)/$(DATA)/*.cfg)) 76 76 EXEC = $(PATH_BIN)/soft.x 77 EXEC_PREFIX = $(NICE) -n $(PRIORITY) $(VALGRIND) 77 EXEC_PREFIX = $(NICE) -n $(PRIORITY) 78 #$(VALGRIND) 78 79 79 80 SCRIPT = make.sh -
trunk/Platforms/Test/data/debug/debug.cfg
r124 r127 1 1 ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/debug.sim 2 2 ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen 3 ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x 4_w8_1.cfg4 ${MORPHEO_TOPLEVEL}/Softwares/Test/Test_ x000/bin/soft.x3 ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_0.cfg 4 ${MORPHEO_TOPLEVEL}/Softwares/Test/Test_000/bin/soft.x 5 5 0 6 6 0
Note: See TracChangeset
for help on using the changeset viewer.
