From nobody Thu Jun 20 05:18:59 2024 X-Original-To: dev-commits-ports-all@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 4W4TLC3NHqz5P9gb; Thu, 20 Jun 2024 05:18:59 +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 4W4TLC2vZJz4djv; Thu, 20 Jun 2024 05:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718860739; 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=quEmNn1/iqvXlJh71yr7U6l09EXz5M9cNBdSHNMRjCA=; b=Q7yD+nQ7wGat3XGRUxPigVOWz5DT4s7gElKkxZNxjiAja5iE3xyz7lb4tqkq+Df3MaZwHL 8aRIxdOO4Ejv4cz3RoKDK1ywtvYKE9+6dsWPQryxaIYWXU+dwSWnNCERgsn6b41wFg4UH8 ePcSEauaFMFwvNkk0FfBQSJyblsrXKItTuKOPRAoYu+pgCd4NwntORBl7F8xt/ZUzb6MDY x7PLidWmCUBfZ/+kNKGuOyDgqsMua4mr7L2RLJp8V9T88xq8qexsVviJ7UBj4jlo9wpo+R TQZjvS/HRF/TXk+uuELkN/7GYOdl5PzgS30pnWJZqKIDw8H07QKAJU2OxWshRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718860739; a=rsa-sha256; cv=none; b=vZ3sAnsdYhbtW2qXi5rmhgE8LH7GOz5oTXGyLl3FgMEd2sWTHislA7F6r4nZuQNmIxGBbL 4JxnTdGAW4omtxEhrdhnFVLubzfA4aSIw9i7Q0uSX/k8zud3YaZGggiM5/keyEp7X7Q3t6 DsvIs2876849tHz0jTKiKUM5806hs0949S58MLTlt5ZBdLq3JuoKM8Q+FarItUnep9WFyv ByiPiKT8N45/Xww1KlxXe8HG0aXZpIMd9QGbW7lOT4f/a/lbVQpxVu2A1x0AGWMTAt3G7b xpHoTUjHq/T4cDYcZdWylQMCWqhtuMvqMboF0OsO2lYWHj+qW2j4+WPFVqjDvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718860739; 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=quEmNn1/iqvXlJh71yr7U6l09EXz5M9cNBdSHNMRjCA=; b=i0vUEyyQ+3XZ2GMFMoXZyfmFNjdBTxJhwF8hsRufuVDH/McgWbc6qAP+B5fKIqPwn11Uxq vbnMxQP74msPiTAox0VVwL+am4lZEJqpL/w1aJ1DQpjqjJgLsrihkYJ76GodI8qMVn3iyq zZhQY+sITF9nw18RAw4qb/sWfaU+rYp6Hj+FDvsmWSKpNFmzkBq85Z0q7Ff00+2ZpXkngo coN7djRep3CY4ZKWJH7GC5umnyhrc2qRcQmzayjjjrbxxl/cuX78btk7pTpVUtjACKugde 82jmoSWU5OfLaECkxAM9WRz8CQwat3hddo5vJZlfjiAx+n9WL5E9dmeiEYmOyw== 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 4W4TLC2NTVz1BFH; Thu, 20 Jun 2024 05:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45K5IxfA082679; Thu, 20 Jun 2024 05:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45K5IxdI082676; Thu, 20 Jun 2024 05:18:59 GMT (envelope-from git) Date: Thu, 20 Jun 2024 05:18:59 GMT Message-Id: <202406200518.45K5IxdI082676@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: 0708acd3c9f1 - main - comms/liquid-dsp: fix build on powerpc* List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 0708acd3c9f1a641133061873750efe94ee624b0 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=0708acd3c9f1a641133061873750efe94ee624b0 commit 0708acd3c9f1a641133061873750efe94ee624b0 Author: Piotr Kubaj AuthorDate: 2024-06-19 16:49:56 +0000 Commit: Piotr Kubaj CommitDate: 2024-06-20 05:18:31 +0000 comms/liquid-dsp: fix build on powerpc* cc: error: the clang compiler does not support 'faltivec', please use -maltivec and include altivec.h explicitly --- comms/liquid-dsp/files/patch-configure.ac | 11 +++++ .../files/patch-src_dotprod_src_dotprod__crcf.av.c | 39 ++++++++++++++++++ .../files/patch-src_dotprod_src_dotprod__rrrf.av.c | 48 ++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/comms/liquid-dsp/files/patch-configure.ac b/comms/liquid-dsp/files/patch-configure.ac new file mode 100644 index 000000000000..067e30f1e5ee --- /dev/null +++ b/comms/liquid-dsp/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2024-06-19 10:43:23 UTC ++++ configure.ac +@@ -228,7 +228,7 @@ else + src/dotprod/src/dotprod_rrrf.av.o \ + src/dotprod/src/dotprod_crcf.av.o \ + src/dotprod/src/sumsq.o" +- ARCH_OPTION="-fno-common -faltivec";; ++ ARCH_OPTION="-fno-common -maltivec";; + armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) + # assume neon instructions are NOT available + MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c new file mode 100644 index 000000000000..ee33f55d4bdb --- /dev/null +++ b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c @@ -0,0 +1,39 @@ +--- src/dotprod/src/dotprod_crcf.av.c.orig 2024-06-19 07:24:39 UTC ++++ src/dotprod/src/dotprod_crcf.av.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include "liquid.internal.h" + +@@ -195,8 +196,8 @@ int dotprod_crcf_execute(dotprod_crcf _q, + union { vector float v; float w[4];} s; + unsigned int nblocks; + +- ar = (vector float*)( (int)_x & ~15); +- al = ((int)_x & 15)/sizeof(float); ++ ar = (vector float*)( (uintptr_t)_x & ~15); ++ al = ((uintptr_t)_x & 15)/sizeof(float); + + d = (vector float*)_q->h[al]; + +@@ -206,7 +207,7 @@ int dotprod_crcf_execute(dotprod_crcf _q, + // split into four vectors each with four 32-bit + // partial sums. Effectively each loop iteration + // operates on 16 input samples at a time. +- s0 = s1 = s2 = s3 = (vector float)(0); ++ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; + while (nblocks >= 4) { + s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); + s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); +@@ -227,7 +228,7 @@ int dotprod_crcf_execute(dotprod_crcf _q, + // move the result into the union s (effetively, + // this loads the four 32-bit values in s0 into + // the array w). +- s.v = vec_add(s0,(vector float)(0)); ++ s.v = vec_add(s0,(vector float){0,0,0,0}); + + // sum the resulting array + //*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c new file mode 100644 index 000000000000..380885fd00a1 --- /dev/null +++ b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c @@ -0,0 +1,48 @@ +--- src/dotprod/src/dotprod_rrrf.av.c.orig 2024-06-19 07:25:01 UTC ++++ src/dotprod/src/dotprod_rrrf.av.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include "liquid.internal.h" + +@@ -117,7 +118,7 @@ dotprod_rrrf dotprod_rrrf_create_opt(float * _h, + for (i=0; i<4; i++) { + q->h[i] = calloc(1+(q->n+i-1)/4,sizeof(vector float)); + for (j=0; jn; j++) +- e->h[i][j+i] = _h[_rev ? q->n-j-1 : j]; ++ q->h[i][j+i] = _h[_rev ? q->n-j-1 : j]; + } + + return q; +@@ -190,8 +191,8 @@ int dotprod_rrrf_execute(dotprod_rrrf _q, + union { vector float v; float w[4];} s; + unsigned int nblocks; + +- ar = (vector float*)( (int)_x & ~15); +- al = ((int)_x & 15)/sizeof(float); ++ ar = (vector float*)( (uintptr_t)_x & ~15); ++ al = ((uintptr_t)_x & 15)/sizeof(float); + + d = (vector float*)_q->h[al]; + +@@ -200,7 +201,7 @@ int dotprod_rrrf_execute(dotprod_rrrf _q, + // split into four vectors each with four 32-bit + // partial sums. Effectively each loop iteration + // operates on 16 input samples at a time. +- s0 = s1 = s2 = s3 = (vector float)(0); ++ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; + while (nblocks >= 4) { + s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); + s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); +@@ -221,7 +222,7 @@ int dotprod_rrrf_execute(dotprod_rrrf _q, + // move the result into the union s (effetively, + // this loads the four 32-bit values in s0 into + // the array w). +- s.v = vec_add(s0,(vector float)(0)); ++ s.v = vec_add(s0,(vector float){0,0,0,0}); + + // sum the resulting array + *_r = s.w[0] + s.w[1] + s.w[2] + s.w[3];