From 58d9801938a31403427efe7b54604c01360b04c5 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 21 Feb 2012 18:02:40 +0100 Subject: [PATCH] parsing.sh: Make metric pattern work again --- communication_techniques/parsing.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/communication_techniques/parsing.sh b/communication_techniques/parsing.sh index 2c03b8b..df83b2c 100755 --- a/communication_techniques/parsing.sh +++ b/communication_techniques/parsing.sh @@ -184,7 +184,7 @@ get_metric_values () metriquePattern="$5" logFile=cache_$cache-*-typeProd_$prod-argTypeProd_$argTypeProd-*-${com}_comm.log - metricValues=$(grep -E "$metriquePattern" $logFile | sed -r "s/^(.*[^[:alnum:].,])?($metriquePattern)([^[:alnum:]].*)?$/\2/;s/^(.*[^[:alnum:].,])?([[:digit:].,]+)([^[:alnum:]].*)?$/\2/;s/[,.]/./") + metricValues=$(grep -E "$metriquePattern" $logFile | sed -r "s/^ *($metriquePattern).*$/\1/;s/^ *([[:digit:]., ]+).*$/\1/;s/[,.]/./" | tr -d ' ') totalValue=0 for metricValue in $metricValues do @@ -435,16 +435,16 @@ main() for metrique in $metriqueList ; do case "$metrique" in cache_hits) - metriquePattern="[[:digit:]]+ +(L1-dcache-loads|L1-dcache-stores|L1-dcache-prefetches|LLC-loads|LLC-stores|LLC-prefetches) " + metriquePattern="[[:digit:] ]+(L1-dcache-loads|L1-dcache-stores|L1-dcache-prefetches|LLC-loads|LLC-stores|LLC-prefetches) " ylabel="Nb cache hit" ;; cache_miss) - metriquePattern="[[:digit:]]+ +(L1-dcache-load-misses|L1-dcache-store-misses|L1-dcache-prefetch-misses|LLC-load-misses|LLC-store-misses|LLC-prefetch-misses) " + metriquePattern="[[:digit:] ]+(L1-dcache-load-misses|L1-dcache-store-misses|L1-dcache-prefetch-misses|LLC-load-misses|LLC-store-misses|LLC-prefetch-misses) " ylabel="Nb cache miss" ;; cycles) - metriquePattern="[[:digit:]]+ +cycles " + metriquePattern="[[:digit:] ]+cycles " ylabel="Nb cycles" ;; total_time) - metriquePattern="[[:digit:].,]+ +seconds time elapsed " + metriquePattern="[[:digit:]., ]+seconds time elapsed " ylabel="Secondes" ;; *) echo "Pas de pattern pour cette métrique : $metrique"