Add Himeno Benchmark. this suite was made by HIMENO, Ryutaro,

for evaluation of performance of the calculation
of incompressible flow analysis. This program solves Poisson equation
by Jacobi's iterative method which have many loops

10 files changed, 220 insertions, 0 deletions

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 435bdf9ebe46..47cf6c598e02 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += dbench
     SUBDIR += dbs
     SUBDIR += forkbomb
+    SUBDIR += himenobench
     SUBDIR += hpl
     SUBDIR += httperf
     SUBDIR += iozone
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
new file mode 100644
index 000000000000..ecd8e4662460
--- /dev/null
+++ b/benchmarks/himenobench/Makefile
@@ -0,0 +1,121 @@
+# New ports collection makefile for:   himenobench
+# Date Created:                16 Aug 2004
+# Whom:                        NAKATA Maho <maho@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	himenobench
+PORTVERSION=	2004.08.16
+CATEGORIES=	benchmarks
+MASTER_SITES=	http://accc.riken.jp/HPC/HimenoBMT/Load_module/
+DISTFILES=	himenoBMTxp_xl.lzh himenoBMTxp_l.lzh himenoBMTxp_m.lzh himenoBMTxp_s.lzh \
+		cc_himenoBMTxp_xl.lzh himenoBMTxpa.lzh f90_xp.lzh
+DIST_SUBDIR=	himeno
+
+MAINTAINER=	maho@FreeBSD.org
+COMMENT=	Himeno bench benchmark, solves Poisson eq. with Jacobi's method
+
+.if defined(WITH_ICC)
+BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
+.endif
+.if defined(WITH_IFC)
+BUILD_DEPENDS=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
+.endif
+EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
+
+NO_CDROM=	"unsure to sell for profit"
+NO_PACKAGE=	"unsure to redistribute"
+
+.if defined(OPTIMIZED_FLAGS)
+FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll -loops -fexpensive-optimizations -malign-double
+CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll -loops -fexpensive-optimizations -malign-double
+.if (${MACHINE_ARCH} == "i386")
+CFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3
+CXXFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3
+.endif # i386
+.endif
+
+.if defined(WITH_ICC)
+CFLAGS_ICC+=	-O3 -tpp7 -xiMKW -Vaxlib
+ICC=		${LOCALBASE}/intel_cc_80/bin/icc
+PLIST_SUB+=	WITH_ICC=""
+.else
+PLIST_SUB+=	WITH_ICC="@comment "
+.endif
+.if defined(WITH_IFC)
+FFLAGS_IFC+=	-O3 -tpp7 -xiMKW -Vaxlib -ipo
+IFC=		${LOCALBASE}/intel_fc_80/bin/ifort
+PLIST_SUB+=	WITH_IFC=""
+.else
+PLIST_SUB+=	WITH_IFC="@comment "
+.endif
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@for i in ${DISTFILES}; do \
+	cd ${WRKSRC} ; lha x ${DISTDIR}/${DIST_SUBDIR}/$$i; \
+	done
+do-build:
+#	@cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_xl himenobmtxp_xl.f #Too large
+	@cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_l  himenobmtxp_l.f
+	@cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_m  himenobmtxp_m.f
+	@cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_s  himenobmtxp_s.f
+#	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DELARGE  -o himenobmtxps_xl himenobmtxps.c #Too large
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DLARGE   -o himenobmtxps_l  himenobmtxps.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DMIDDLE  -o himenobmtxps_m  himenobmtxps.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSMALL   -o himenobmtxps_s  himenobmtxps.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSSMALL  -o himenobmtxps_ss himenobmtxps.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DELARGE  -o himenobmtxpa_xl himenobmtxpa.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DLARGE   -o himenobmtxpa_l  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DMIDDLE  -o himenobmtxpa_m  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSMALL   -o himenobmtxpa_s  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSSMALL  -o himenobmtxpa_ss himenobmtxpa.c
+.if defined(WITH_IFC)
+#	@cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_xl.ifc himenobmtxp_xl.f #Too large
+	@cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_l.ifc  himenobmtxp_l.f
+	@cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_m.ifc  himenobmtxp_m.f
+	@cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_s.ifc  himenobmtxp_s.f
+	@cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp.ifc    himenobmtxp.f90
+.endif
+.if defined(WITH_ICC)
+#	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DELARGE  -o himenobmtxps_xl.icc himenobmtxps.c #Too large
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DLARGE   -o himenobmtxps_l.icc  himenobmtxps.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DMIDDLE  -o himenobmtxps_m.icc  himenobmtxps.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSMALL   -o himenobmtxps_s.icc  himenobmtxps.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSSMALL  -o himenobmtxps_ss.icc himenobmtxps.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DELARGE  -o himenobmtxpa_xl.icc himenobmtxpa.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DLARGE   -o himenobmtxpa_l.icc  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DMIDDLE  -o himenobmtxpa_m.icc  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSMALL   -o himenobmtxpa_s.icc  himenobmtxpa.c
+	@cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSSMALL  -o himenobmtxpa_ss.icc himenobmtxpa.c
+.endif
+do-install:
+#	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl          ${PREFIX}/bin #Too large
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l           ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m           ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s           ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l          ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m          ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s          ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss         ${PREFIX}/bin
+#	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl.ifc      ${PREFIX}/bin #Too large
+.if defined(WITH_IFC)
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l.ifc       ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m.ifc       ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s.ifc       ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp.ifc         ${PREFIX}/bin
+.endif
+.if defined(WITH_ICC)
+#	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_xl.icc     ${PREFIX}/bin #Too large
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss.icc     ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa_xl.icc     ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa_l.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa_m.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa_s.icc      ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa_ss.icc     ${PREFIX}/bin
+.endif
+.include <bsd.port.mk>
diff --git a/benchmarks/himenobench/distinfo b/benchmarks/himenobench/distinfo
new file mode 100644
index 000000000000..f7fc2396d174
--- /dev/null
+++ b/benchmarks/himenobench/distinfo
@@ -0,0 +1,14 @@
+MD5 (himeno/himenoBMTxp_xl.lzh) = 07c079fb8bb50647fa8c35f3304a59c6
+SIZE (himeno/himenoBMTxp_xl.lzh) = 2177
+MD5 (himeno/himenoBMTxp_l.lzh) = 761ad34a46e6deee22dc1b760451edea
+SIZE (himeno/himenoBMTxp_l.lzh) = 2165
+MD5 (himeno/himenoBMTxp_m.lzh) = 44a24f5ee9f25993ee077e4506c5d0aa
+SIZE (himeno/himenoBMTxp_m.lzh) = 2165
+MD5 (himeno/himenoBMTxp_s.lzh) = b1bc10a9f8fa224e25af278c137aadf8
+SIZE (himeno/himenoBMTxp_s.lzh) = 2165
+MD5 (himeno/cc_himenoBMTxp_xl.lzh) = 8c690f6b927a9712ae94583ce2855594
+SIZE (himeno/cc_himenoBMTxp_xl.lzh) = 2553
+MD5 (himeno/himenoBMTxpa.lzh) = 2632948fbe34f7eefee75836eb5f1757
+SIZE (himeno/himenoBMTxpa.lzh) = 3006
+MD5 (himeno/f90_xp.lzh) = eca0d242252f50069cb98b52bfe9e718
+SIZE (himeno/f90_xp.lzh) = 2631
diff --git a/benchmarks/himenobench/files/patch-himenobmtxp_l.f b/benchmarks/himenobench/files/patch-himenobmtxp_l.f
new file mode 100644
index 000000000000..52941efce39a
--- /dev/null
+++ b/benchmarks/himenobench/files/patch-himenobmtxp_l.f
@@ -0,0 +1,10 @@
+--- himenobmtxp_l.f.orig	Mon Aug 16 15:39:44 2004
++++ himenobmtxp_l.f	Mon Aug 16 15:39:54 2004
+@@ -39,7 +39,6 @@
+ C "use portlib" statement on the next line is for Visual fortran

