Index: head/math/openblas/Makefile =================================================================== --- head/math/openblas/Makefile (revision 448737) +++ head/math/openblas/Makefile (revision 448738) @@ -1,166 +1,166 @@ # Created by: Eijiro Shibusawa # $FreeBSD$ PORTNAME= openblas -PORTVERSION= 0.2.19 -PORTREVISION= 1 +PORTVERSION= 0.2.20 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= NL/lapack/timing/:lapack_tmg DISTFILES= large.tgz:lapack_tmg timing.tgz:lapack_tmg DIST_SUBDIR= openblas MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Optimized BLAS library based on GotoBLAS2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= fortran gmake perl5 + USE_GITHUB= yes GH_ACCOUNT= xianyi GH_PROJECT= OpenBLAS LARGE_FILE= large.tgz TIMING_FILE= timing.tgz -USES= fortran gmake perl5 USE_LDCONFIG= yes USE_PERL5= build OPENBLAS_SUFX= r${PORTVERSION} OPENBLAS_LIBS= libopenblas libopenblasp OPENBLAS_SVER= 0 OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} TEST_TARGET= tests OPTIONS_DEFINE= INTERFACE64 OPENMP OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} .if defined(BATCH) || defined(PACKAGE_BUILDING) OPTIONS_DEFAULT_i386= DYNAMIC_ARCH OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH .endif DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64 INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures OPENMP_DESC= Use OpenMP for threading AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) .include .if defined(TARGET_CPU_ARCH) BUILDFLAGS+= TARGET=${TARGET_CPU_ARCH} .endif MAXTHREADS?= 8 BUILDFLAGS_THREAD+= NUM_THREADS=${MAXTHREADS} USE_THREAD=1 .if ${ARCH:M*64} == "" BUILDFLAGS+= BINARY32=1 .else BUILDFLAGS+= BINARY64=1 .endif .if ! ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) MANUAL_PACKAGE_BUILD= Optimizes for the build machine. .endif .if ${PORT_OPTIONS:MDYNAMIC_ARCH} BUILDFLAGS+= DYNAMIC_ARCH=1 .endif .if ${PORT_OPTIONS:MINTERFACE64} BUILDFLAGS+= INTERFACE64=1 .endif .if ${PORT_OPTIONS:MOPENMP} USES+= compiler:openmp BUILDFLAGS_THREAD+= USE_OPENMP=1 .endif .if ! ${PORT_OPTIONS:MAVX} BUILDFLAGS+= NO_AVX=1 .endif .if ! ${PORT_OPTIONS:MAVX2} BUILDFLAGS+= NO_AVX2=1 .endif post-extract: cd ${DISTDIR}/${DIST_SUBDIR} ; \ ${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC} ${MKDIR} ${WRKDIR}/lib post-patch: ${REINPLACE_CMD} -e "s+%%FIND%%+${FIND}+" \ -e "s+%%XARGS%%+${XARGS}+" \ -e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+" \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \ ${WRKSRC}/Makefile.rule ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ ${WRKSRC}/Makefile.rule \ ${WRKSRC}/Makefile.tail \ ${WRKSRC}/driver/level3/Makefile \ ${WRKSRC}/driver/others/Makefile \ ${WRKSRC}/exports/Makefile \ ${WRKSRC}/interface/Makefile \ ${WRKSRC}/kernel/Makefile \ ${WRKSRC}/kernel/Makefile.L3 \ ${WRKSRC}/lapack/laswp/Makefile \ ${WRKSRC}/lapack-netlib/SRC/Makefile \ ${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \ ${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \ ${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \ ${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \ ${WRKSRC}/reference/Makefile ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ -e 's+%%LOCALBASE%%+${LOCALBASE}+' \ -e 's+%%FIND%%+${FIND}+' \ -e 's+%%XARGS%%+${XARGS}+' \ -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ -e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \ -e '/Clang.*OpenMP/g' \ ${WRKSRC}/Makefile.system post-patch-OPENMP-on: ${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ ${WRKSRC}/test/Makefile \ ${WRKSRC}/ctest/Makefile do-build: cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \ ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} ${BUILDFLAGS_THREAD} \ ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} BENCHMARK_MAXTHREADS?= ${MAXTHREADS} .if ${PORT_OPTIONS:MOPENMP} BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS} .else BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS} .endif benchmark: build cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} do-install: .for L in ${OPENBLAS_LIBS} ${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib ${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so .endfor .include Index: head/math/openblas/distinfo =================================================================== --- head/math/openblas/distinfo (revision 448737) +++ head/math/openblas/distinfo (revision 448738) @@ -1,7 +1,7 @@ -TIMESTAMP = 1483295026 +TIMESTAMP = 1503123719 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 SIZE (openblas/large.tgz) = 2595 SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af SIZE (openblas/timing.tgz) = 1059485 -SHA256 (openblas/xianyi-OpenBLAS-v0.2.19_GH0.tar.gz) = 9c40b5e4970f27c5f6911cb0a28aa26b6c83f17418b69f8e5a116bb983ca8557 -SIZE (openblas/xianyi-OpenBLAS-v0.2.19_GH0.tar.gz) = 10834034 +SHA256 (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394 +SIZE (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 11637301 Index: head/math/openblas/files/patch-driver_others_blas__server.c =================================================================== --- head/math/openblas/files/patch-driver_others_blas__server.c (revision 448737) +++ head/math/openblas/files/patch-driver_others_blas__server.c (nonexistent) @@ -1,11 +0,0 @@ ---- driver/others/blas_server.c.orig 2016-04-12 19:29:19 UTC -+++ driver/others/blas_server.c -@@ -70,7 +70,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF - /*********************************************************************/ - - #include "common.h" --#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_SUNOS) -+#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_SUNOS) || defined(OS_FREEBSD) - #include - #include - #include Property changes on: head/math/openblas/files/patch-driver_others_blas__server.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-common__arm.h =================================================================== --- head/math/openblas/files/patch-common__arm.h (revision 448737) +++ head/math/openblas/files/patch-common__arm.h (revision 448738) @@ -1,24 +1,16 @@ --- common_arm.h.orig 2016-09-01 03:58:42 UTC +++ common_arm.h @@ -93,6 +93,13 @@ static inline int blas_quickdivide(blasi #endif +/* Translate pre-UAL asm to UAL equivalents */ +#if defined(__clang__) +#define fnmacs vmls.f32 +#define fnmacd vmls.f64 +#define fnmuls vnmul.f32 +#define fnmuld vnmul.f64 +#endif #ifndef F_INTERFACE #define REALNAME ASMNAME -@@ -105,7 +112,6 @@ static inline int blas_quickdivide(blasi - #define PROLOGUE \ - .arm ;\ - .global REALNAME ;\ -- .func REALNAME ;\ - REALNAME: - - #define EPILOGUE