Update run.shHEADmaster

It seems we are not going to need neither perf-archive.sh nor
perf-buildid-cache.sh.

Change-Id: Ib8ce2298c0291110783b623ee312178cbfc844ea

1 files changed, 5 insertions, 12 deletions

diff --git a/run.sh b/run.sh
index b5835ee..8681f37 100755
--- a/run.sh
+++ b/run.sh
@@ -46,7 +46,7 @@ bmks[3]="444.namd 447.dealII 450.soplex 453.povray 470.lbm 482.sphinx3"
 cpus=(1)
 bmks[1]="400.perlbench 401.bzip2 403.gcc 429.mcf 445.gobmk 456.hmmer 458.sjeng 462.libquantum 464.h264ref 471.omnetpp 473.astar 483.xalancbmk 433.milc 444.namd 447.dealII 450.soplex 453.povray 470.lbm 482.sphinx3"
 
-builder=test-armv8-02.tcwglab:32769
+builder=test-armv8-02.tcwglab:32770
 case "$(uname -m)" in
     "aarch64")
 	tester=tcwg-tx1-test-1-0
@@ -87,7 +87,7 @@ cpus=(1 2 3)
 bmks[1]="400.perlbench"
 bmks[2]="458.sjeng"
 bmks[3]="444.namd"
-task=clang-build-id-2
+task=clang-build-id-4
 toolchain="llvm"
 tester=tcwg-tx1-test-123-0
 case "$(uname -m)" in
@@ -116,14 +116,14 @@ sudo ~/spec2xxx-utils/set-freq.sh 0,1,2,3 $freq_performance
 for cpu in ${cpus[@]}; do
     :
     #~/spec2xxx-utils/spec2xxx-config --config $task --build $builder --ccprefix $ccprefix --ccflags "-Wl,-dynamic-linker=$sysroot/$ldso -Wl,-rpath=$sysroot" --bind $cpu --helpercpu 0 --profiler perf -e cycles/period=20HZ/ --save-temps /home/maxim.kuvyrkov/$tester/cpu2006-$cpu
-    ~/spec2xxx-utils/spec2xxx-config --config $task --build $builder --ccprefix $ccprefix --bind $cpu --helpercpu 0 --profiler perf -e cycles/period=20HZ/ --save-temps --toolchain $toolchain /home/maxim.kuvyrkov/$tester/cpu2006-$cpu
+    ~/spec2xxx-utils/spec2xxx-config --config $task --build $builder --ccprefix $ccprefix --bind $cpu --helpercpu 0 --profiler perf -e cycles/period=20HZ/ --perf-bin /usr/lib/linux-tools/4.4.0-59-generic/perf --perf-buildid-dir local --save-temps --toolchain $toolchain /home/maxim.kuvyrkov/$tester/cpu2006-$cpu
 done
 
 for cpu in ${cpus[@]}; do
     (
 	cd /home/maxim.kuvyrkov/$tester/cpu2006-$cpu
 	. shrc
-	runspec -c $task -e O2 -a build ${bmks[$cpu]}
+	runspec -c $task -e O2g -a build ${bmks[$cpu]}
 	~/spec2xxx-utils/spec2xxx-result --dest $builder:results/$tester --tag $task --part .build.$cpu ./
     ) &
 done
@@ -146,14 +146,7 @@ for cpu in ${cpus[@]}; do
     (
 	cd /home/maxim.kuvyrkov/$tester/cpu2006-$cpu
 	. shrc
-	taskset -c 0 runspec -c $task -e O2 -a run -n 1 -i test ${bmks[$cpu]}
-
-	cachedir=$(mktemp -d /tmp/perf-archive-cache.XXXXXX)
-	id=$(ls result/*.log | sed "s/.*\.\([0-9]\+\)\.log/\1/" | sort | tail -n 1)
-	$(dirname $0)/perf-buildid-cache.sh --buildid-dir $cachedir -- result/perf.$id.data/*.data
-	$(dirname $0)/perf-archive.sh --buildid-dir $cachedir -o $spec/result/perf-buildid.$id.tar.bz2 -- result/perf.$id.data/*.data
-	rm -rf $cachedir
-
+	taskset -c 0 runspec -c $task -e O2g -a run -n 1 -i test ${bmks[$cpu]}
 	~/spec2xxx-utils/spec2xxx-result --dest dev-01.tcwglab:results/$tester --tag $task --part .run.$cpu ./
     ) &
 done