cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect ${CC} and update patches

Browse Source
This commit is contained in:
lebel 2002-07-17 21:57:20 +00:00
parent 77f46773d6
commit 81e67b1aa3
11 changed files with 229 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
benchmarks/bytebench/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2002/03/21 20:35:43 espie Exp $
# $OpenBSD: Makefile,v 1.15 2002/07/17 21:57:20 lebel Exp $
COMMENT= "BYTE magazine benchmark suite"
DISTNAME= bytebench-3.1
CATEGORIES= benchmarks
NEED_VERSION= 1.515
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
@ -16,6 +15,8 @@ PERMIT_DISTFILES_FTP= "no license"
MASTER_SITES= ftp://ftp.inria.fr/system/benchmark/
EXTRACT_SUFX= .tar.Z
MAKE_ENV= CC="${CC}"
do-install:
-${INSTALL_DATA_DIR} ${PREFIX}/lib/bytebench
for f in Makefile README Run doc pgms results testdir; \

96
benchmarks/bytebench/patches/patch-Makefile Normal file
View File

@ -0,0 +1,96 @@
$OpenBSD: patch-Makefile,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- Makefile.orig Wed Feb 5 05:08:43 1992
+++ Makefile Wed Jul 17 17:37:13 2002
@@ -24,18 +24,19 @@
##############################################################################
ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
SHELL = /bin/sh
-#HZ = ???? #(read from environment)
+HZ = 128
CFLAGS = -DTIME
-OPTON = -O #optimization on (give it your best shot)
- # -- check your compiler man
-OPTOFF = -Od #optimization off -- check your compiler man
+OPTON = -s -static -O6 -finline-functions -funroll-loops -fomit-frame-pointer
+ #optimization on (give it your best shot)
+ # -- check your compiler man
+OPTOFF = -O0 -static #optimization off -- check your compiler man
# local directories
PROGDIR = ./pgms
SRCDIR = ./src
DOCDIR = ./doc
TESTDIR = ./testdir
-RESULTDIR = ./results
-TMPDIR = ./tmp
+# RESULTDIR = ./results
+# TMPDIR = /var/tmp
# other directories
INCLDIR = /usr/include
LIBDIR = /lib
@@ -128,45 +129,45 @@ programs: $(BINS)
# Individual programs
$(PROGDIR)/arithoh: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c
$(PROGDIR)/register: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c
$(PROGDIR)/short: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c
$(PROGDIR)/int: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c
$(PROGDIR)/long: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c
$(PROGDIR)/float: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c
$(PROGDIR)/double: $(SRCDIR)/arith.c
- cc -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
+ $(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
$(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c
- cc -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
+ $(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
$(PROGDIR)/fstime: $(SRCDIR)/fstime.c
- cc -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c
+ $(CC) -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c
$(PROGDIR)/syscall: $(SRCDIR)/syscall.c
- cc -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c
+ $(CC) -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c
$(PROGDIR)/context1: $(SRCDIR)/context1.c
- cc -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c
+ $(CC) -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c
$(PROGDIR)/pipe: $(SRCDIR)/pipe.c
- cc -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c
+ $(CC) -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c
$(PROGDIR)/spawn: $(SRCDIR)/spawn.c
- cc -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c
+ $(CC) -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c
$(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c
- cc -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c
+ $(CC) -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c
$(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c
- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c
- cc -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c
+ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c
+ $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
$(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
- cc -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
+ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
+ $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
$(PROGDIR)/looper: $(SRCDIR)/looper.c
- cc -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c
+ $(CC) -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c
# Run the benchmarks and create the reports
run:

73
benchmarks/bytebench/patches/patch-Run Normal file
View File

@ -0,0 +1,73 @@
$OpenBSD: patch-Run,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- Run.orig Wed Feb 5 05:08:46 1992
+++ Run Wed Jul 17 17:36:08 2002
@@ -40,7 +40,7 @@ version="3.11"
# You will need ...
# awk cat cc chmod comm cp date dc df echo ed expr
# kill ls make mkdir rm sed test time touch tty umask who
-# AND /bin/time
+# AND /usr/bin/time
# to generate result indexes, you will also need ...
# join
#
@@ -50,7 +50,7 @@ umask 022 # at least mortals can read
if [ -z "$FLAVOR" ]
then
# determine flavor of UNIX from number of lines generated by /bin/tim
- Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
+ Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
case "$Fcount"
in
2) FLAVOR="BSD";;
@@ -67,10 +67,10 @@ else UNAME="hostname"
fi
export FLAVOR
# check that the required files are in the proper places
-if make check
- then :
- else make all
-fi
+#if make check
+# then :
+# else make all
+#fi
#
#
# establish full paths to directories
@@ -92,7 +92,7 @@ cd $SCRPDIR
SCRPDIR=`pwd`
cd $PWD
-TMPDIR=${HOMEDIR}/tmp
+TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
cd $TMPDIR
TMPDIR=`pwd`
cd $PWD
@@ -303,11 +303,11 @@ do # do level 1
C)
logmsg="C Compiler Test"
- prog="looper ${looper-60} cc cctest.c"
+ prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
stdout=/dev/null
repeat="$shortloop"
cleanopt="-m $TMPTIMES"
- rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
+ rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
;;
shell)
@@ -417,11 +417,10 @@ esac
############ THE BENCH IS TIMED ##############
if test "$stdin" = ""
then # without redirected stdin
- /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
+ /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
else # with redirected stdin
- /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
+ /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
fi
- /bin/time $benchcmd
###############################################
cd $pwd # move back home
status=$? # save the result code

165
benchmarks/bytebench/patches/patch-aa
View File

@ -1,165 +0,0 @@
*** Makefile.orig Wed Feb 5 11:08:43 1992
--- Makefile Mon Jan 1 23:20:07 1996
***************
*** 25,33 ****
ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
SHELL = /bin/sh
! #HZ = ???? #(read from environment)
CFLAGS = -DTIME
! OPTON = -O #optimization on (give it your best shot)
! # -- check your compiler man
! OPTOFF = -Od #optimization off -- check your compiler man
# local directories
PROGDIR = ./pgms
--- 25,34 ----
ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
SHELL = /bin/sh
! HZ = 128
CFLAGS = -DTIME
! OPTON = -s -static -O6 -finline-functions -funroll-loops -fomit-frame-pointer
! #optimization on (give it your best shot)
! # -- check your compiler man
! OPTOFF = -O0 -static #optimization off -- check your compiler man
# local directories
PROGDIR = ./pgms
***************
*** 36,40 ****
TESTDIR = ./testdir
! RESULTDIR = ./results
! TMPDIR = ./tmp
# other directories
INCLDIR = /usr/include
--- 37,41 ----
TESTDIR = ./testdir
! # RESULTDIR = ./results
! # TMPDIR = /var/tmp
# other directories
INCLDIR = /usr/include
*** Run.orig Wed Feb 5 11:08:46 1992
--- Run Wed Jan 3 00:13:43 1996
***************
*** 41,45 ****
# awk cat cc chmod comm cp date dc df echo ed expr
# kill ls make mkdir rm sed test time touch tty umask who
! # AND /bin/time
# to generate result indexes, you will also need ...
# join
--- 41,45 ----
# awk cat cc chmod comm cp date dc df echo ed expr
# kill ls make mkdir rm sed test time touch tty umask who
! # AND /usr/bin/time
# to generate result indexes, you will also need ...
# join
***************
*** 51,55 ****
then
# determine flavor of UNIX from number of lines generated by /bin/tim
! Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
case "$Fcount"
in
--- 51,55 ----
then
# determine flavor of UNIX from number of lines generated by /bin/tim
! Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
case "$Fcount"
in
***************
*** 68,75 ****
export FLAVOR
# check that the required files are in the proper places
! if make check
! then :
! else make all
! fi
#
#
--- 68,75 ----
export FLAVOR
# check that the required files are in the proper places
! #if make check
! # then :
! # else make all
! #fi
#
#
***************
*** 93,97 ****
cd $PWD
! TMPDIR=${HOMEDIR}/tmp
cd $TMPDIR
TMPDIR=`pwd`
--- 93,97 ----
cd $PWD
! TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
cd $TMPDIR
TMPDIR=`pwd`
***************
*** 304,312 ****
C)
logmsg="C Compiler Test"
! prog="looper ${looper-60} cc cctest.c"
stdout=/dev/null
repeat="$shortloop"
cleanopt="-m $TMPTIMES"
! rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
;;
--- 304,312 ----
C)
logmsg="C Compiler Test"
! prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
stdout=/dev/null
repeat="$shortloop"
cleanopt="-m $TMPTIMES"
! rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
;;
***************
*** 418,426 ****
if test "$stdin" = ""
then # without redirected stdin
! /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
else # with redirected stdin
! /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
fi
- /bin/time $benchcmd
###############################################
cd $pwd # move back home
--- 418,425 ----
if test "$stdin" = ""
then # without redirected stdin
! /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
else # with redirected stdin
! /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
fi
###############################################
cd $pwd # move back home
*** pgms/cleanup.sh.orig Wed Feb 5 11:08:37 1992
--- pgms/cleanup.sh Wed Jan 3 19:27:21 1996
***************
*** 87,92 ****
-r) : reason for failure
! echo $1
! echo $1 >>$LOGFILE
shift
;;
--- 87,92 ----
-r) : reason for failure
! echo -e $1
! echo -e $1 >>$LOGFILE
shift
;;
*** pgms/multi.sh.orig Thu Jan 4 15:16:20 1996
--- pgms/multi.sh Thu Jan 4 15:17:26 1996
***************
*** 15,18 ****
--- 15,19 ----
###############################################################################
ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
+ cd $TMPDIR
for i
do

