From 944424c8dabc81f84b3e1916898da225551ada24 Mon Sep 17 00:00:00 2001 From: Ramin Zaghi Date: Wed, 7 Mar 2012 17:34:13 +0000 Subject: [PATCH] A few minor fixes for the initial release. --- Makefile | 2 +- cleanall.sh | 0 getlog.sh | 10 +++++----- headers/versionheader.h | 2 +- inc/NE10.h | 2 +- nightly.pl | 9 --------- runperf.sh | 16 +++++----------- 7 files changed, 13 insertions(+), 28 deletions(-) mode change 100644 => 100755 cleanall.sh diff --git a/Makefile b/Makefile index a5ef17d..6a15ab7 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ libNE10.a : $(ALLFILES) NE10_init.h NE10_init.c ar rcs libNE10.a $(ALLFILES) libNE10.so : $(ALLFILES) NE10_init.h NE10_init.c - gcc -shared -o $@ $(ALLFILES) + gcc -shared -o $@ $(C_FLAGS) $(ALLFILES) %.test_r.ex : %.asm_r.o %.c_r.o %.neon_r.o ./source/%_test.c ./inc/NE10.h $(EXE_TOOL) $(OPTIMIZE_FLAGS) $(ARM_FLAGS) $^ -o $@ $(C_FLAGS) -L/lib/arm-linux-gnueabi diff --git a/cleanall.sh b/cleanall.sh old mode 100644 new mode 100755 diff --git a/getlog.sh b/getlog.sh index 72e46d0..cbbaf23 100755 --- a/getlog.sh +++ b/getlog.sh @@ -33,28 +33,28 @@ echo echo echo -e "\033[4mINSTALLED TOOLS:\033[0m" echo "git:" -if [ "`which git`" == "" ]; then +if [ "`which git`" = "" ]; then echo "fatal: 'git' is not installed on this system" 1>&2 exit 1 fi git --version | paste -s -d ';' - echo echo "gcc:" -if [ "`which gcc`" == "" ]; then +if [ "`which gcc`" = "" ]; then echo "fatal: 'gcc' is not installed on this system" 1>&2 exit 1 fi gcc --version | paste -s -d ';' - echo echo "as:" -if [ "`which as`" == "" ]; then +if [ "`which as`" = "" ]; then echo "fatal: 'as' is not installed on this system" 1>&2 exit 1 fi as --version | paste -s -d ';' - echo echo "ar:" -if [ "`which ar`" == "" ]; then +if [ "`which ar`" = "" ]; then echo "fatal: 'ar' is not installed on this system" 1>&2 exit 1 fi @@ -62,7 +62,7 @@ ar --version | paste -s -d ';' - echo echo echo "perl:" -if [ "`which perl`" == "" ]; then +if [ "`which perl`" = "" ]; then echo "fatal: 'perl' is not installed on this system" 1>&2 exit 1 fi diff --git a/headers/versionheader.h b/headers/versionheader.h index 1e57811..b07a91a 100644 --- a/headers/versionheader.h +++ b/headers/versionheader.h @@ -26,6 +26,6 @@ #define VERSION_MINOR 0 #define VERSION_REVISION 10 -#define PAHSE 1 +#define PHASE 1 #define COPYRIGHT_YEAR 2011 #define COPYRIGHT_HOLDER "ARM Ltd." diff --git a/inc/NE10.h b/inc/NE10.h index 9effa19..99bdee9 100644 --- a/inc/NE10.h +++ b/inc/NE10.h @@ -79,7 +79,7 @@ extern arm_result_t (*addc_vec4f)(arm_vec4f_t * dst, arm_vec4f_t * src, const ar Subtracts a constant scalar from all the elements of an input array and stores the results in an output array. @param[out] dst Pointer to the destination array @param[in] src Pointer to the source array - @param[in] cst Pointer to the 2D vector added to the input values + @param[in] cst The constant scalar subtracted from the input values @param[in] count The number of items in the input array */ extern arm_result_t (*subc_float)(arm_float_t * dst, arm_float_t * src, const arm_float_t cst, unsigned int count); diff --git a/nightly.pl b/nightly.pl index ee05abf..95101df 100755 --- a/nightly.pl +++ b/nightly.pl @@ -77,14 +77,5 @@ foreach my $success (@built) } } - - # loop through successfully built units - foreach my $unit (@built) - { - # build a string for all STDOUT text files (test outputs) and STDERR files (perflogs) - my $stdout_str = `cat res_std_NE10_${unit}_*_$iterations.txt`; - my $stderr_str = `cat res_err_NE10_${unit}_*_$iterations.txt`; - } - # print out a summary of this run print ( $testlog ); diff --git a/runperf.sh b/runperf.sh index a554d55..213906f 100755 --- a/runperf.sh +++ b/runperf.sh @@ -18,8 +18,7 @@ # # NE10 Library : runperf.sh # -#stty echo -#clear + # NOTE: the following string comparisons differ between BASH and SH if [ ! -n "$1" ]; then exit; fi if [ ! -n "$2" ]; then exit; fi @@ -29,7 +28,6 @@ OP_COUNT=$? IMPL_COUNT=3 ITERATIONS=$2 PERF_CMD="perf stat -e cycles,instructions,cache-references,cache-misses,branches,branch-misses,bus-cycles,cpu-clock,task-clock,faults,minor-faults,major-faults,context-switches,migrations,alignment-faults,emulation-faults -x," -#stty echo rm res_*_$1_*.txt for o in $(seq $OP_COUNT) do @@ -45,8 +43,6 @@ do fi for i in $(seq $IMPL_COUNT) do - #./NE10_mulc_test_r.ex $o $i $ITERATIONS - #echo "TEST#"$o";"$i >>res_err.txt ./$1.test_r.ex $o $i $ITERATIONS 1>/dev/null 2>/dev/null RET=$? if [ "$RET" -ne "0" ]; then @@ -55,12 +51,10 @@ do else STDOUT_FILE="res_std_"$1_$o"_"$i"_"$ITERATIONS".txt"; STDERR_FILE="res_err_"$1_$o"_"$i"_"$ITERATIONS".txt"; - echo "$STDOUT_FILE" > $STDOUT_FILE; - echo "$STDERR_FILE" > $STDERR_FILE; - $PERF_CMD ./$1.test_r.ex $o $i $ITERATIONS 1>>$STDOUT_FILE 2>>$STDERR_FILE; +# Uncomment and use the following three lines if you would like to see the output from perf +# echo "$STDOUT_FILE" > $STDOUT_FILE; +# echo "$STDERR_FILE" > $STDERR_FILE; +# $PERF_CMD ./$1.test_r.ex $o $i $ITERATIONS 1>>$STDOUT_FILE 2>>$STDERR_FILE; fi - #echo $o $i; - #q=12; done done -#stty echo -- 2.7.4