From nobody Tue Mar 29 06:25:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A09041A3594B; Tue, 29 Mar 2022 06:25:09 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KSKLF45rHz4jKq; Tue, 29 Mar 2022 06:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648535109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nvXqekGrrPTozq14RUXT66jtgJ2wH20nozk/ypAZ80=; b=GPYTPyo6GJhfnQdaRFwc3U6+HPq+x+ALHSNMM6jyRuNzMSwbthAMbjw6TJuyizncO7HoHr bs3KzCphzvLZipgc+EVBTxLpSktVIRU+BQuXgOaEUPvzmKjewEvKLKaKNQfDkUzUC0+nKR 451UNPIndTkuRaPHhewYbkBNtInqWLSN7L2DM8ReUvSnWeeXI1OPrp4TFtFnog9EKHxADh xzDJpgfPF92ap+6nIavKclg+6sL/C2aSWmZWwi0qEYeQF+2poeUd7OObL9rjq6wKVTwfjG IkTLukTI/2HlaAcpbufuFKPn2zoTxojvfwNadBC3foeHIroPfVru5yOz+CsWoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6339319770; Tue, 29 Mar 2022 06:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22T6P9qk099947; Tue, 29 Mar 2022 06:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22T6P95w099946; Tue, 29 Mar 2022 06:25:09 GMT (envelope-from git) Date: Tue, 29 Mar 2022 06:25:09 GMT Message-Id: <202203290625.22T6P95w099946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: ac19aed05816 - main - science/cdo: fix build on powerpc64le with LLVM 13.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac19aed05816d6ee531c28d1fc19bff821c59e8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648535109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nvXqekGrrPTozq14RUXT66jtgJ2wH20nozk/ypAZ80=; b=NsOPyTMf7WB5Igvt1Q7H4Qr7HEPD73UpHbxpJG/HdMdj9b8/pGsCvOR1QOz2YNk+bK5Zwk 6bq42eJbxshh1p5ZngMZkh+k6q10CRg6H2gwRbCNlPXAmRYVeB4UPWG6U2hLXKssE/vdah wvNG/uA4SkMtqACpSEf9dtBRMiraVsBpfctcdLE2ZTn48uDzc17Ymmqmfv1zZSDNAdVGBA Ch3ro3lLyUsWC0kgQ8xin3ShbJ5bQDg75fa7BCEmQ8UXjMYLCWkdUVeSj2BPit9rUOkxI3 sdSS6LnEEZTFasVs6XzhHA4nRlqNtz7tsKXpYJ0Ioqwu4K1K1F/bvBB6TOeq0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648535109; a=rsa-sha256; cv=none; b=EXj7MX+LSdHnsVI2R86h5zDTQMEYv0iXmpd1B9hqfPgT4tyHWgx7kArXxwyTTU4AHF20c0 9WVn/YlV4PMO7cVQIGE9iKYavDW5d1Gfv8CdNz7REBTLJ3eKAtgKaWZQUtk5pJVqQo8j2/ iZj/EuV6qPJ1pQjXylbPvloliGEfAk9qsA9WXC+t0edXzGqtGAwo9EcXmKF7RR0NSkhIfu vPyk6At1WFtHTwIY3Lu5CgTPpq2YvN8QQRK3WgsNfsfZL7pFj0WROIVi/AXEwar+1WzN4K 21eee5HncB460FMcZlIF3KtzKaFkk9C87OYr+H1AUOkEYn5DWQ1jb/dq7hMP2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac19aed05816d6ee531c28d1fc19bff821c59e8c commit ac19aed05816d6ee531c28d1fc19bff821c59e8c Author: Piotr Kubaj AuthorDate: 2022-03-29 06:14:10 +0000 Commit: Piotr Kubaj CommitDate: 2022-03-29 06:14:10 +0000 science/cdo: fix build on powerpc64le with LLVM 13.0.0 Same as science/cgribex: cgribexlib.c:766:2: error: address of register variable requested dmin[j] = data[0]; --- science/cdo/files/patch-libcdi_src_cgribexlib.c | 57 ++++++++++++++++--------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/science/cdo/files/patch-libcdi_src_cgribexlib.c b/science/cdo/files/patch-libcdi_src_cgribexlib.c index 11aaf5c127f6..904c7971669d 100644 --- a/science/cdo/files/patch-libcdi_src_cgribexlib.c +++ b/science/cdo/files/patch-libcdi_src_cgribexlib.c @@ -9,23 +9,42 @@ #pragma options nostrict #include #endif -@@ -734,6 +734,19 @@ void sse2_minmax_val_double(const double *restrict buf - #endif // SIMD +@@ -745,8 +745,8 @@ void pwr6_minmax_val_double_unrolled6(const double *re + size_t i, j; + size_t residual = datasize % __UNROLL_DEPTH_1; + size_t ofs = datasize - residual; +- double register dmin[__UNROLL_DEPTH_1]; +- double register dmax[__UNROLL_DEPTH_1]; ++ double dmin[__UNROLL_DEPTH_1]; ++ double dmax[__UNROLL_DEPTH_1]; - #if defined(_ARCH_PWR6) -+ -+#ifndef __fsel -+static __inline__ double __fsel(double x, double y, double z) -+ __attribute__((always_inline)); -+static __inline__ double -+__fsel(double x, double y, double z) -+{ -+ double r; -+ __asm__("fsel %0,%1,%2,%3" : "=d"(r) : "d"(x),"d"(y),"d"(z)); -+ return r; -+} -+#endif -+ - static - void pwr6_minmax_val_double_unrolled6(const double *restrict data, size_t datasize, double *fmin, double *fmax) - { + for ( j = 0; j < __UNROLL_DEPTH_1; j++) + { +@@ -758,21 +758,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re + { + for (j = 0; j < __UNROLL_DEPTH_1; j++) + { +- dmin[j] = __fsel(dmin[j] - data[i+j], data[i+j], dmin[j]); +- dmax[j] = __fsel(data[i+j] - dmax[j], data[i+j], dmax[j]); ++ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[i+j], data[i+j], dmin[j]); ++ dmax[j] = __builtin_ppc_fsel(data[i+j] - dmax[j], data[i+j], dmax[j]); + } + } + + for (j = 0; j < residual; j++) + { +- dmin[j] = __fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]); +- dmax[j] = __fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]); ++ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]); ++ dmax[j] = __builtin_ppc_fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]); + } + + for ( j = 0; j < __UNROLL_DEPTH_1; j++) + { +- *fmin = __fsel(*fmin - dmin[j], dmin[j], *fmin); +- *fmax = __fsel(dmax[j] - *fmax, dmax[j], *fmax); ++ *fmin = __builtin_ppc_fsel(*fmin - dmin[j], dmin[j], *fmin); ++ *fmax = __builtin_ppc_fsel(dmax[j] - *fmax, dmax[j], *fmax); + } + } + #undef __UNROLL_DEPTH_1