+ C to use UNIX libraries. Please remove it if your system is UNIX.

+ C -------------------

+-      use portlib

+       IMPLICIT REAL*4(a-h,o-z)

+ C

+       PARAMETER (mimax=513,mjmax=257,mkmax=257)

diff --git a/benchmarks/himenobench/files/patch-himenobmtxp_m.f b/benchmarks/himenobench/files/patch-himenobmtxp_m.f
new file mode 100644
index 000000000000..d4f893d2b754
--- /dev/null
+++ b/benchmarks/himenobench/files/patch-himenobmtxp_m.f
@@ -0,0 +1,10 @@
+--- himenobmtxp_m.f.orig	Mon Aug 16 15:39:44 2004
++++ himenobmtxp_m.f	Mon Aug 16 15:39:54 2004
+@@ -39,7 +39,6 @@
+ C "use portlib" statement on the next line is for Visual fortran

+ C to use UNIX libraries. Please remove it if your system is UNIX.

+ C -------------------

+-      use portlib

+       IMPLICIT REAL*4(a-h,o-z)

+ C

+       PARAMETER (mimax=513,mjmax=257,mkmax=257)

diff --git a/benchmarks/himenobench/files/patch-himenobmtxp_s.f b/benchmarks/himenobench/files/patch-himenobmtxp_s.f
new file mode 100644
index 000000000000..c5c48637445b
--- /dev/null
+++ b/benchmarks/himenobench/files/patch-himenobmtxp_s.f
@@ -0,0 +1,10 @@
+--- himenobmtxp_s.f.orig	Mon Aug 16 15:39:44 2004
++++ himenobmtxp_s.f	Mon Aug 16 15:39:54 2004
+@@ -39,7 +39,6 @@
+ C "use portlib" statement on the next line is for Visual fortran

