From owner-svn-ports-head@freebsd.org Tue Jul 30 12:11:23 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2E092A170D; Tue, 30 Jul 2019 12:11:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA89196AB2; Tue, 30 Jul 2019 12:11:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B319A18D1D; Tue, 30 Jul 2019 12:11:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6UCBM86049138; Tue, 30 Jul 2019 12:11:22 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UCBMpc049136; Tue, 30 Jul 2019 12:11:22 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201907301211.x6UCBMpc049136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 30 Jul 2019 12:11:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507634 - in head/math/openblas: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/math/openblas: . files X-SVN-Commit-Revision: 507634 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DA89196AB2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jul 2019 12:11:23 -0000 Author: pkubaj Date: Tue Jul 30 12:11:21 2019 New Revision: 507634 URL: https://svnweb.freebsd.org/changeset/ports/507634 Log: math/openblas: fix build on powerpc64 with TARGET=PPC970 and switch to PPC970 This patch fixes build for PPC970 target. Since most people that run FreeBSD on powerpc64 use PowerPC 970 CPU's, switch to it by default and add non-default option to optimize for POWER6 (optimizing for newer POWER doesn't work on BE). Bump PORTREVISION because of package change. PR: 238868 Approved by: phd_kimberlite@yahoo.co.jp (maintainer), linimon (mentor) Differential Revision: https://reviews.freebsd.org/D21010 Added: head/math/openblas/files/patch-param.h (contents, props changed) Modified: head/math/openblas/Makefile head/math/openblas/files/patch-common__power.h Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Tue Jul 30 12:03:42 2019 (r507633) +++ head/math/openblas/Makefile Tue Jul 30 12:11:21 2019 (r507634) @@ -3,7 +3,7 @@ PORTNAME= openblas PORTVERSION= 0.2.20 -PORTREVISION= 9 +PORTREVISION= 10 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= math @@ -40,6 +40,7 @@ BUILDFLAGS= FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1 OPTIONS_DEFINE= INTERFACE64 OPENMP OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +OPTIONS_DEFINE_powerpc64= POWER6 .if defined(BATCH) || defined(PACKAGE_BUILDING) OPTIONS_DEFAULT_i386= DYNAMIC_ARCH @@ -51,11 +52,16 @@ INTERFACE64_DESC= Use 8 byte integers on 64-bit archit OPENMP_DESC= Use OpenMP for threading AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) +POWER6_DESC= Optimize for POWER6, instead of the default PPC970 .include .if ${ARCH} == powerpc64 +. if ${PORT_OPTIONS:MPOWER6} TARGET_CPU_ARCH= POWER6 +.else +TARGET_CPU_ARCH= PPC970 +. endif .endif .if defined(TARGET_CPU_ARCH) Modified: head/math/openblas/files/patch-common__power.h ============================================================================== --- head/math/openblas/files/patch-common__power.h Tue Jul 30 12:03:42 2019 (r507633) +++ head/math/openblas/files/patch-common__power.h Tue Jul 30 12:11:21 2019 (r507634) @@ -1,5 +1,14 @@ ---- common_power.h.orig 2019-06-26 10:25:04 UTC +--- common_power.h.orig 2017-07-24 04:03:35 UTC +++ common_power.h +@@ -241,7 +241,7 @@ static inline int blas_quickdivide(blasint x, blasint + #define HAVE_PREFETCH + #endif + +-#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) ++#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(PPC970) + #define DCBT_ARG 0 + #else + #define DCBT_ARG 8 @@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint #if defined(ASSEMBLER) && !defined(NEEDPARAM) Added: head/math/openblas/files/patch-param.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/openblas/files/patch-param.h Tue Jul 30 12:11:21 2019 (r507634) @@ -0,0 +1,11 @@ +--- param.h.orig 2019-06-28 14:19:50 UTC ++++ param.h +@@ -1877,7 +1877,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI + #define ZGEMM_DEFAULT_UNROLL_M 2 + #define ZGEMM_DEFAULT_UNROLL_N 2 + +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + #if L2_SIZE == 1024976 + #define SGEMM_DEFAULT_P 320 + #define DGEMM_DEFAULT_P 256