19
benchmarks/bytebench/patches/patch-ab
View File

@ -1,19 +0,0 @@
*** src/dhry_1.c.orig Mon Dec 1 20:36:11 1997
--- src/dhry_1.c Mon Dec 1 20:36:23 1997
***************
*** 78,84 ****
/* Measurements should last at least about 2 seconds */
#endif
#ifdef TIME
! extern long time();
/* see library function "time" */
#define Too_Small_Time 2
/* Measurements should last at least 2 seconds */
--- 78,84 ----
/* Measurements should last at least about 2 seconds */
#endif
#ifdef TIME
! extern time_t time();
/* see library function "time" */
#define Too_Small_Time 2
/* Measurements should last at least 2 seconds */

14
benchmarks/bytebench/patches/patch-pgms_cleanup_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-pgms_cleanup_sh,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- pgms/cleanup.sh.orig Wed Feb 5 05:08:37 1992
+++ pgms/cleanup.sh Wed Jul 17 17:36:08 2002
@@ -86,8 +86,8 @@ do
;;
-r) : reason for failure
- echo $1
- echo $1 >>$LOGFILE
+ echo -e $1
+ echo -e $1 >>$LOGFILE
shift
;;

11
benchmarks/bytebench/patches/patch-pgms_multi_sh Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pgms_multi_sh,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- pgms/multi.sh.orig Wed Feb 5 05:08:38 1992
+++ pgms/multi.sh Wed Jul 17 17:36:08 2002
@@ -14,6 +14,7 @@
#
###############################################################################
ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
+cd $TMPDIR
for i
do
/bin/sh $BINDIR/tst.sh &

