head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.106 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.104 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.102 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.100 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.98 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.96 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.94 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.92 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.90 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.88 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.86 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.84 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.82 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.80 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.78 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.76 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.74 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.72 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.70 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.68 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.66 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.64 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.62 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.58 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.38 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.60 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.56 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.54 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.52 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.50 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.48 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.46 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.44 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.42 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.40 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.36 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.34 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.32 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.30 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.28 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.26 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.24 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.22 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.20 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.18 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.16 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.14 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.12 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.10 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.8 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.6 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.4 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.2 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.2.0.48 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.46 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.44 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.42 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.38 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.34 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.32 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.30 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.28 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.26 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.24 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.22 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.20 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.18 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.16 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.14 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.12 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.10 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.8 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.1.1.0.38 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.36 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.34 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.32 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.30 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.28 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2013.01.11.23.25.11; author joerg; state Exp; branches; next 1.2; 1.2 date 2007.09.28.13.21.33; author drochner; state Exp; branches; next 1.1; 1.1 date 2001.04.27.22.29.40; author jtb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.04.27.22.29.40; author jtb; state Exp; branches; next ; desc @@ 1.3 log @Use more void. @ text @$NetBSD: patch-aa,v 1.2 2007/09/28 13:21:33 drochner Exp $ --- linpack.c.orig 2013-01-11 15:21:29.000000000 +0000 +++ linpack.c @@@@ -48,7 +48,10 @@@@ You must specify one of -DROLL or -DUNRO #include #include -static REAL time[9][9]; +static REAL timex[9][9]; + +static void daxpy(int n, REAL da, REAL *dx, int incx, REAL *dy, int incy); +static void dscal(int n, REAL da, REAL *dx,int incx); main () { @@@@ -71,11 +74,11 @@@@ main () matgen(a,lda,n,b,&norma); t1 = second(); dgefa(a,lda,n,ipvt,&info); - time[0][0] = second() - t1; + timex[0][0] = second() - t1; t1 = second(); dgesl(a,lda,n,ipvt,b,0); - time[1][0] = second() - t1; - total = time[0][0] + time[1][0]; + timex[1][0] = second() - t1; + total = timex[0][0] + timex[1][0]; /* compute a residual to verify results. */ @@@@ -108,10 +111,10 @@@@ main () fprintf(stderr," dgefa dgesl total kflops unit"); fprintf(stderr," ratio\n"); - time[2][0] = total; - time[3][0] = ops/(1.0e3*total); - time[4][0] = 2.0e3/time[3][0]; - time[5][0] = total/cray; + timex[2][0] = total; + timex[3][0] = ops/(1.0e3*total); + timex[4][0] = 2.0e3/timex[3][0]; + timex[5][0] = total/cray; fprintf(stderr," times for array with leading dimension of%5d\n",lda); print_time(0); @@@@ -119,28 +122,28 @@@@ main () matgen(a,lda,n,b,&norma); t1 = second(); dgefa(a,lda,n,ipvt,&info); - time[0][1] = second() - t1; + timex[0][1] = second() - t1; t1 = second(); dgesl(a,lda,n,ipvt,b,0); - time[1][1] = second() - t1; - total = time[0][1] + time[1][1]; - time[2][1] = total; - time[3][1] = ops/(1.0e3*total); - time[4][1] = 2.0e3/time[3][1]; - time[5][1] = total/cray; + timex[1][1] = second() - t1; + total = timex[0][1] + timex[1][1]; + timex[2][1] = total; + timex[3][1] = ops/(1.0e3*total); + timex[4][1] = 2.0e3/timex[3][1]; + timex[5][1] = total/cray; matgen(a,lda,n,b,&norma); t1 = second(); dgefa(a,lda,n,ipvt,&info); - time[0][2] = second() - t1; + timex[0][2] = second() - t1; t1 = second(); dgesl(a,lda,n,ipvt,b,0); - time[1][2] = second() - t1; - total = time[0][2] + time[1][2]; - time[2][2] = total; - time[3][2] = ops/(1.0e3*total); - time[4][2] = 2.0e3/time[3][2]; - time[5][2] = total/cray; + timex[1][2] = second() - t1; + total = timex[0][2] + timex[1][2]; + timex[2][2] = total; + timex[3][2] = ops/(1.0e3*total); + timex[4][2] = 2.0e3/timex[3][2]; + timex[5][2] = total/cray; ntimes = NTIMES; tm2 = 0.0; @@@@ -153,19 +156,19 @@@@ main () dgefa(a,lda,n,ipvt,&info); } - time[0][3] = (second() - t1 - tm2)/ntimes; + timex[0][3] = (second() - t1 - tm2)/ntimes; t1 = second(); for (i = 0; i < ntimes; i++) { dgesl(a,lda,n,ipvt,b,0); } - time[1][3] = (second() - t1)/ntimes; - total = time[0][3] + time[1][3]; - time[2][3] = total; - time[3][3] = ops/(1.0e3*total); - time[4][3] = 2.0e3/time[3][3]; - time[5][3] = total/cray; + timex[1][3] = (second() - t1)/ntimes; + total = timex[0][3] + timex[1][3]; + timex[2][3] = total; + timex[3][3] = ops/(1.0e3*total); + timex[4][3] = 2.0e3/timex[3][3]; + timex[5][3] = total/cray; print_time(1); print_time(2); @@@@ -174,41 +177,41 @@@@ main () matgen(aa,ldaa,n,b,&norma); t1 = second(); dgefa(aa,ldaa,n,ipvt,&info); - time[0][4] = second() - t1; + timex[0][4] = second() - t1; t1 = second(); dgesl(aa,ldaa,n,ipvt,b,0); - time[1][4] = second() - t1; - total = time[0][4] + time[1][4]; - time[2][4] = total; - time[3][4] = ops/(1.0e3*total); - time[4][4] = 2.0e3/time[3][4]; - time[5][4] = total/cray; + timex[1][4] = second() - t1; + total = timex[0][4] + timex[1][4]; + timex[2][4] = total; + timex[3][4] = ops/(1.0e3*total); + timex[4][4] = 2.0e3/timex[3][4]; + timex[5][4] = total/cray; matgen(aa,ldaa,n,b,&norma); t1 = second(); dgefa(aa,ldaa,n,ipvt,&info); - time[0][5] = second() - t1; + timex[0][5] = second() - t1; t1 = second(); dgesl(aa,ldaa,n,ipvt,b,0); - time[1][5] = second() - t1; - total = time[0][5] + time[1][5]; - time[2][5] = total; - time[3][5] = ops/(1.0e3*total); - time[4][5] = 2.0e3/time[3][5]; - time[5][5] = total/cray; + timex[1][5] = second() - t1; + total = timex[0][5] + timex[1][5]; + timex[2][5] = total; + timex[3][5] = ops/(1.0e3*total); + timex[4][5] = 2.0e3/timex[3][5]; + timex[5][5] = total/cray; matgen(aa,ldaa,n,b,&norma); t1 = second(); dgefa(aa,ldaa,n,ipvt,&info); - time[0][6] = second() - t1; + timex[0][6] = second() - t1; t1 = second(); dgesl(aa,ldaa,n,ipvt,b,0); - time[1][6] = second() - t1; - total = time[0][6] + time[1][6]; - time[2][6] = total; - time[3][6] = ops/(1.0e3*total); - time[4][6] = 2.0e3/time[3][6]; - time[5][6] = total/cray; + timex[1][6] = second() - t1; + total = timex[0][6] + timex[1][6]; + timex[2][6] = total; + timex[3][6] = ops/(1.0e3*total); + timex[4][6] = 2.0e3/timex[3][6]; + timex[5][6] = total/cray; ntimes = NTIMES; tm2 = 0; @@@@ -219,22 +222,22 @@@@ main () tm2 = tm2 + second() - tm; dgefa(aa,ldaa,n,ipvt,&info); } - time[0][7] = (second() - t1 - tm2)/ntimes; + timex[0][7] = (second() - t1 - tm2)/ntimes; t1 = second(); for (i = 0; i < ntimes; i++) { dgesl(aa,ldaa,n,ipvt,b,0); } - time[1][7] = (second() - t1)/ntimes; - total = time[0][7] + time[1][7]; - time[2][7] = total; - time[3][7] = ops/(1.0e3*total); - time[4][7] = 2.0e3/time[3][7]; - time[5][7] = total/cray; + timex[1][7] = (second() - t1)/ntimes; + total = timex[0][7] + timex[1][7]; + timex[2][7] = total; + timex[3][7] = ops/(1.0e3*total); + timex[4][7] = 2.0e3/timex[3][7]; + timex[5][7] = total/cray; /* the following code sequence implements the semantics of - the Fortran intrinsics "nint(min(time[3][3],time[3][7]))" */ + the Fortran intrinsics "nint(min(timex[3][3],timex[3][7]))" */ - kf = (time[3][3] < time[3][7]) ? time[3][3] : time[3][7]; + kf = (timex[3][3] < timex[3][7]) ? timex[3][3] : timex[3][7]; kf = (kf > ZERO) ? (kf + .5) : (kf - .5); if (fabs((double)kf) < ONE) kflops = 0; @@@@ -256,9 +259,9 @@@@ main () print_time (row) int row; { -fprintf(stderr,"%11.2f%11.2f%11.2f%11.0f%11.2f%11.2f\n", (double)time[0][row], - (double)time[1][row], (double)time[2][row], (double)time[3][row], - (double)time[4][row], (double)time[5][row]); +fprintf(stderr,"%11.2f%11.2f%11.2f%11.0f%11.2f%11.2f\n", (double)timex[0][row], + (double)timex[1][row], (double)timex[2][row], (double)timex[3][row], + (double)timex[4][row], (double)timex[5][row]); } /*----------------------*/ @@@@ -528,13 +531,11 @@@@ function, references to a[i][j] are writ /*----------------------*/ -daxpy(n,da,dx,incx,dy,incy) +static void daxpy(int n, REAL da, REAL *dx, int incx, REAL *dy, int incy) /* constant times a vector plus a vector. jack dongarra, linpack, 3/11/78. */ -REAL dx[],dy[],da; -int incx,incy,n; { int i,ix,iy,m,mp1; @@@@ -642,13 +643,11 @@@@ int incx,incy,n; } /*----------------------*/ -dscal(n,da,dx,incx) +static void dscal(int n, REAL da, REAL *dx,int incx) /* scales a vector by a constant. jack dongarra, linpack, 3/11/78. */ -REAL da,dx[]; -int n, incx; { int i,m,mp1,nincx; @@@@ -885,16 +884,14 @@@@ function, references to m[i][j] are writ } /*----------------------*/ -REAL second() -{ #include #include +REAL second() +{ struct rusage ru; REAL t ; -void getrusage(); - getrusage(RUSAGE_SELF,&ru) ; t = (REAL) (ru.ru_utime.tv_sec+ru.ru_stime.tv_sec) + @ 1.2 log @make this compile on -current (the benchmark looks not very useful on current CPUs - runs within fractions of seconds -, but anyway) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- linpack.c.orig 2007-09-02 12:38:13.000000000 +0200 d5 1 a5 1 @@@@ -48,7 +48,7 @@@@ You must specify one of -DROLL or -DUNRO d11 3 d17 1 a17 1 @@@@ -71,11 +71,11 @@@@ main () d32 1 a32 1 @@@@ -108,10 +108,10 @@@@ main () d47 1 a47 1 @@@@ -119,28 +119,28 @@@@ main () d90 1 a90 1 @@@@ -153,19 +153,19 @@@@ main () d117 1 a117 1 @@@@ -174,41 +174,41 @@@@ main () d180 1 a180 1 @@@@ -219,22 +219,22 @@@@ main () d212 1 a212 1 @@@@ -256,9 +256,9 @@@@ main () d225 31 a255 1 @@@@ -885,16 +885,14 @@@@ function, references to m[i][j] are writ @ 1.1 log @Initial revision @ text @d2 4 a5 3 --- linpack.c.orig Sun Aug 30 11:34:04 1998 +++ linpack.c Sun Aug 30 11:40:18 1998 @@@@ -48,7 +48,7 @@@@ d14 1 a14 1 @@@@ -71,11 +71,11 @@@@ d29 1 a29 1 @@@@ -108,10 +108,10 @@@@ d44 1 a44 1 @@@@ -119,28 +119,28 @@@@ d87 1 a87 1 @@@@ -153,19 +153,19 @@@@ d114 1 a114 1 @@@@ -174,41 +174,41 @@@@ d177 1 a177 1 @@@@ -219,22 +219,22 @@@@ d209 1 a209 1 @@@@ -256,9 +256,9 @@@@ d222 11 a232 1 @@@@ -893,8 +893,6 @@@@ @ 1.1.1.1 log @Reimport of former benchmarks/linpack package as linpack-bench. @ text @@