Tue Jul 17 14:58:05 2018 UTC ()
When using g95, build brenner.f without optimisation to avoid ICE.
Drop gfortran requirement.


(joerg)
diff -r1.40 -r1.41 pkgsrc/benchmarks/benchfft/Makefile
diff -r1.13 -r1.14 pkgsrc/benchmarks/benchfft/distinfo
diff -r1.6 -r1.7 pkgsrc/benchmarks/benchfft/patches/patch-ad
cvs diff -r1.40 -r1.41 pkgsrc/benchmarks/benchfft/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/benchfft/Makefile 2017/01/19 18:52:03 1.40
+++ pkgsrc/benchmarks/benchfft/Makefile 2018/07/17 14:58:05 1.41
@@ -1,50 +1,55 @@ @@ -1,50 +1,55 @@
1# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:03 agc Exp $ 1# $NetBSD: Makefile,v 1.41 2018/07/17 14:58:05 joerg Exp $
2 2
3DISTNAME= benchfft-2.0 3DISTNAME= benchfft-2.0
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= benchmarks math 5CATEGORIES= benchmarks math
6MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ 6MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/
7MASTER_SITES+= ftp://ftp.fftw.org/pub/fftw/old/benchfft/ 7MASTER_SITES+= ftp://ftp.fftw.org/pub/fftw/old/benchfft/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fftw-2.0.1${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fftw-2.0.1${EXTRACT_SUFX}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fftw.org/benchfft/ 11HOMEPAGE= http://www.fftw.org/benchfft/
12COMMENT= Benchmark your machine with a number of FFT algorithms 12COMMENT= Benchmark your machine with a number of FFT algorithms
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS+= gmake csh:run 15USE_TOOLS+= gmake csh:run
16USE_LANGUAGES= c fortran77 16USE_LANGUAGES= c fortran77
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18PKGSRC_FORTRAN= gfortran 
19 18
20LIBTOOL_OVERRIDE= libtool ../fftw-*/libtool 19LIBTOOL_OVERRIDE= libtool ../fftw-*/libtool
21CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess 20CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess
22CONFIG_SUB_OVERRIDE= config.sub ../fftw-*/config.sub 21CONFIG_SUB_OVERRIDE= config.sub ../fftw-*/config.sub
23CONFIG_STATUS_OVERRIDE= config.status ../fftw-*/config.status 22CONFIG_STATUS_OVERRIDE= config.status ../fftw-*/config.status
24 23
25REPLACE_CSH= submit-script 24REPLACE_CSH= submit-script
26 25
27INSTALLATION_DIRS= bin 26INSTALLATION_DIRS= bin
28 27
29CONFIGURE_DIRS= ${WRKDIR}/fftw-2.0.1 ${WRKSRC} 28CONFIGURE_DIRS= ${WRKDIR}/fftw-2.0.1 ${WRKSRC}
30 29
31do-install: 30do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/bench \ 31 ${INSTALL_PROGRAM} ${WRKSRC}/bench \
33 ${DESTDIR}${PREFIX}/bin/bench-fft 32 ${DESTDIR}${PREFIX}/bin/bench-fft
34 ${INSTALL_SCRIPT} ${WRKSRC}/submit-script \ 33 ${INSTALL_SCRIPT} ${WRKSRC}/submit-script \
35 ${DESTDIR}${PREFIX}/bin/run-fftbench 34 ${DESTDIR}${PREFIX}/bin/run-fftbench
36 35
37.include "../../mk/bsd.prefs.mk" 36.include "../../mk/compiler.mk"
 37
 38.if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95)
 39MAKE_ENV+= G95_NO_OPT=-O0
 40.else
 41MAKE_ENV+= G95_NO_OPT=
 42.endif
