From 0c1ece3a5326ba377d7beb7f1cbd7453cc31f314 Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 23 Sep 1998 16:56:00 +0000 Subject: Use @PREFIX@ when substituting for ${PREFIX}. Add benchmark target to enable the benchmark to be run. --- benchmarks/hbench/Makefile | 11 ++++++-- benchmarks/hbench/files/setup.answers | 15 ++++++++++ benchmarks/hbench/patches/patch-aa | 30 ++++++++++---------- benchmarks/hbench/patches/patch-ab | 8 +++--- benchmarks/hbench/patches/patch-ac | 8 +++--- benchmarks/hbench/patches/patch-ad | 8 +++--- benchmarks/hbench/patches/patch-ae | 52 +++++++++++++++++------------------ benchmarks/hbench/patches/patch-af | 4 +-- benchmarks/hbench/patches/patch-ag | 6 ++-- benchmarks/hbench/patches/patch-ah | 26 +++++++++--------- benchmarks/hbench/patches/patch-ai | 12 ++++---- 11 files changed, 101 insertions(+), 79 deletions(-) create mode 100644 benchmarks/hbench/files/setup.answers (limited to 'benchmarks/hbench') diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile index b23d4f34dca..4ed1aa700b1 100644 --- a/benchmarks/hbench/Makefile +++ b/benchmarks/hbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/09/17 14:49:12 agc Exp $ +# $NetBSD: Makefile,v 1.3 1998/09/23 16:56:00 agc Exp $ DISTNAME= hbench-OS-1.0 PKGNAME= hbench-1.0 @@ -36,11 +36,18 @@ post-configure: scripts/interactive-setup scripts/maindriver \ Results/Makefile; do \ ${MV} $$f $$f.in; \ - ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' $$f.in > $$f; \ + ${SED} -e 's|@PREFIX@|${PREFIX}|g' $$f.in > $$f; \ done @/bin/chmod 0755 ${WRKSRC}/scripts/* do-install: @${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} ${SCRIPTDIR}/do-install +benchmark: + @cd ${WRKSRC}; \ + ${SED} -e 's|@pwd@|'`/bin/pwd`'|g' \ + -e 's|@hostname@|'`/bin/hostname -s`'|g' \ + ${FILESDIR}/setup.answers | ${MAKE} setup; \ + ${MAKE} run + .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/hbench/files/setup.answers b/benchmarks/hbench/files/setup.answers new file mode 100644 index 00000000000..c75216c739d --- /dev/null +++ b/benchmarks/hbench/files/setup.answers @@ -0,0 +1,15 @@ + + + + + + + + + + + + +@pwd@/conf/@hostname@.run + + diff --git a/benchmarks/hbench/patches/patch-aa b/benchmarks/hbench/patches/patch-aa index 65663fdc405..aef1f77adbd 100644 --- a/benchmarks/hbench/patches/patch-aa +++ b/benchmarks/hbench/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ +$NetBSD: patch-aa,v 1.2 1998/09/23 16:56:00 agc Exp $ --- scripts/interactive-setup.orig Thu Jun 26 17:37:25 1997 +++ scripts/interactive-setup Sat Sep 5 09:59:03 1998 @@ -35,7 +35,7 @@ @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ # Setup defaults. SYSTEMNAME=$HOSTNAME -HOSTTYPE=`${SHELL} ./scripts/config.guess` -+HOSTTYPE=`${SHELL} XXXPREFIXXXX/bin/hbench/config.guess` ++HOSTTYPE=`${SHELL} @PREFIX@/bin/hbench/config.guess` ARCH=`echo ${HOSTTYPE} | sed 's/-.*-.*$//'` OSTYPE=`echo ${HOSTTYPE} | sed 's/^.*-.*-//'` CYCLECOUNTER=NO @@ -27,8 +27,8 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ interactively build a configuration file for this particular system; -it will be saved by default in ./conf/${HOSTNAME}.run, unless you -specify otherwise below. Once you have created ./conf/${HOSTNAME}.run, -+it will be saved by default in XXXPREFIXXXX/share/hbench/conf/${HOSTNAME}.run, unless you -+specify otherwise below. Once you have created XXXPREFIXXXX/share/hbench/conf/${HOSTNAME}.run, ++it will be saved by default in @PREFIX@/share/hbench/conf/${HOSTNAME}.run, unless you ++specify otherwise below. Once you have created @PREFIX@/share/hbench/conf/${HOSTNAME}.run, either via this script, or manually, you can run the benchmarks by invoking make run @@ -38,8 +38,8 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ # to provide defaults. -if [ -f ./conf/${SYSTEMNAME}.run ]; then - . ./conf/${SYSTEMNAME}.run -+if [ -f XXXPREFIXXXX/share/hbench/conf/${SYSTEMNAME}.run ]; then -+ . XXXPREFIXXXX/share/hbench/conf/${SYSTEMNAME}.run ++if [ -f @PREFIX@/share/hbench/conf/${SYSTEMNAME}.run ]; then ++ . @PREFIX@/share/hbench/conf/${SYSTEMNAME}.run fi @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ read PLATFORMIN if [ X${PLATFORMIN}X != XX ]; then - PLATFORMCHK=`${SHELL} ./scripts/config.sub $PLATFORMIN 2>&1` -+ PLATFORMCHK=`${SHELL} XXXPREFIXXXX/bin/hbench/config.sub $PLATFORMIN 2>&1` ++ PLATFORMCHK=`${SHELL} @PREFIX@/bin/hbench/config.sub $PLATFORMIN 2>&1` if [ $? -eq 0 ]; then HOSTTYPE=$PLATFORMCHK AGAIN=N @@ -57,11 +57,11 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ HBench-OS determines what benchmarks to run by reading in a file that specifies which benchmarks to include and what parameters to pass them. -By default, the file ./conf/full.test is used, which runs the entire -+By default, the file XXXPREFIXXXX/share/hbench/conf/full.test is used, which runs the entire ++By default, the file @PREFIX@/share/hbench/conf/full.test is used, which runs the entire HBench-OS benchmark suite. This is recommended for basic use; however, if you are interested is a specific set of benchmarks, create a new -test file in the ./conf directory and enter its name below (without -+test file in the XXXPREFIXXXX/share/hbench/conf directory and enter its name below (without ++test file in the @PREFIX@/share/hbench/conf directory and enter its name below (without a directory specifier): EOF @@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ the servers on a remote networked machine. Standard (non-counter-enabled) binaries for each remote machine's architecture MUST be available in the -./bin directory for the remote tests to work. Also, note that, for best -+XXXPREFIXXXX/bin/hbench directory for the remote tests to work. Also, note that, for best ++@PREFIX@/bin/hbench directory for the remote tests to work. Also, note that, for best results, the remote machines should be identical to the local machine, and the network connecting them should be dedicated and quiescent. @@ -79,15 +79,15 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ By default, HBench-OS places results in a subdirectory .run#/ of the base result directory. The default for the base run directory -is ./Results/-/, in this case ./Results/${OSTYPE}-${ARCH}/. If -+is XXXPREFIXXXX/share/hbench/Results/-/, in this case -+XXXPREFIXXXX/share/hbench/Results/${OSTYPE}-${ARCH}/. If ++is @PREFIX@/share/hbench/Results/-/, in this case ++@PREFIX@/share/hbench/Results/${OSTYPE}-${ARCH}/. If you wish to alter the base directory location, enter the new directory now, or just press Enter for the default: EOF -echo $ECHON " Alternate resultbase directory? [default ./Results/${OSTYPE}-${ARCH}] $ECHOC" -+echo $ECHON " Alternate resultbase directory? [default XXXPREFIXXXX/share/hbench/Results/${OSTYPE}-${ARCH}] $ECHOC" ++echo $ECHON " Alternate resultbase directory? [default @PREFIX@/share/hbench/Results/${OSTYPE}-${ARCH}] $ECHOC" read RDBIN if [ X${RDBIN}X != XX ]; then RESULTDIRBASE=$RDBIN @@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.1 1998/09/05 22:02:19 garbled Exp $ # Pick a run filename -RUNFILE=./conf/${SYSTEMNAME}.run -+RUNFILE=XXXPREFIXXXX/share/hbench/conf/${SYSTEMNAME}.run ++RUNFILE=@PREFIX@/share/hbench/conf/${SYSTEMNAME}.run cat < ${dir}/analysis -+ XXXPREFIXXXX/bin/hbench/gen-analysis $dir > ${dir}/analysis ++ @PREFIX@/bin/hbench/gen-analysis $dir > ${dir}/analysis fi done diff --git a/benchmarks/hbench/patches/patch-ac b/benchmarks/hbench/patches/patch-ac index 8f40fde7be2..2f856cc5c3a 100644 --- a/benchmarks/hbench/patches/patch-ac +++ b/benchmarks/hbench/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.1 1998/09/05 22:02:19 garbled Exp $ +$NetBSD: patch-ac,v 1.2 1998/09/23 16:56:00 agc Exp $ --- scripts/create-all-latgraphs.orig Sat Sep 5 09:13:21 1998 +++ scripts/create-all-latgraphs Sat Sep 5 09:13:57 1998 @@ -33,13 +33,10 @@ # - # $Id: patch-ac,v 1.1 1998/09/05 22:02:19 garbled Exp $ + # $Id: patch-ac,v 1.2 1998/09/23 16:56:00 agc Exp $ -# Step 1: Discover hbench root path -HBENCHROOT=`(cd \`dirname $0\`/.. ; pwd)` - -for dir in */* -+for dir in XXXPREFIXXXX/share/hbench/*/* ++for dir in @PREFIX@/share/hbench/*/* do if [ -d $dir -a -d ${dir}/lat_mem_rd ]; then echo "Generating latency graph for $dir..." - ${HBENCHROOT}/scripts/gen-latgraph -ps ${dir}/lat_mem_rd -+ XXXPREFIXXXX/bin/hbench/gen-latgraph -ps ${dir}/lat_mem_rd ++ @PREFIX@/bin/hbench/gen-latgraph -ps ${dir}/lat_mem_rd fi done diff --git a/benchmarks/hbench/patches/patch-ad b/benchmarks/hbench/patches/patch-ad index 3ebda6e14db..10729893c16 100644 --- a/benchmarks/hbench/patches/patch-ad +++ b/benchmarks/hbench/patches/patch-ad @@ -1,19 +1,19 @@ -$NetBSD: patch-ad,v 1.1 1998/09/05 22:02:19 garbled Exp $ +$NetBSD: patch-ad,v 1.2 1998/09/23 16:56:00 agc Exp $ --- scripts/create-all-summaries.orig Sat Sep 5 09:15:35 1998 +++ scripts/create-all-summaries Sat Sep 5 09:16:09 1998 @@ -31,13 +31,10 @@ # - # $Id: patch-ad,v 1.1 1998/09/05 22:02:19 garbled Exp $ + # $Id: patch-ad,v 1.2 1998/09/23 16:56:00 agc Exp $ -# Step 1: Discover hbench root path -HBENCHROOT=`(cd \`dirname $0\`/.. ; pwd)` - -for dir in */* -+for dir in XXXPREFIXXXX/share/hbench/*/* ++for dir in @PREFIX@/share/hbench/*/* do if [ -d $dir ]; then echo Creating summary for $dir... - ${HBENCHROOT}/scripts/gen-summary $dir > ${dir}/summary -+ XXXPREFIXXXX/bin/hbench/gen-summary $dir > ${dir}/summary ++ @PREFIX@/bin/hbench/gen-summary $dir > ${dir}/summary fi done diff --git a/benchmarks/hbench/patches/patch-ae b/benchmarks/hbench/patches/patch-ae index 8989b65dc84..6e67dde7411 100644 --- a/benchmarks/hbench/patches/patch-ae +++ b/benchmarks/hbench/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ +$NetBSD: patch-ae,v 1.2 1998/09/23 16:56:01 agc Exp $ --- scripts/gen-analysis.orig Sat Sep 5 09:17:12 1998 +++ scripts/gen-analysis Sat Sep 5 09:19:56 1998 @@ -47,8 +47,7 @@ @@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ # Step 1: Discover hbench root path -$HBENCHROOT=`(cd \`dirname $0\`/.. ; pwd)`; -chop($HBENCHROOT); -+$HBENCHROOT="XXXPREFIXXXX/share/hbench"; ++$HBENCHROOT="@PREFIX@/share/hbench"; # Some general system information print "HBench-OS 1.0 Automatic Analysis Output\n"; @@ -16,7 +16,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ $lastsize = 0.0; foreach $file (@latencyfiles) { - $val = `${HBENCHROOT}/scripts/stats-single lat_mem_rd/$file`; -+ $val = `XXXPREFIXXXX/bin/hbench/stats-single lat_mem_rd/$file`; ++ $val = `@PREFIX@/bin/hbench/stats-single lat_mem_rd/$file`; chop($val); if ($val > $threshold*$lastval || $val < $lastval*(2-$threshold)) { @@ -25,31 +25,31 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ $drambuf = "4m"; -$l1read = `${HBENCHROOT}/scripts/stats-single bw_mem_rd_$l1buf`; -+$l1read = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_rd_$l1buf`; ++$l1read = `@PREFIX@/bin/hbench/stats-single bw_mem_rd_$l1buf`; chop($l1read); -$l2read = `${HBENCHROOT}/scripts/stats-single bw_mem_rd_$l2buf`; -+$l2read = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_rd_$l2buf`; ++$l2read = `@PREFIX@/bin/hbench/stats-single bw_mem_rd_$l2buf`; chop($l2read); -$dramread = `${HBENCHROOT}/scripts/stats-single bw_mem_rd_$drambuf`; -+$dramread = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_rd_$drambuf`; ++$dramread = `@PREFIX@/bin/hbench/stats-single bw_mem_rd_$drambuf`; chop($dramread); -$l1write = `${HBENCHROOT}/scripts/stats-single bw_mem_wr_$l1buf`; -+$l1write = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_wr_$l1buf`; ++$l1write = `@PREFIX@/bin/hbench/stats-single bw_mem_wr_$l1buf`; chop($l1write); -$l2write = `${HBENCHROOT}/scripts/stats-single bw_mem_wr_$l2buf`; -+$l2write = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_wr_$l2buf`; ++$l2write = `@PREFIX@/bin/hbench/stats-single bw_mem_wr_$l2buf`; chop($l2write); -$dramwrite = `${HBENCHROOT}/scripts/stats-single bw_mem_wr_$drambuf`; -+$dramwrite = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_wr_$drambuf`; ++$dramwrite = `@PREFIX@/bin/hbench/stats-single bw_mem_wr_$drambuf`; chop($dramwrite); -$l1zero = `${HBENCHROOT}/scripts/stats-single bw_bzero_$l1buf`; -+$l1zero = `XXXPREFIXXXX/bin/hbench/stats-single bw_bzero_$l1buf`; ++$l1zero = `@PREFIX@/bin/hbench/stats-single bw_bzero_$l1buf`; chop($l1zero); -$l2zero = `${HBENCHROOT}/scripts/stats-single bw_bzero_$l2buf`; -+$l2zero = `XXXPREFIXXXX/bin/hbench/stats-single bw_bzero_$l2buf`; ++$l2zero = `@PREFIX@/bin/hbench/stats-single bw_bzero_$l2buf`; chop($l2zero); -$dramzero = `${HBENCHROOT}/scripts/stats-single bw_bzero_$drambuf`; -+$dramzero = `XXXPREFIXXXX/bin/hbench/stats-single bw_bzero_$drambuf`; ++$dramzero = `@PREFIX@/bin/hbench/stats-single bw_bzero_$drambuf`; chop($dramzero); printf (" L1\$ : %.2fMB/sec read, %.2fMB/sec write, %.2f read/write ratio\n", @@ -58,13 +58,13 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print "\n * Comparison of Projected and Measured Copy Bandwidths\n"; print " (projection is one-half the harmonic mean of raw read/write bandwidths)\n"; -$l1copy = `${HBENCHROOT}/scripts/stats-single bw_mem_cp_${l1buf}_libc_aligned`; -+$l1copy = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_cp_${l1buf}_libc_aligned`; ++$l1copy = `@PREFIX@/bin/hbench/stats-single bw_mem_cp_${l1buf}_libc_aligned`; chop($l1copy); -$l2copy = `${HBENCHROOT}/scripts/stats-single bw_mem_cp_${l2buf}_libc_aligned`; -+$l2copy = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_cp_${l2buf}_libc_aligned`; ++$l2copy = `@PREFIX@/bin/hbench/stats-single bw_mem_cp_${l2buf}_libc_aligned`; chop($l2copy); -$dramcopy = `${HBENCHROOT}/scripts/stats-single bw_mem_cp_${drambuf}_libc_aligned`; -+$dramcopy = `XXXPREFIXXXX/bin/hbench/stats-single bw_mem_cp_${drambuf}_libc_aligned`; ++$dramcopy = `@PREFIX@/bin/hbench/stats-single bw_mem_cp_${drambuf}_libc_aligned`; chop($dramcopy); $l1proj = 1.0/(1.0/$l1read + 1.0/$l1write); @@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ $func =~ s/lat_syscall_//; - $val = `${HBENCHROOT}/scripts/stats-single $file`; -+ $val = `XXXPREFIXXXX/bin/hbench/stats-single $file`; ++ $val = `@PREFIX@/bin/hbench/stats-single $file`; chop($val); if ($val < $minsyscall) { $minsyscall2 = $minsyscall; @@ -82,7 +82,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print " * Approximate \"null\" System Call Time: " . $minsyscall . " us\n"; print " The system call auto-selected for this case is: ". $syscallname."\n"; -print " Full statistics: " . `${HBENCHROOT}/scripts/stats-full lat_syscall_$syscallname`; -+print " Full statistics: " . `XXXPREFIXXXX/bin/hbench/stats-full lat_syscall_$syscallname`; ++print " Full statistics: " . `@PREFIX@/bin/hbench/stats-full lat_syscall_$syscallname`; if ($syscallname eq "getpid") { print " NOTE: the system call selected was getpid, which is frequently\n"; print " cached at user-level, and thus not a true system call. If\n"; @@ -90,7 +90,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print " use the following (the second-fastest measured) system call instead:\n"; print " Time for the ".$syscallname2." system call: " . $minsyscall2 . " us\n"; - print " Full statistics: " . `${HBENCHROOT}/scripts/stats-full lat_syscall_$syscallname2`; -+ print " Full statistics: " . `XXXPREFIXXXX/bin/hbench/stats-full lat_syscall_$syscallname2`; ++ print " Full statistics: " . `@PREFIX@/bin/hbench/stats-full lat_syscall_$syscallname2`; } else { print " NOTE: this may be a cached system call, in which case the result\n"; print " is not representative of true null system call time.\n"; @@ -99,14 +99,14 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print " * Process Creation Analysis:\n"; print " Dynamic processes:\n"; -$nulld = `${HBENCHROOT}/scripts/stats-single lat_proc_null_dummy`; -+$nulld = `XXXPREFIXXXX/bin/hbench/stats-single lat_proc_null_dummy`; ++$nulld = `@PREFIX@/bin/hbench/stats-single lat_proc_null_dummy`; chop($nulld); $nulls = $nulld; -$simpled = `${HBENCHROOT}/scripts/stats-single lat_proc_simple_dynamic`; -+$simpled = `XXXPREFIXXXX/bin/hbench/stats-single lat_proc_simple_dynamic`; ++$simpled = `@PREFIX@/bin/hbench/stats-single lat_proc_simple_dynamic`; chop($simpled); -$shd = `${HBENCHROOT}/scripts/stats-single lat_proc_sh_dynamic`; -+$shd = `XXXPREFIXXXX/bin/hbench/stats-single lat_proc_sh_dynamic`; ++$shd = `@PREFIX@/bin/hbench/stats-single lat_proc_sh_dynamic`; chop($shd); $totald = $shd; $shd -= $simpled; @@ -115,10 +115,10 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ if ( -f "lat_proc_simple_static" && -f "lat_proc_sh_static" ) { print " Static processes:\n"; - $simples = `${HBENCHROOT}/scripts/stats-single lat_proc_simple_static`; -+ $simples = `XXXPREFIXXXX/bin/hbench/stats-single lat_proc_simple_static`; ++ $simples = `@PREFIX@/bin/hbench/stats-single lat_proc_simple_static`; chop($simples); - $shs = `${HBENCHROOT}/scripts/stats-single lat_proc_sh_static`; -+ $shs = `XXXPREFIXXXX/bin/hbench/stats-single lat_proc_sh_static`; ++ $shs = `@PREFIX@/bin/hbench/stats-single lat_proc_sh_static`; chop($shs); $totals = $shs; $shs -= $simples; @@ -127,7 +127,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print " (using $drambuf read to avoid low timer resolution)\n"; -$mmaprd = `${HBENCHROOT}/scripts/stats-single bw_mmap_rd_$drambuf`; -+$mmaprd = `XXXPREFIXXXX/bin/hbench/stats-single bw_mmap_rd_$drambuf`; ++$mmaprd = `@PREFIX@/bin/hbench/stats-single bw_mmap_rd_$drambuf`; chop($mmaprd); $mmapoverhead = 1000000/(256*$mmaprd) - 1000000/(256*$dramread); printf(" Mmap read bandwidth: %.2fMB/sec; raw HW read bandwidth: %.2fMB/sec\n", @@ -136,7 +136,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print "\n * TCP Network Stack Loopback Copy Overhead:\n"; -$tcpbw = `${HBENCHROOT}/scripts/stats-single bw_tcp_1m_localhost`; -+$tcpbw = `XXXPREFIXXXX/bin/hbench/stats-single bw_tcp_1m_localhost`; ++$tcpbw = `@PREFIX@/bin/hbench/stats-single bw_tcp_1m_localhost`; chop($tcpbw); printf(" TCP bandwidth (1MB buffer via localhost): %.2fMB/sec\n",$tcpbw); @@ -145,7 +145,7 @@ $NetBSD: patch-ae,v 1.1 1998/09/05 22:02:19 garbled Exp $ print "\n * Pipe-based IPC Copy Overhead:\n"; -$pipebw = `${HBENCHROOT}/scripts/stats-single bw_pipe_$drambuf`; -+$pipebw = `XXXPREFIXXXX/bin/hbench/stats-single bw_pipe_$drambuf`; ++$pipebw = `@PREFIX@/bin/hbench/stats-single bw_pipe_$drambuf`; chop($pipebw); printf(" Pipe bandwidth ($drambuf transfer): %.2fMB/sec\n",$pipebw); diff --git a/benchmarks/hbench/patches/patch-af b/benchmarks/hbench/patches/patch-af index 2a53e0521a1..826164ffd43 100644 --- a/benchmarks/hbench/patches/patch-af +++ b/benchmarks/hbench/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 1998/09/05 22:02:20 garbled Exp $ +$NetBSD: patch-af,v 1.2 1998/09/23 16:56:01 agc Exp $ --- scripts/gen-latgraph.orig Sat Sep 5 09:20:49 1998 +++ scripts/gen-latgraph Sat Sep 5 09:22:07 1998 @@ -63,9 +63,6 @@ @@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.1 1998/09/05 22:02:20 garbled Exp $ size=`echo $file |sed "s/^rd_//" | sed "s/_.*$//"` size=`echo $size | awk '{print $1/1024;}'` - VAL=`${HBENCHROOT}/scripts/stats-single $file` -+ VAL=`XXXPREFIXXXX/bin/hbench/stats-single $file` ++ VAL=`@PREFIX@/bin/hbench/stats-single $file` if [ `echo "$VAL $YMAX" | awk '{print ($1 > $2);}'` -gt 0 ]; then YMAX=$VAL fi diff --git a/benchmarks/hbench/patches/patch-ag b/benchmarks/hbench/patches/patch-ag index b99c94394aa..c1ed5420d46 100644 --- a/benchmarks/hbench/patches/patch-ag +++ b/benchmarks/hbench/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 1998/09/05 22:02:20 garbled Exp $ +$NetBSD: patch-ag,v 1.2 1998/09/23 16:56:01 agc Exp $ --- scripts/gen-summary.orig Sat Sep 5 09:23:30 1998 +++ scripts/gen-summary Sat Sep 5 09:24:09 1998 @@ -45,9 +45,6 @@ @@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.1 1998/09/05 22:02:20 garbled Exp $ echo "${benchmark}:" FILES="${benchmark}_* ${benchmark}" - FILES=`echo ${FILES} | ${HBENCHROOT}/scripts/argsort` -+ FILES=`echo ${FILES} | XXXPREFIXXXX/bin/hbench/argsort` ++ FILES=`echo ${FILES} | @PREFIX@/bin/hbench/argsort` for file in $FILES do if [ -f $file ]; then @@ -25,7 +25,7 @@ $NetBSD: patch-ag,v 1.1 1998/09/05 22:02:20 garbled Exp $ PARAMS="${PARAMS}: " - echo " ${PARAMS}`${HBENCHROOT}/scripts/stats-full $file 2>&1`" -+ echo " ${PARAMS}`XXXPREFIXXXX/bin/hbench/stats-full $file 2>&1`" ++ echo " ${PARAMS}`@PREFIX@/bin/hbench/stats-full $file 2>&1`" fi done echo diff --git a/benchmarks/hbench/patches/patch-ah b/benchmarks/hbench/patches/patch-ah index 8a846c6bb1a..2db61586cae 100644 --- a/benchmarks/hbench/patches/patch-ah +++ b/benchmarks/hbench/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 1998/09/05 22:02:20 garbled Exp $ +$NetBSD: patch-ah,v 1.2 1998/09/23 16:56:01 agc Exp $ --- scripts/maindriver.orig Sat Sep 5 09:24:50 1998 +++ scripts/maindriver Sat Sep 5 09:28:52 1998 @@ -48,9 +48,6 @@ @@ -16,19 +16,19 @@ $NetBSD: patch-ah,v 1.1 1998/09/05 22:02:20 garbled Exp $ if [ X${PLAINBINDIR}X = XX ]; then - PLAINBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH} -+ PLAINBINDIR=XXXPREFIXXXX/bin/hbench/${OSTYPE}-${ARCH} ++ PLAINBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH} fi if [ X${CYCLECOUNTERBINDIR}X = XX ]; then - CYCLECOUNTERBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH}-c -+ CYCLECOUNTERBINDIR=XXXPREFIXXXX/bin/hbench/${OSTYPE}-${ARCH}-c ++ CYCLECOUNTERBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH}-c fi if [ X${EVENTCOUNTERBINDIR}X = XX ]; then - EVENTCOUNTERBINDIR=${HBENCHROOT}/bin/${OSTYPE}-${ARCH}-ec -+ EVENTCOUNTERBINDIR=XXXPREFIXXXX/bin/hbench/${OSTYPE}-${ARCH}-ec ++ EVENTCOUNTERBINDIR=@PREFIX@/bin/hbench/${OSTYPE}-${ARCH}-ec fi if [ X${RESULTDIRBASE}X = XX ]; then - RESULTDIRBASE=${HBENCHROOT}/Results/${OSTYPE}-${ARCH} -+ RESULTDIRBASE=XXXPREFIXXXX/share/hbench/Results/${OSTYPE}-${ARCH} ++ RESULTDIRBASE=@PREFIX@/share/hbench/Results/${OSTYPE}-${ARCH} fi RESULTDIRB=${RESULTDIRBASE}/${SYSTEMNAME} @@ -40,10 +40,10 @@ $NetBSD: patch-ah,v 1.1 1998/09/05 22:02:20 garbled Exp $ - TESTS=${HBENCHROOT}/conf/${TESTFILE} -elif [ -f ${HBENCHROOT}/conf/${TESTFILE}.test ]; then - TESTS=${HBENCHROOT}/conf/${TESTFILE}.test -+elif [ -f XXXPREFIXXXX/share/hbench/conf/${TESTFILE} ]; then -+ TESTS=XXXPREFIXXXX/share/hbench/conf/${TESTFILE} -+elif [ -f XXXPREFIXXXX/share/hbench/conf/${TESTFILE}.test ]; then -+ TESTS=XXXPREFIXXXX/share/hbench/conf/${TESTFILE}.test ++elif [ -f @PREFIX@/share/hbench/conf/${TESTFILE} ]; then ++ TESTS=@PREFIX@/share/hbench/conf/${TESTFILE} ++elif [ -f @PREFIX@/share/hbench/conf/${TESTFILE}.test ]; then ++ TESTS=@PREFIX@/share/hbench/conf/${TESTFILE}.test else echo "Unable to locate test file ${TESTFILE}." echo "Fix run file $1 and retry" @@ -52,10 +52,10 @@ $NetBSD: patch-ah,v 1.1 1998/09/05 22:02:20 garbled Exp $ esac else - ${RCP} ${HBENCHROOT}/scripts/config.guess ${machine}:/tmp/get-os -+ ${RCP} XXXPREFIXXXX/bin/hbench/config.guess ${machine}:/tmp/get-os ++ ${RCP} @PREFIX@/bin/hbench/config.guess ${machine}:/tmp/get-os REMOTEOS=`$RSH $machine -n /tmp/get-os | sed 's/^.*-.*-//` - ${RCP} ${HBENCHROOT}/bin/${REMOTEOS}/$1 ${machine}:/tmp -+ ${RCP} XXXPREFIXXXX/bin/hbench/${REMOTEOS}/$1 ${machine}:/tmp ++ ${RCP} @PREFIX@/bin/hbench/${REMOTEOS}/$1 ${machine}:/tmp $RSH $machine -n /tmp/$1 0 $3 -s 2>> $STDERR & fi @@ -64,13 +64,13 @@ $NetBSD: patch-ah,v 1.1 1998/09/05 22:02:20 garbled Exp $ echo $ECHON "Generating summary information...${ECHOC}" rm -f ${RESULTDIR}/summary - ${HBENCHROOT}/scripts/gen-summary ${RESULTDIR} > ${RESULTDIR}/summary -+ XXXPREFIXXXX/bin/hbench/gen-summary ${RESULTDIR} > ${RESULTDIR}/summary ++ @PREFIX@/bin/hbench/gen-summary ${RESULTDIR} > ${RESULTDIR}/summary echo "done." echo $ECHON "Performing basic automated data analysis...${ECHOC}" rm -f ${RESULTDIR}/analysis - ${HBENCHROOT}/scripts/gen-analysis ${RESULTDIR} > ${RESULTDIR}/analysis -+ XXXPREFIXXXX/bin/hbench/gen-analysis ${RESULTDIR} > ${RESULTDIR}/analysis ++ @PREFIX@/bin/hbench/gen-analysis ${RESULTDIR} > ${RESULTDIR}/analysis echo "done." if [ `cat $RESULTDIR/errors | wc -l` -gt 0 ]; then diff --git a/benchmarks/hbench/patches/patch-ai b/benchmarks/hbench/patches/patch-ai index c42384d1fa2..e564f3dc16c 100644 --- a/benchmarks/hbench/patches/patch-ai +++ b/benchmarks/hbench/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1 1998/09/05 22:02:20 garbled Exp $ +$NetBSD: patch-ai,v 1.2 1998/09/23 16:56:01 agc Exp $ --- Results/Makefile.orig Sat Sep 5 09:35:16 1998 +++ Results/Makefile Sat Sep 5 09:36:22 1998 @@ -41,8 +41,8 @@ @@ -7,8 +7,8 @@ $NetBSD: patch-ai,v 1.1 1998/09/05 22:02:20 garbled Exp $ SHELL=/bin/sh -ARCH=`$(SHELL) ../scripts/config.guess | sed 's/-.*-.*$$//'` -OS=`$(SHELL) ../scripts/config.guess | sed 's/^.*-.*-//'` -+ARCH=`$(SHELL) XXXPREFIXXXX/bin/hbench/config.guess | sed 's/-.*-.*$$//'` -+OS=`$(SHELL) XXXPREFIXXXX/bin/hbench/config.guess | sed 's/^.*-.*-//'` ++ARCH=`$(SHELL) @PREFIX@/bin/hbench/config.guess | sed 's/-.*-.*$$//'` ++OS=`$(SHELL) @PREFIX@/bin/hbench/config.guess | sed 's/^.*-.*-//'` default: @echo "Select one of the following targets:" @@ -17,12 +17,12 @@ $NetBSD: patch-ai,v 1.1 1998/09/05 22:02:20 garbled Exp $ summaries: - $(SHELL) ../scripts/create-all-summaries -+ $(SHELL) XXXPREFIXXXX/bin/hbench/create-all-summaries ++ $(SHELL) @PREFIX@/bin/hbench/create-all-summaries analyses: - $(SHELL) ../scripts/create-all-analyses -+ $(SHELL) XXXPREFIXXXX/bin/hbench/create-all-analyses ++ $(SHELL) @PREFIX@/bin/hbench/create-all-analyses latencygraphs: - $(SHELL) ../scripts/create-all-latgraphs -+ $(SHELL) XXXPREFIXXXX/bin/hbench/create-all-latgraphs ++ $(SHELL) @PREFIX@/bin/hbench/create-all-latgraphs -- cgit v1.2.3