11
benchmarks/bytebench/patches/patch-ac → benchmarks/bytebench/patches/patch-src_big_c
View File

@ -1,6 +1,7 @@
--- src/big.c.orig Wed Feb 5 02:08:47 1992
+++ src/big.c Thu Feb 26 19:55:18 1998
@@ -81,10 +81,10 @@
$OpenBSD: patch-src_big_c,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- src/big.c.orig Wed Feb 5 05:08:47 1992
+++ src/big.c Wed Jul 17 17:36:08 2002
@@ -81,10 +81,10 @@ char *argv[];
int nch; /* # characters to write */
int written; /* # characters actully written */
char logname[15]; /* name of the log file(s) */
@ -15,7 +16,7 @@
int pvec[2]; /* for pipes */
char *p;
char *prog; /* my name */
@@ -383,22 +383,28 @@
@@ -383,22 +383,28 @@ bepatient:
}
@ -47,7 +48,7 @@
sigpipe++;
}
@@ -434,9 +440,13 @@
@@ -434,9 +440,13 @@ getwork()
char c;
char *malloc(), *realloc();

12
benchmarks/bytebench/patches/patch-src_dhry_1_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_dhry_1_c,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- src/dhry_1.c.orig Wed Feb 5 05:08:47 1992
+++ src/dhry_1.c Wed Jul 17 17:36:08 2002
@@ -78,7 +78,7 @@ extern int times ();
/* Measurements should last at least about 2 seconds */
#endif
#ifdef TIME
-extern long time();
+extern time_t time();
/* see library function "time" */
#define Too_Small_Time 2
/* Measurements should last at least 2 seconds */

