diff options
author | drochner <drochner> | 2007-09-28 13:21:33 +0000 |
---|---|---|
committer | drochner <drochner> | 2007-09-28 13:21:33 +0000 |
commit | 73b7713a7a309ea2e92be40ead5e6a5e367e7ef0 (patch) | |
tree | 0cd8f4f8dd190b75f5de5b4a4e4097389e42f6c0 /benchmarks | |
parent | 0ab0daeac80826808b98ceeee48aeb3fc94a8042 (diff) | |
download | pkgsrc-73b7713a7a309ea2e92be40ead5e6a5e367e7ef0.tar.gz |
make this compile on -current
(the benchmark looks not very useful on current CPUs - runs within
fractions of seconds -, but anyway)
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/linpack-bench/distinfo | 4 | ||||
-rw-r--r-- | benchmarks/linpack-bench/patches/patch-aa | 35 |
2 files changed, 25 insertions, 14 deletions
diff --git a/benchmarks/linpack-bench/distinfo b/benchmarks/linpack-bench/distinfo index dba677e7d9f..98798658680 100644 --- a/benchmarks/linpack-bench/distinfo +++ b/benchmarks/linpack-bench/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/22 21:16:36 agc Exp $ +$NetBSD: distinfo,v 1.3 2007/09/28 13:21:33 drochner Exp $ SHA1 (linpackc) = be1507b205b0226a1deba358a90a469c2e55d3ee RMD160 (linpackc) = d54385d1a20b062776edfe8d10a3ec8900163b8b Size (linpackc) = 20942 bytes -SHA1 (patch-aa) = b5f9971ed17457f2a134bf2737b2df018056b9d9 +SHA1 (patch-aa) = 521bcb06993df028d03d15679adc3146f790b6dc diff --git a/benchmarks/linpack-bench/patches/patch-aa b/benchmarks/linpack-bench/patches/patch-aa index 28e37305092..9d992b44e43 100644 --- a/benchmarks/linpack-bench/patches/patch-aa +++ b/benchmarks/linpack-bench/patches/patch-aa @@ -1,7 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ ---- linpack.c.orig Sun Aug 30 11:34:04 1998 -+++ linpack.c Sun Aug 30 11:40:18 1998 -@@ -48,7 +48,7 @@ +$NetBSD: patch-aa,v 1.2 2007/09/28 13:21:33 drochner Exp $ + +--- linpack.c.orig 2007-09-02 12:38:13.000000000 +0200 ++++ linpack.c +@@ -48,7 +48,7 @@ You must specify one of -DROLL or -DUNRO #include <stdio.h> #include <math.h> @@ -10,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ main () { -@@ -71,11 +71,11 @@ +@@ -71,11 +71,11 @@ main () matgen(a,lda,n,b,&norma); t1 = second(); dgefa(a,lda,n,ipvt,&info); @@ -25,7 +26,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ /* compute a residual to verify results. */ -@@ -108,10 +108,10 @@ +@@ -108,10 +108,10 @@ main () fprintf(stderr," dgefa dgesl total kflops unit"); fprintf(stderr," ratio\n"); @@ -40,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ fprintf(stderr," times for array with leading dimension of%5d\n",lda); print_time(0); -@@ -119,28 +119,28 @@ +@@ -119,28 +119,28 @@ main () matgen(a,lda,n,b,&norma); t1 = second(); dgefa(a,lda,n,ipvt,&info); @@ -83,7 +84,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ ntimes = NTIMES; tm2 = 0.0; -@@ -153,19 +153,19 @@ +@@ -153,19 +153,19 @@ main () dgefa(a,lda,n,ipvt,&info); } @@ -110,7 +111,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ print_time(1); print_time(2); -@@ -174,41 +174,41 @@ +@@ -174,41 +174,41 @@ main () matgen(aa,ldaa,n,b,&norma); t1 = second(); dgefa(aa,ldaa,n,ipvt,&info); @@ -173,7 +174,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ ntimes = NTIMES; tm2 = 0; -@@ -219,22 +219,22 @@ +@@ -219,22 +219,22 @@ main () tm2 = tm2 + second() - tm; dgefa(aa,ldaa,n,ipvt,&info); } @@ -205,7 +206,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ kf = (kf > ZERO) ? (kf + .5) : (kf - .5); if (fabs((double)kf) < ONE) kflops = 0; -@@ -256,9 +256,9 @@ +@@ -256,9 +256,9 @@ main () print_time (row) int row; { @@ -218,7 +219,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 22:29:40 jtb Exp $ } /*----------------------*/ -@@ -893,8 +893,6 @@ +@@ -885,16 +885,14 @@ function, references to m[i][j] are writ + } + + /*----------------------*/ +-REAL second() +-{ + #include <sys/time.h> + #include <sys/resource.h> + ++REAL second() ++{ struct rusage ru; REAL t ; |