Index: /trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_update_access.cpp =================================================================== --- /trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_update_access.cpp (revision 113) +++ /trunk/IPs/systemC/Environment/Cache/src/Cache_MultiLevel_update_access.cpp (revision 114) @@ -20,5 +20,5 @@ // if (latence != 0) // { -// std::cout << " after all update, latence must be null." << std::endl; +// _cout(CACHE,"after all update, latence must be null.\n"); // exit(1); // } Index: /trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access.cpp =================================================================== --- /trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access.cpp (revision 113) +++ /trunk/IPs/systemC/Environment/Cache/src/Cache_OneLevel_access.cpp (revision 114) @@ -30,5 +30,5 @@ case SYNCHRONIZATION : return access_synchronization (num_port,address,trdid ); break; case CACHED : return access_cached (num_port,address,trdid,dir); break; - default : std::cout << " unknow type : " << std::endl; exit(1); break; + default : _cerr(" unknow type\n"); exit(1); break; } } Index: /trunk/IPs/systemC/Environment/Common/include/Debug.h =================================================================== --- /trunk/IPs/systemC/Environment/Common/include/Debug.h (revision 113) +++ /trunk/IPs/systemC/Environment/Common/include/Debug.h (revision 114) @@ -11,5 +11,4 @@ #define DEBUG_TTY true -// #ifdef DEBUG # define _cout(component, str...) \ do \ @@ -21,11 +20,11 @@ } \ while(0) -// #else -// # define _cout(component, str...) -// do -// { -// } -// while(0) -// #endif + +# define _cerr(str...) \ + do \ + { \ + fprintf(stderr,str); \ + } \ + while(0) #endif Index: /trunk/IPs/systemC/Environment/Makefile =================================================================== --- /trunk/IPs/systemC/Environment/Makefile (revision 113) +++ /trunk/IPs/systemC/Environment/Makefile (revision 114) @@ -45,5 +45,4 @@ all : @\ - $(MAKE) all_environment; \ $(MAKE) --directory=$(DIR_CACHE) all; \ $(MAKE) --directory=$(DIR_DATA) all; \ @@ -56,9 +55,7 @@ -$(LIBRARY_FILE) : $(Environment_OBJECTS_DEPS) +$(LIBRARY_FILE) : $(DIR_LIB) $(Environment_OBJECTS_DEPS) @\ $(ECHO) "Archive : $@";\ - $(ECHO) "Archive : $@";\ - $(MKDIR) $(DIR_LIB);\ $(AR) -r $@ $(Environment_OBJECTS_DEPS);\ $(RANLIB) $@; Index: /trunk/IPs/systemC/Environment/Makefile.Environment =================================================================== --- /trunk/IPs/systemC/Environment/Makefile.Environment (revision 113) +++ /trunk/IPs/systemC/Environment/Makefile.Environment (revision 114) @@ -29,14 +29,8 @@ $(CXX) $(MORPHEO_L_FLAGS) -o $@ $^ $(LIBNAME); -$(DIR_OBJ) : +$(DIR_OBJ) $(DIR_BIN) : @\ $(ECHO) "Create directory : $@";\ $(MKDIR) $@ - -$(DIR_BIN) : - @\ - $(ECHO) "Create directory : $@";\ - $(MKDIR) $@ - exe : all $(DIR_BIN) Index: /trunk/IPs/systemC/Environment/src/Environment_transition.cpp =================================================================== --- /trunk/IPs/systemC/Environment/src/Environment_transition.cpp (revision 113) +++ /trunk/IPs/systemC/Environment/src/Environment_transition.cpp (revision 114) @@ -130,12 +130,10 @@ if (bus_error == true) { - std::cout << "Icache : have a bus error" << std::endl - << " * entity : " << i << std::endl - << " * port : " << j << std::endl - << std::hex - << " * req_addr : " << address << std::endl - << std::dec - << " * req_trdid : " << context << std::endl - << " * req_pktid : " << packet << std::endl; + _cout(ENVIRONMENT," * Icache : have a bus error\n"); + _cout(ENVIRONMENT," * entity : %d\n",i); + _cout(ENVIRONMENT," * port : %d\n",j); + _cout(ENVIRONMENT," * req_addr : %x\n",address); + _cout(ENVIRONMENT," * req_trdid : %d\n",context); + _cout(ENVIRONMENT," * req_pktid : %d\n",packet ); // Write in instruction [0] the bad address (only 32bit ....) @@ -211,5 +209,5 @@ data::Entity entity = component_data->entity(static_cast(address),nb_bytes); - std::cout << entity << std::endl; +// std::cout << entity << std::endl; // Test the type of the address @@ -377,5 +375,5 @@ if (must_write == false) { - std::cerr << " SIM2OS[0] is not accessible in Read" << std::endl; + _cerr(" SIM2OS[0] is not accessible in Read\n"); bus_error = true; } @@ -391,5 +389,5 @@ if (must_read == false) { - std::cerr << " SIM2OS[1] is not accessible in Write" << std::endl; + _cerr(" SIM2OS[1] is not accessible in Write\n"); bus_error = true; } @@ -408,5 +406,5 @@ if (must_read == false) { - std::cerr << " SIM2OS[2] is not accessible in Write" << std::endl; + _cerr(" SIM2OS[2] is not accessible in Write\n"); bus_error = true; } @@ -426,5 +424,5 @@ if (must_write == false) { - std::cerr << " SIM2OS[" << num_reg << "] is not accessible in Read" << std::endl; + _cerr(" SIM2OS[%d] is not accessible in Read\n",num_reg); bus_error = true; } @@ -443,5 +441,5 @@ default : { - std::cerr << " Dcache_req : Unknow type" << std::endl; + _cerr(" Dcache_req : Unknow type\n"); exit(1); break; @@ -482,12 +480,10 @@ if (bus_error == true) { - std::cout << "Dcache : have a bus error" << std::endl - << " * entity : " << i << std::endl - << " * port : " << j << std::endl - << std::hex - << " * req_addr : 0x" << address << std::endl - << std::dec - << " * req_trdid : " << context << std::endl - << " * req_pktid : " << packet << std::endl; + _cout(ENVIRONMENT," * Dcache : have a bus error\n"); + _cout(ENVIRONMENT," * entity : %d\n",i); + _cout(ENVIRONMENT," * port : %d\n",j); + _cout(ENVIRONMENT," * req_addr : 0x%x\n",address); + _cout(ENVIRONMENT," * req_trdid : %d\n",context); + _cout(ENVIRONMENT," * req_pktid : %d\n",packet ); // Write in data [0] the bad address (32bit or 64bits ) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 114) @@ -66,6 +66,6 @@ if (fromString(_simulator->getParam("use_statistics"))) _usage = usage_set(_usage, USE_STATISTICS); - if (fromString(_simulator->getParam("use_information"))) - _usage = usage_set(_usage, USE_INFORMATION); +// if (fromString(_simulator->getParam("use_information"))) +// _usage = usage_set(_usage, USE_INFORMATION); if (fromString(_simulator->getParam("use_header"))) _usage = usage_set(_usage, USE_HEADER); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp (revision 114) @@ -141,27 +141,32 @@ // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - _param_queue = new morpheo::behavioural::generic::queue::Parameters - (_param->_size_queue, - _param->_size_internal_queue, - _param->_nb_bypass_write, - false, - false - ); - - std::string queue_name = _name + "_queue"; - _component_queue = new morpheo::behavioural::generic::queue::Queue - (queue_name.c_str() +#ifdef VHDL + if (usage_is_set(_usage,USE_VHDL)) + { + _param_queue = new morpheo::behavioural::generic::queue::Parameters + (_param->_size_queue, + _param->_size_internal_queue, + _param->_nb_bypass_write, + false, + false + ); + + std::string queue_name = _name + "_queue"; + _component_queue = new morpheo::behavioural::generic::queue::Queue + (queue_name.c_str() #ifdef STATISTICS - ,NULL + ,NULL #endif - ,_param_queue - ,USE_VHDL); - - _component->set_component(_component_queue->_component + ,_param_queue + ,USE_VHDL); + + _component->set_component(_component_queue->_component #ifdef POSITION - , 50, 50, 50, 50 + , 50, 50, 50, 50 #endif - , INSTANCE_LIBRARY - ); + , INSTANCE_LIBRARY + ); + } +#endif #ifdef POSITION Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 114) @@ -427,9 +427,9 @@ instruction_log_file [num_thread] << "[" << simulation_cycle() << "] " - << "{" << ((retire_ok)?" OK ":"!KO!") << "} " << std::hex - << "0x" << entry->address << " (0x" << (entry->address<<2) << ") " + << (entry->address<<2) << " (" << (entry->address) << ") " << std::dec << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] " + << "{" << ((retire_ok)?" OK ":"!KO!") << "} " << std::endl; #endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 114) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "113" +#define MORPHEO_REVISION "114" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "14" +#define MORPHEO_DATE_DAY "17" #define MORPHEO_DATE_MONTH "04" #define MORPHEO_DATE_YEAR "2009" Index: /trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 114) @@ -1,12 +1,12 @@ - + - - - - - + + + + + @@ -16,7 +16,7 @@ - - - + + + @@ -25,32 +25,32 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - + - - - - + + + + @@ -59,5 +59,5 @@ - + @@ -69,9 +69,4 @@ - - - - - @@ -83,55 +78,44 @@ - - + + - - + + - - - - - - - + + + - - - - - - - + + + - - - - - + + - + - + - - + + - - + + - + @@ -139,15 +123,22 @@ - - - + + - - + + - - + + + + + + + + + + @@ -168,22 +159,8 @@ - - - - - - - - - - - - - - @@ -191,71 +168,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Index: /trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg (revision 114) @@ -17,4 +17,5 @@ + @@ -61,5 +62,13 @@ - + + + + + + + + + @@ -76,31 +85,16 @@ - - - - - - - + + - - - - - - - + + - - - - - - - + + @@ -120,4 +114,5 @@ + Index: /trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg (revision 114) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg (revision 114) @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 113) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 114) @@ -8,12 +8,12 @@ - + - + - + @@ -24,6 +24,6 @@ - - + + Index: /trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh (revision 114) +++ /trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh (revision 114) @@ -0,0 +1,108 @@ +#!/bin/bash + +#----------------------------------------------------------- +# $Id$ +#----------------------------------------------------------- + +#-----[ usage ]--------------------------------------------- +function usage () +{ + echo "Usage : ${0} file1 file2"; + echo "Arguments : "; + echo " * file1 : instruction flow file"; + echo " * file2 : symbol file"; + echo "format for file1 : xxx address xxx. address is in hexadecimal without 0x or additionnal 0"; + exit; +} + +#-----[ test_usage ]---------------------------------------- +function test_usage () +{ + if test ${#} -ne 2; then + usage ${*}; + fi; +} + +#-----[ main ]---------------------------------------------- +function main () +{ + test_usage ${*}; + + # Read symbol file and take function address and function name + local -ai array_address_begin; + local -ai array_address_end; + local -a array_name; + + # first slot + array_address_begin[0]=0; + array_name[0]="???"; + + local -i cpt=1; + while read line; do + local type=$(echo ${line} | cut -d' ' -f2); + + # Test if the symbol is in text section + if test "${type}" = "T"; then + local address_begin=$(echo ${line} | cut -d' ' -f1); + local name=$( echo ${line} | cut -d' ' -f3); + + # erase additionnal 0 + declare str=$(expr match "${address_begin}" '.*\(^[0]*\)'); + address_begin=$(printf %d 0x${address_begin#${str}}); + + local address_end=$((${address_begin}-1)); + + array_address_begin[${cpt}]=${address_begin}; + array_address_end[$((${cpt}-1))]=${address_end}; + array_name[${cpt}]="${name}"; + + #echo "${address_begin} ${name}"; + + cpt=$((${cpt}+1)); + fi; + done < ${2}; + + # last slot + array_address_end[$((${cpt}-1))]=$(printf %d 0xffffffff); + +# cpt=0; +# while test ${cpt} -ne ${#array_address_begin[*]}; do +# address_begin=${array_address_begin[${cpt}]}; +# address_end=${array_address_end[${cpt}]}; +# name=${array_name[${cpt}]}; +# +# echo "${address_begin} ${address_end} ${name}"; +# +# cpt=$((${cpt}+1)); +# done; + + # Read instruction flow file + while read line; do + # extract address + + local name=""; + local -i address_current=$(printf %d 0x$(echo ${line} | cut -d' ' -f2)); + + # search in address file if match + cpt=0; + while test ${cpt} -ne ${#array_address_begin[*]}; do + local -i address_begin=${array_address_begin[${cpt}]}; + local -i address_end=${array_address_end[${cpt}]}; + + # test if address_curent match with a address in symbol file + if test ${address_current} -ge ${address_begin} -a ${address_current} -lt ${address_end}; then + name=${array_name[${cpt}]}; + break; + fi; + + cpt=$((${cpt}+1)); + done; + + echo "${line} ${name}"; + + done < ${1}; + +} + +#-----[ Corps ]--------------------------------------------- +main ${*}; Index: /trunk/Makefile.flags =================================================================== --- /trunk/Makefile.flags (revision 113) +++ /trunk/Makefile.flags (revision 114) @@ -6,5 +6,4 @@ #-----[ Simulator ]---------------------------------------- -#SIMULATOR ?= modelsim SIMULATOR ?= systemcass @@ -18,5 +17,4 @@ MORPHEO_FLAGS = -DSYSTEMC \ -DDEBUG=DEBUG_TRACE \ - -DDEBUG_MEMORY_LEAK \ -DSTATISTICS \ -DVHDL \ @@ -27,5 +25,6 @@ # -DPRINT_COLOR \ # -DPOSITION \ -# +# -DDEBUG_MEMORY_LEAK \ + Index: /trunk/Makefile.tools =================================================================== --- /trunk/Makefile.tools (revision 113) +++ /trunk/Makefile.tools (revision 114) @@ -38,5 +38,6 @@ MSGFMT = msgfmt DISTCC = /users/chaos/kane/Softwares/distcc/bin/distcc -CC_PREFIX = $(DISTCC) +#CC_PREFIX = $(DISTCC) +CC_PREFIX = CC_FLAGS_COMMON = -O2 \ -Wall \ Index: /trunk/Makefile.tools_path =================================================================== --- /trunk/Makefile.tools_path (revision 113) +++ /trunk/Makefile.tools_path (revision 114) @@ -33,5 +33,5 @@ MODELTECH = /users/outil/m1archi/M2/modeltech MODELTECH_LICENCE = /users/soft/mentor/mgls_v8-5_0-5-0.ss5/etc/cust/mgc/license.anacad.2008 -OR1K = /users/cao/kane/Softwares/or32-elf +OR1K = /users/chaos/kane/Softwares/or32-elf NEWLIB = /users/chaos/kane/Softwares/newlib/or32-elf QT = /dsk/l1/misc/kane/qt-x11-opensource-4.2.3 Index: /trunk/Platforms/Test/Makefile =================================================================== --- /trunk/Platforms/Test/Makefile (revision 113) +++ /trunk/Platforms/Test/Makefile (revision 114) @@ -29,5 +29,4 @@ #---------------------------------------------------------- ENTITY = Test -SIMULATOR = modelsim DIR_TMP = $(MORPHEO_TMP) Index: /trunk/Platforms/Test/data_test/Test_000_068.cfg =================================================================== --- /trunk/Platforms/Test/data_test/Test_000_068.cfg (revision 114) +++ /trunk/Platforms/Test/data_test/Test_000_068.cfg (revision 114) @@ -0,0 +1,8 @@ +../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim +../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen +../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg +../../Softwares/Test/Test_068/bin/soft.x +0 +0 +4096 +2 Index: /trunk/Platforms/Test/data_test/Test_000_069.cfg =================================================================== --- /trunk/Platforms/Test/data_test/Test_000_069.cfg (revision 114) +++ /trunk/Platforms/Test/data_test/Test_000_069.cfg (revision 114) @@ -0,0 +1,8 @@ +../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim +../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen +../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg +../../Softwares/Test/Test_069/bin/soft.x +0 +0 +4096 +2 Index: /trunk/Platforms/Test/data_test/Test_000_070.cfg =================================================================== --- /trunk/Platforms/Test/data_test/Test_000_070.cfg (revision 114) +++ /trunk/Platforms/Test/data_test/Test_000_070.cfg (revision 114) @@ -0,0 +1,8 @@ +../../IPs/systemC/processor/Morpheo/Files/Morpheo.sim +../../IPs/systemC/processor/Morpheo/Files/Morpheo.gen +../../IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg +../../Softwares/Test/Test_070/bin/soft.x +0 +0 +4096 +2 Index: /trunk/Platforms/Test/src/test.cpp =================================================================== --- /trunk/Platforms/Test/src/test.cpp (revision 113) +++ /trunk/Platforms/Test/src/test.cpp (revision 114) @@ -322,4 +322,35 @@ sc_clock * CLOCK = new sc_clock ("clock", 1.0, 0.5); sc_signal * NRESET = new sc_signal ("NRESET"); + + sc_signal ** ICACHE_REQ_VAL ; + sc_signal ** ICACHE_REQ_ACK ; + sc_signal ** ICACHE_REQ_THREAD_ID ; + sc_signal ** ICACHE_REQ_PACKET_ID ; + sc_signal ** ICACHE_REQ_ADDRESS ; + sc_signal ** ICACHE_REQ_TYPE ; + + sc_signal ** ICACHE_RSP_VAL ; + sc_signal ** ICACHE_RSP_ACK ; + sc_signal ** ICACHE_RSP_THREAD_ID ; + sc_signal ** ICACHE_RSP_PACKET_ID ; + sc_signal *** ICACHE_RSP_INSTRUCTION; + sc_signal ** ICACHE_RSP_ERROR ; + + sc_signal ** DCACHE_REQ_VAL ; + sc_signal ** DCACHE_REQ_ACK ; + sc_signal ** DCACHE_REQ_THREAD_ID ; + sc_signal ** DCACHE_REQ_PACKET_ID ; + sc_signal ** DCACHE_REQ_ADDRESS ; + sc_signal ** DCACHE_REQ_WDATA ; + sc_signal ** DCACHE_REQ_TYPE ; + + sc_signal ** DCACHE_RSP_VAL ; + sc_signal ** DCACHE_RSP_ACK ; + sc_signal ** DCACHE_RSP_THREAD_ID ; + sc_signal ** DCACHE_RSP_PACKET_ID ; + sc_signal ** DCACHE_RSP_RDATA ; + sc_signal ** DCACHE_RSP_ERROR ; + + sc_signal ** INTERRUPT_ENABLE ; ALLOC1_SC_SIGNAL(ICACHE_REQ_VAL ,"ICACHE_REQ_VAL ",Tcontrol_t ,morpheo->_nb_icache_port); Index: /trunk/Softwares/Dhrystone/src/c/dhry21a.c =================================================================== --- /trunk/Softwares/Dhrystone/src/c/dhry21a.c (revision 113) +++ /trunk/Softwares/Dhrystone/src/c/dhry21a.c (revision 114) @@ -255,15 +255,23 @@ User_Time = End_Time - Begin_Time; - if (User_Time < Too_Small_Time) +// if (User_Time < Too_Small_Time) +// { +//#ifdef HAVE_DOUBLE +// printf ("Measured time too small to obtain meaningful results : %f\n",User_Time); +//#else +// printf ("Measured time too small to obtain meaningful results : %d\n",User_Time); +//#endif +// printf ("Please increase number of runs\n"); +// printf ("\n"); +// } +// else { - printf ("Measured time too small to obtain meaningful results : %f\n",User_Time); - printf ("Please increase number of runs\n"); - printf ("\n"); - } - else - { +#ifdef HAVE_DOUBLE Microseconds = User_Time * Mic_secs_Per_Second / (DOUBLE) Number_Of_Runs; Dhrystones_Per_Second = (DOUBLE) Number_Of_Runs / User_Time; Vax_Mips = Dhrystones_Per_Second / 1757.0; +#else + Microseconds = User_Time / (DOUBLE) Number_Of_Runs; +#endif #ifdef ROPT @@ -274,7 +282,14 @@ #endif +#ifdef HAVE_DOUBLE printf ("Microseconds for one run through Dhrystone : %.1lf \n",Microseconds); printf ("Dhrystones per Second : %.1lf \n",Dhrystones_Per_Second); printf ("VAX MIPS rating : %.3lf \n",Vax_Mips); +#else + printf ("Begin_Time : %d\n",Begin_Time); + printf ("End_Time : %d\n",End_Time ); + printf ("User_Time : %d\n",User_Time ); + printf ("Numbers of cycle for one run through Dhrystone : %d \n",Microseconds); +#endif printf ("\n"); @@ -283,11 +298,14 @@ fprintf(Ap,"%s\n",Reg_Define); +#ifdef HAVE_DOUBLE fprintf(Ap,"Microseconds for one loop : %.1lf\n",Microseconds); fprintf(Ap,"Dhrystones per second : %.1lf\n",Dhrystones_Per_Second); fprintf(Ap,"VAX MIPS rating : %.3lf\n",Vax_Mips); +#else + fprintf(Ap,"Numbers of cycle for one loop : %.1d\n",Microseconds); +#endif } fclose(Ap); return 0; - } Index: /trunk/Softwares/Dhrystone/src/c/dtime.c =================================================================== --- /trunk/Softwares/Dhrystone/src/c/dtime.c (revision 113) +++ /trunk/Softwares/Dhrystone/src/c/dtime.c (revision 114) @@ -65,5 +65,5 @@ #ifndef MHZ -#define MHZ (1000000) +#define MHZ (1000000.0) #endif //!MHZ @@ -72,15 +72,14 @@ #endif //!FRQ -#ifndef DOUBLE -#define double -#endif - DOUBLE dtime() { DOUBLE q; -/* q = (DOUBLE)(my_times())/(DOUBLE)FRQ; */ +#ifdef HAVE_DOUBLE + q = (DOUBLE)(my_times())/(DOUBLE)FRQ; +#else q = (DOUBLE)(my_times()); - +#endif + return (q); } Index: /trunk/Softwares/Dhrystone/src/c/main.c =================================================================== --- /trunk/Softwares/Dhrystone/src/c/main.c (revision 113) +++ /trunk/Softwares/Dhrystone/src/c/main.c (revision 114) @@ -12,9 +12,6 @@ int main() { - printf("cycle : %f\n",dtime()); - -/* dhry21(100); */ - - + dhry21(100); + exit (0); Index: /trunk/Softwares/Dhrystone/src/include/dhry.h =================================================================== --- /trunk/Softwares/Dhrystone/src/include/dhry.h (revision 113) +++ /trunk/Softwares/Dhrystone/src/include/dhry.h (revision 114) @@ -338,6 +338,15 @@ /* Compiler and system dependent definitions: */ -#define DOUBLE float -#define Mic_secs_Per_Second 1000000.0 +#ifndef Morpheo +# define HAVE_DOUBLE +#endif + +#ifdef HAVE_DOUBLE +# define DOUBLE float +# define Mic_secs_Per_Second 1000000.0 +#else +# define DOUBLE unsigned int +# define Mic_secs_Per_Second 1000000 +#endif DOUBLE dtime (); Index: /trunk/Softwares/Makefile.Software =================================================================== --- /trunk/Softwares/Makefile.Software (revision 113) +++ /trunk/Softwares/Makefile.Software (revision 114) @@ -81,5 +81,5 @@ $(OR32_LD) -o $@ $^ $(OR32_LD_OPT); \ $(ECHO) "List symbols : $*.x.nm"; \ - $(OR32_NM) $(OR32_NM_OPT) $^ > $@.nm; \ + $(OR32_NM) $(OR32_NM_OPT) $@ > $@.nm; \ $(ECHO) "Display info : $*.x.txt"; \ $(OR32_OBJDUMP) $(OR32_OBJDUMP_OPT) $@ > $@.txt;\ Index: /trunk/Softwares/Test/Test_066/src/c/main.c =================================================================== --- /trunk/Softwares/Test/Test_066/src/c/main.c (revision 113) +++ /trunk/Softwares/Test/Test_066/src/c/main.c (revision 114) @@ -14,9 +14,6 @@ int main() { -/* printf("Hello World !!!\n"); */ + printf("Hello World !!!\n"); - for (int i=0; i<20; ++i) - printf("i : %d\n",i); - exit (0); Index: /trunk/Softwares/Test/Test_067/src/c/main.c =================================================================== --- /trunk/Softwares/Test/Test_067/src/c/main.c (revision 113) +++ /trunk/Softwares/Test/Test_067/src/c/main.c (revision 114) @@ -14,13 +14,6 @@ int main() { - FILE * file = fopen("Test_067.txt","w"); - - if (file == NULL) - exit (1); - - fprintf(file,"Hello World !!!\n"); - - if (fclose (file) != 0) - exit (2); + for (int i=0; i<10; ++i) + printf("i : %d\n",i); exit (0); Index: /trunk/Softwares/Test/Test_068/Makefile =================================================================== --- /trunk/Softwares/Test/Test_068/Makefile (revision 114) +++ /trunk/Softwares/Test/Test_068/Makefile (revision 114) @@ -0,0 +1,31 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + + +# common definition +DIR_SOFT = ../.. + +DIR_SRC = ./src +DIR_C = $(DIR_SRC)/c +DIR_ASM = $(DIR_SRC)/asm +DIR_SYS = $(DIR_SRC)/sys +DIR_INC = $(DIR_SRC)/include +DIR_LDSCRIPT = $(NEWLIB)/lib/ + +INCDIR = $(NEWLIB_INCDIR) -I$(DIR_INC) +LIBDIR = $(NEWLIB_LIBDIR) +LIBNAME = $(NEWLIB_LIBNAME) + +#-----[ Files ]------------------------------------------------------------------- +OBJECTS = $(NEWLIB)/lib/*.o \ + $(patsubst $(DIR_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_ASM)/*.s)) \ + $(patsubst $(DIR_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SYS)/*.s)) \ + $(patsubst $(DIR_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_C)/*.c)) + +include $(DIR_SOFT)/Makefile.Software + Index: /trunk/Softwares/Test/Test_068/src/c/main.c =================================================================== --- /trunk/Softwares/Test/Test_068/src/c/main.c (revision 114) +++ /trunk/Softwares/Test/Test_068/src/c/main.c (revision 114) @@ -0,0 +1,29 @@ +// $Id$ + +//=====[ main ]================================================================= +/* + * All thread execute this routine + * Initialize the thread and attribute a Workload at each thread + */ + +#include +#include +#include +#include + +int main() +{ + FILE * file = fopen("Test_068.txt","w"); + + if (file == NULL) + exit (1); + + fprintf(file,"Hello World !!!\n"); + + if (fclose (file) != 0) + exit (2); + + exit (0); + + while (1); +} Index: /trunk/Softwares/Test/Test_069/Makefile =================================================================== --- /trunk/Softwares/Test/Test_069/Makefile (revision 114) +++ /trunk/Softwares/Test/Test_069/Makefile (revision 114) @@ -0,0 +1,31 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + + +# common definition +DIR_SOFT = ../.. + +DIR_SRC = ./src +DIR_C = $(DIR_SRC)/c +DIR_ASM = $(DIR_SRC)/asm +DIR_SYS = $(DIR_SRC)/sys +DIR_INC = $(DIR_SRC)/include +DIR_LDSCRIPT = $(NEWLIB)/lib/ + +INCDIR = $(NEWLIB_INCDIR) -I$(DIR_INC) +LIBDIR = $(NEWLIB_LIBDIR) +LIBNAME = $(NEWLIB_LIBNAME) + +#-----[ Files ]------------------------------------------------------------------- +OBJECTS = $(NEWLIB)/lib/*.o \ + $(patsubst $(DIR_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_ASM)/*.s)) \ + $(patsubst $(DIR_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SYS)/*.s)) \ + $(patsubst $(DIR_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_C)/*.c)) + +include $(DIR_SOFT)/Makefile.Software + Index: /trunk/Softwares/Test/Test_069/src/c/main.c =================================================================== --- /trunk/Softwares/Test/Test_069/src/c/main.c (revision 114) +++ /trunk/Softwares/Test/Test_069/src/c/main.c (revision 114) @@ -0,0 +1,28 @@ +// $Id$ + +//=====[ main ]================================================================= +/* + * All thread execute this routine + * Initialize the thread and attribute a Workload at each thread + */ + +#include +#include +#include +#include +#include + +int main() +{ + unsigned int date_old = 0; + unsigned int date_new; + + date_new = my_times(); fprintf(stdout,"nb_cycle : %d\n" ,date_new ); date_old = date_new; + date_new = my_times(); fprintf(stdout,"nb_cycle : %d %d\n",date_new,date_new-date_old); date_old = date_new; + date_new = my_times(); fprintf(stdout,"nb_cycle : %d %d\n",date_new,date_new-date_old); date_old = date_new; + date_new = my_times(); fprintf(stdout,"nb_cycle : %d %d\n",date_new,date_new-date_old); date_old = date_new; + + exit (0); + + while (1); +} Index: /trunk/Softwares/Test/Test_070/Makefile =================================================================== --- /trunk/Softwares/Test/Test_070/Makefile (revision 114) +++ /trunk/Softwares/Test/Test_070/Makefile (revision 114) @@ -0,0 +1,31 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + + +# common definition +DIR_SOFT = ../.. + +DIR_SRC = ./src +DIR_C = $(DIR_SRC)/c +DIR_ASM = $(DIR_SRC)/asm +DIR_SYS = $(DIR_SRC)/sys +DIR_INC = $(DIR_SRC)/include +DIR_LDSCRIPT = $(NEWLIB)/lib/ + +INCDIR = $(NEWLIB_INCDIR) -I$(DIR_INC) +LIBDIR = $(NEWLIB_LIBDIR) +LIBNAME = $(NEWLIB_LIBNAME) + +#-----[ Files ]------------------------------------------------------------------- +OBJECTS = $(NEWLIB)/lib/*.o \ + $(patsubst $(DIR_ASM)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_ASM)/*.s)) \ + $(patsubst $(DIR_SYS)/%.s,$(DIR_OBJ)/%.o,$(wildcard $(DIR_SYS)/*.s)) \ + $(patsubst $(DIR_C)/%.c,$(DIR_OBJ)/%.o,$(wildcard $(DIR_C)/*.c)) + +include $(DIR_SOFT)/Makefile.Software + Index: /trunk/Softwares/Test/Test_070/src/c/main.c =================================================================== --- /trunk/Softwares/Test/Test_070/src/c/main.c (revision 114) +++ /trunk/Softwares/Test/Test_070/src/c/main.c (revision 114) @@ -0,0 +1,24 @@ +// $Id$ + +//=====[ main ]================================================================= +/* + * All thread execute this routine + * Initialize the thread and attribute a Workload at each thread + */ + +#include +#include +#include +#include +#include + +int main() +{ + time_t tnow; + + time(&tnow); fprintf(stdout,"%s",ctime(&tnow)); + + exit (0); + + while (1); +}