7
benchmarks/bytebench/patches/patch-ad → benchmarks/bytebench/patches/patch-src_execl_c
View File

@ -1,6 +1,7 @@
--- src/execl.c.~1~ Wed Feb 5 02:08:40 1992
+++ src/execl.c Thu Feb 26 19:29:57 1998
@@ -44,7 +44,7 @@
$OpenBSD: patch-src_execl_c,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- src/execl.c.orig Wed Feb 5 05:08:40 1992
+++ src/execl.c Wed Jul 17 17:36:08 2002
@@ -44,7 +44,7 @@ char *argv[];
char *fullpath;
int duration;
char count_str[6], start_str[12], path_str[81], *dur_str;

19
benchmarks/bytebench/patches/patch-ae → benchmarks/bytebench/patches/patch-src_fstime_c
View File

@ -1,6 +1,7 @@
--- src/fstime.c.~1~ Wed Feb 5 02:08:45 1992
+++ src/fstime.c Thu Feb 26 19:39:16 1998
@@ -37,8 +37,8 @@
$OpenBSD: patch-src_fstime_c,v 1.1 2002/07/17 21:57:21 lebel Exp $
--- src/fstime.c.orig Wed Feb 5 05:08:45 1992
+++ src/fstime.c Wed Jul 17 17:36:08 2002
@@ -37,8 +37,8 @@ int seconds = SECONDS;
int f;
int g;
int i;
@ -11,7 +12,7 @@
int sigalarm = 0;
/******************** MAIN ****************************/
@@ -86,11 +86,11 @@
@@ -86,11 +86,11 @@ char **argv;
signal(SIGKILL,clean_up);
if(w_test() || r_test() || c_test())
{
@ -25,7 +26,7 @@
exit(0);
}
@@ -116,7 +116,7 @@
@@ -116,7 +116,7 @@ w_test()
if (errno != EINTR) {
perror("fstime: write");
return(-1);
@ -34,7 +35,7 @@
}
++ n_blocks;
}
@@ -156,7 +156,7 @@
@@ -156,7 +156,7 @@ r_test()
continue;
break;
case EINTR:
@ -43,7 +44,7 @@
break;
default:
perror("fstime: read");
@@ -200,7 +200,7 @@
@@ -200,7 +200,7 @@ c_test()
continue;
break;
case EINTR:
@ -52,7 +53,7 @@
break;
default:
perror("fstime: copy read");
@@ -212,7 +212,7 @@
@@ -212,7 +212,7 @@ c_test()
if (errno != EINTR) {
perror("fstime: copy write");
return(-1);
@ -61,7 +62,7 @@
}
++ n_blocks;
}
@@ -223,17 +223,17 @@
@@ -223,17 +223,17 @@ c_test()
return(0);
}