+ C to use UNIX libraries. Please remove it if your system is UNIX.

+ C -------------------

+-      use portlib

+       IMPLICIT REAL*4(a-h,o-z)

+ C

+       PARAMETER (mimax=513,mjmax=257,mkmax=257)

diff --git a/benchmarks/himenobench/files/patch-himenobmtxp_xl.f b/benchmarks/himenobench/files/patch-himenobmtxp_xl.f
new file mode 100644
index 000000000000..59164bd39547
--- /dev/null
+++ b/benchmarks/himenobench/files/patch-himenobmtxp_xl.f
@@ -0,0 +1,10 @@
+--- himenobmtxp_xl.f.orig	Mon Aug 16 15:39:44 2004
++++ himenobmtxp_xl.f	Mon Aug 16 15:39:54 2004
+@@ -39,7 +39,6 @@
+ C "use portlib" statement on the next line is for Visual fortran

+ C to use UNIX libraries. Please remove it if your system is UNIX.

+ C -------------------

+-      use portlib

+       IMPLICIT REAL*4(a-h,o-z)

+ C

+       PARAMETER (mimax=513,mjmax=257,mkmax=257)

diff --git a/benchmarks/himenobench/files/patch-himenobmtxps.c b/benchmarks/himenobench/files/patch-himenobmtxps.c
new file mode 100644
index 000000000000..6ed389728ad5
--- /dev/null
+++ b/benchmarks/himenobench/files/patch-himenobmtxps.c
@@ -0,0 +1,18 @@
+--- himenobmtxps.c~	Thu Feb 21 09:27:59 2002
++++ himenobmtxps.c	Mon Aug 16 16:13:42 2004
+@@ -37,6 +37,7 @@
+ ********************************************************************/

+ 

+ #include <stdio.h>

++#include <sys/time.h>

+ 

+ #ifdef SSMALL

+ #define MIMAX            33

+@@ -245,7 +246,6 @@
+ double

+ second()

+ {

+-#include <sys/time.h>

+ 

+   struct timeval tm;

+   double t ;

diff --git a/benchmarks/himenobench/pkg-descr b/benchmarks/himenobench/pkg-descr
new file mode 100644
index 000000000000..7ad7b50f4168
--- /dev/null
+++ b/benchmarks/himenobench/pkg-descr
@@ -0,0 +1,6 @@
+Himeno Benchmark is made by HIMENO, Ryutaro,
+for evaluation of performance of the calculation
+of incompressible flow analysis. This program solves Poisson equation
+by Jacobi's iterative method which have many loops
+
+WWW: http://accc.riken.jp/HPC/HimenoBMT/index.html
diff --git a/benchmarks/himenobench/pkg-plist b/benchmarks/himenobench/pkg-plist
new file mode 100644
index 000000000000..c5933424c006
--- /dev/null
+++ b/benchmarks/himenobench/pkg-plist
@@ -0,0 +1,20 @@
+bin/himenobmtxp_l
+bin/himenobmtxp_m
+bin/himenobmtxp_s
+bin/himenobmtxps_l
+bin/himenobmtxps_m
+bin/himenobmtxps_s
+bin/himenobmtxps_ss
+%%WITH_ICC%%bin/himenobmtxpa_l.icc
+%%WITH_ICC%%bin/himenobmtxpa_m.icc
+%%WITH_ICC%%bin/himenobmtxpa_s.icc
+%%WITH_ICC%%bin/himenobmtxpa_ss.icc
+%%WITH_ICC%%bin/himenobmtxpa_xl.icc
+%%WITH_ICC%%bin/himenobmtxps_l.icc
+%%WITH_ICC%%bin/himenobmtxps_m.icc
+%%WITH_ICC%%bin/himenobmtxps_s.icc
+%%WITH_ICC%%bin/himenobmtxps_ss.icc
+%%WITH_IFC%%bin/himenobmtxp.ifc
+%%WITH_IFC%%bin/himenobmtxp_l.ifc
+%%WITH_IFC%%bin/himenobmtxp_m.ifc
+%%WITH_IFC%%bin/himenobmtxp_s.ifc