38 43
39benchmark: 44benchmark:
40.if defined(BATCH) 45.if defined(BATCH)
41 @${ECHO} "*** This benchmark should be run in non-batch mode" 46 @${ECHO} "*** This benchmark should be run in non-batch mode"
42 @${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench 47 @${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench
43 @${CHMOD} 755 ${WRKSRC}/run_bench 48 @${CHMOD} 755 ${WRKSRC}/run_bench
44 @${SED} -e 's|@machine@|'`uname -m`'|' \ 49 @${SED} -e 's|@machine@|'`uname -m`'|' \
45 ${FILESDIR}/setup.answers | (cd ${WRKSRC} ; ./run_bench) 50 ${FILESDIR}/setup.answers | (cd ${WRKSRC} ; ./run_bench)
46.else 51.else
47 @${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench 52 @${SED} -e 's|bench-fft|./bench|g' <${WRKSRC}/submit-script> ${WRKSRC}/run_bench
48 @${CHMOD} 755 ${WRKSRC}/run_bench 53 @${CHMOD} 755 ${WRKSRC}/run_bench
49 @(cd ${WRKSRC} ; ./run_bench) 54 @(cd ${WRKSRC} ; ./run_bench)
50 @${ECHO} ${PKGNAME} results: 55 @${ECHO} ${PKGNAME} results:
cvs diff -r1.13 -r1.14 pkgsrc/benchmarks/benchfft/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/benchfft/distinfo 2015/11/03 00:25:49 1.13
+++ pkgsrc/benchmarks/benchfft/distinfo 2018/07/17 14:58:05 1.14
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 00:25:49 agc Exp $ 1$NetBSD: distinfo,v 1.14 2018/07/17 14:58:05 joerg Exp $
2 2
3SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e 3SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e
4RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26 4RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26
5SHA512 (benchfft-2.0.tar.gz) = c2a6f7b7b8b001ed5f41157ea9801763663a4be6db96eb5be4e25bcfc135154f6a9af5da1c344479c159bb1fbe733bf022ad89bb3451cc947e6fdd0b5978a994 5SHA512 (benchfft-2.0.tar.gz) = c2a6f7b7b8b001ed5f41157ea9801763663a4be6db96eb5be4e25bcfc135154f6a9af5da1c344479c159bb1fbe733bf022ad89bb3451cc947e6fdd0b5978a994
6Size (benchfft-2.0.tar.gz) = 585518 bytes 6Size (benchfft-2.0.tar.gz) = 585518 bytes
7SHA1 (fftw-2.0.1.tar.gz) = b6b9d44a1204eb82d1651824941d3ed49d5f9282 7SHA1 (fftw-2.0.1.tar.gz) = b6b9d44a1204eb82d1651824941d3ed49d5f9282
8RMD160 (fftw-2.0.1.tar.gz) = ad28a3fd1e17de6d5158f50ad286887c5f886492 8RMD160 (fftw-2.0.1.tar.gz) = ad28a3fd1e17de6d5158f50ad286887c5f886492
9SHA512 (fftw-2.0.1.tar.gz) = 973211b4fbadc44c14c45e7112c34bf04ab6bd19945e9ce5457ae5a89550c375422c5408e1b798b37d53317f8a2599bdc283e25831358a3e4c4b1b56eb6bebb3 9SHA512 (fftw-2.0.1.tar.gz) = 973211b4fbadc44c14c45e7112c34bf04ab6bd19945e9ce5457ae5a89550c375422c5408e1b798b37d53317f8a2599bdc283e25831358a3e4c4b1b56eb6bebb3
10Size (fftw-2.0.1.tar.gz) = 894543 bytes 10Size (fftw-2.0.1.tar.gz) = 894543 bytes
11SHA1 (patch-aa) = 11c7d759af18a51da99231c964a079147656c9cc 11SHA1 (patch-aa) = 11c7d759af18a51da99231c964a079147656c9cc
12SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49 12SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49
13SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4 13SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4
14SHA1 (patch-ad) = bb9d22c526a5f9ef4c187893a964ae2d0d71ea80 14SHA1 (patch-ad) = 7c168d745cfe76a0424fafd9eea760ccc642f540
15SHA1 (patch-ae) = afe38ba1f8d8d3497e5d6a8c722f4ab11b6f1c3a 15SHA1 (patch-ae) = afe38ba1f8d8d3497e5d6a8c722f4ab11b6f1c3a
16SHA1 (patch-af) = b301bdb6707f448fae83d1f0659ae966e3869027 16SHA1 (patch-af) = b301bdb6707f448fae83d1f0659ae966e3869027
17SHA1 (patch-ag) = a08153a6a8800184e7d186bf44a36f11372e853c 17SHA1 (patch-ag) = a08153a6a8800184e7d186bf44a36f11372e853c
18SHA1 (patch-ah) = f03ce90b929b8a460157aff96facb3163d4e401c 18SHA1 (patch-ah) = f03ce90b929b8a460157aff96facb3163d4e401c
19SHA1 (patch-c__source_bitrev_c) = a5ba61121c0a0950278cbe04f6638afd091d106c 19SHA1 (patch-c__source_bitrev_c) = a5ba61121c0a0950278cbe04f6638afd091d106c
20SHA1 (patch-c__source_dint_c) = 5f86bea25e7a290f5f02b5423602fa2db87a588d 20SHA1 (patch-c__source_dint_c) = 5f86bea25e7a290f5f02b5423602fa2db87a588d
21SHA1 (patch-c__source_dintime.c) = ef966866c209ee9fc482b4af77d759b23752d32b 21SHA1 (patch-c__source_dintime.c) = ef966866c209ee9fc482b4af77d759b23752d32b
22SHA1 (patch-c__source_fft__duhamel.c) = de1168a0d0be44eceeb4808f953894746194dcca 22SHA1 (patch-c__source_fft__duhamel.c) = de1168a0d0be44eceeb4808f953894746194dcca
23SHA1 (patch-c__source_idint.c) = 6434f2180c23e909ca099bd6e9f10757710b25a3 23SHA1 (patch-c__source_idint.c) = 6434f2180c23e909ca099bd6e9f10757710b25a3
24SHA1 (patch-c__source_idintime.c) = 8cff726b52c5964fa6da1a011834f7637f24bb8d 24SHA1 (patch-c__source_idintime.c) = 8cff726b52c5964fa6da1a011834f7637f24bb8d
cvs diff -r1.6 -r1.7 pkgsrc/benchmarks/benchfft/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/benchmarks/benchfft/patches/patch-ad 2012/01/12 12:36:13 1.6
+++ pkgsrc/benchmarks/benchfft/patches/patch-ad 2018/07/17 14:58:05 1.7
@@ -1,32 +1,44 @@ @@ -1,32 +1,44 @@
1$NetBSD: patch-ad,v 1.6 2012/01/12 12:36:13 hans Exp $ 1$NetBSD: patch-ad,v 1.7 2018/07/17 14:58:05 joerg Exp $
2 2
3link required fortran library. 3link required fortran library.
4 4
5--- Makefile.in.orig Tue Oct 20 12:42:00 1998 5--- Makefile.in.orig 1998-10-20 16:42:00.000000000 +0000
6+++ Makefile.in Fri May 12 17:11:17 2000 6+++ Makefile.in
7@@ -365,7 +365,7 @@ LIBPATHS = -L$(FFTWDIR)/fftw/.libs -L$(F 7@@ -365,7 +365,7 @@ LIBPATHS = -L$(FFTWDIR)/fftw/.libs -L$(F
8 INCLUDE_FLAGS = -I. -I$(FFTWDIR)/fftw -I$(FFTWDIR)/src -I$(FFTWDIR)/rfftw 8 INCLUDE_FLAGS = -I. -I$(FFTWDIR)/fftw -I$(FFTWDIR)/src -I$(FFTWDIR)/rfftw
9  9
10 # Put libraries that you need to link in here: 10 # Put libraries that you need to link in here:
11-LIBRARIES = $(LIBPATHS) -lfftw @RFFTWLIB@ @LIBS@ 11-LIBRARIES = $(LIBPATHS) -lfftw @RFFTWLIB@ @LIBS@
12+LIBRARIES = $(LIBPATHS) ../fftw-2.0.1/fftw/.libs/libfftw.a @RFFTWLIB@ @LIBS@ 12+LIBRARIES = $(LIBPATHS) ../fftw-2.0.1/fftw/.libs/libfftw.a @RFFTWLIB@ @LIBS@
13  13
14 ########################################################################### 14 ###########################################################################
15  15
16@@ -376,6 +376,7 @@ CC = @CC@ 16@@ -376,6 +376,7 @@ CC = @CC@
17 CFLAGS = @CFLAGS@ 17 CFLAGS = @CFLAGS@
18 F77 = @F77@ 18 F77 = @F77@
19 FFLAGS = @FFLAGS@ 19 FFLAGS = @FFLAGS@
20+FLIBS = @FLIBS@ 20+FLIBS = @FLIBS@
21 F90 = @F90@ 21 F90 = @F90@
22 F90FLAGS = @FFLAGS@ 22 F90FLAGS = @FFLAGS@
23  23
24@@ -495,7 +496,7 @@ bench_utils.o: bench_utils.h bench-confi 24@@ -393,8 +394,10 @@ all: bench
 25 -DFFLAGS="\"$(FFLAGS)\"" \
 26 $< -o $@
 27
 28+FFLAGS.f_source/brenner.f= $(G95_NO_OPT)
 29+
 30 .f.o:
 31- $(F77) -c $(FFLAGS) $< -o $@
 32+ $(F77) -c $(FFLAGS) $(FFLAGS.$<) $< -o $@
 33
 34 ###########################################################################
 35
 36@@ -495,7 +498,7 @@ bench_utils.o: bench_utils.h bench-confi
25 bench.o: bench_utils.h bench-config.h 37 bench.o: bench_utils.h bench-config.h
26  38
27 bench: $(OBJECTS) 39 bench: $(OBJECTS)
28- $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) -o $@ 40- $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) -o $@
29+ $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) $(FLIBS) -o $@ 41+ $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) $(FLIBS) -o $@
30  42
31 submit: bench 43 submit: bench
32 ./submit-script 44 ./submit-script