diff --git a/pyperf/pyperf_run b/pyperf/pyperf_run index 24e1028..a77be0c 100755 --- a/pyperf/pyperf_run +++ b/pyperf/pyperf_run @@ -67,7 +67,6 @@ install_tools() generate_csv_file() { - re='^[0-9]+$' instance=0 float=0 ivalue=0 @@ -86,8 +85,10 @@ generate_csv_file() if [ -z "$line" ]; then let "reduce=$reduce+1" if [[ $reduce -eq 2 ]]; then - results=`echo "${value_sum}/${res_count}" | bc -l` - printf "%s:%.2f:%s\n" $test_name $results $unit >> ${1}.csv + if [[ $test_name != *"WARNING:"* ]]; then + results=`echo "${value_sum}/${res_count}" | bc -l` + printf "%s:%.2f:%s\n" $test_name $results $unit >> ${1}.csv + fi reduce=0 res_count=0 value_sum=0 @@ -95,7 +96,7 @@ generate_csv_file() fi continue fi - if [[ $line == *"--"* ]] || [[ $line == *"calibrate"* ]] || [[ $line == *"warmup"* ]]; then + if [[ $line == *"--"* ]] || [[ $line == *"calibrate"* ]] || [[ $line == *"warmup"* ]] || [[ $line != *"value"* ]]; then continue fi value=`echo $line | cut -d' ' -f 4` @@ -104,7 +105,7 @@ generate_csv_file() value_sum=`echo "${value}+${value_sum}" | bc -l` done < "${1}.results" results=`echo "${value_sum}/${res_count}" | bc -l` - printf "%s:%12.2f:%s\n" $test_name $results $unit >> ${1}.csv + printf "%s:%.2f:%s\n" $test_name $results $unit >> ${1}.csv } pip3_install()