Attachment #250005 for bug #264644




PORTNAME=	liquid-dsp
DISTVERSIONPREFIX=	v
DISTVERSION=	1.6.0
PORTREVISION=	1
CATEGORIES=	comms

MAINTAINER=	mr@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
		libfftw3f.so:math/fftw3-float

USES=		autoreconf gmake libtool localbase

USE_GITHUB=	yes
GH_ACCOUNT=	jgaeddert

Lines 1-3 Link Here

(-)b/comms/liquid-dsp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1578927878	1	TIMESTAMP = 1713268756
2	SHA256 (jgaeddert-liquid-dsp-v1.3.2_GH0.tar.gz) = 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483	2	SHA256 (jgaeddert-liquid-dsp-v1.6.0_GH0.tar.gz) = 6ee6a5dfb48e047b118cf613c0b9f43e34356a5667a77a72a55371d2c8c53bf5
3	SIZE (jgaeddert-liquid-dsp-v1.3.2_GH0.tar.gz) = 1119114	3	SIZE (jgaeddert-liquid-dsp-v1.6.0_GH0.tar.gz) = 1243435

Removed Link Here

(-)a/comms/liquid-dsp/files/patch-configure.ac (-11 lines)
1	--- configure.ac.orig 2018-12-04 23:39:19 UTC
2	+++ configure.ac
3	@@ -195,7 +195,7 @@ else
4	src/dotprod/src/dotprod_rrrf.av.o \
5	src/dotprod/src/dotprod_crcf.av.o \
6	src/dotprod/src/sumsq.o"
7	- ARCH_OPTION="-fno-common -faltivec";;
8	+ ARCH_OPTION="-fno-common -maltivec";;
9	armv1\|armv2\|armv3\|armv4\|armv5\|armv6)
10	# assume neon instructions are NOT available
11	MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \




--- src/dotprod/src/dotprod_crcf.av.c.orig	2018-12-04 23:40:11 UTC
+++ src/dotprod/src/dotprod_crcf.av.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <altivec.h>
 
 #include "liquid.internal.h"
 
@@ -168,8 +169,8 @@ void 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];
 
@@ -179,7 +180,7 @@ void 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);
@@ -200,7 +201,7 @@ void 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];




--- src/dotprod/src/dotprod_rrrf.av.c.orig	2018-12-04 23:41:32 UTC
+++ src/dotprod/src/dotprod_rrrf.av.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <altivec.h>
 
 #include "liquid.internal.h"
 
@@ -163,8 +164,8 @@ void 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];
 
@@ -173,7 +174,7 @@ void 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);
@@ -194,7 +195,7 @@ void 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];

Lines 1-3 Link Here

(-)b/comms/liquid-dsp/pkg-plist (-1 / +2 lines)
1	include/liquid/liquid.h	1	include/liquid/liquid.h
2	lib/libliquid.a	2	lib/libliquid.a
3	lib/libliquid.so	3	lib/libliquid.so
4	-	4	lib/libliquid.so.1
		5	lib/libliquid.so.1.6

Return to bug 264644

Lines 1-7 Link Here

(-)b/comms/liquid-dsp/Makefile (-5 / +3 lines)
1	PORTNAME= liquid-dsp	1	PORTNAME= liquid-dsp
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.3.2	3	DISTVERSION= 1.6.0
4	PORTREVISION= 1
5	CATEGORIES= comms	4	CATEGORIES= comms
6		5
7	MAINTAINER= mr@FreeBSD.org	6	MAINTAINER= mr@FreeBSD.org
Lines 11-20 WWW= https://liquidsdr.org/ Link Here
11	LICENSE= MIT	10	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
13		12
14	LIB_DEPENDS= libfftw3.so:math/fftw3 \	13	LIB_DEPENDS= libfftw3f.so:math/fftw3-float
15	libfftw3f.so:math/fftw3-float
16		14
17	USES= autoreconf gmake iconv:wchar_t libtool localbase	15	USES= autoreconf gmake libtool localbase
18		16
19	USE_GITHUB= yes	17	USE_GITHUB= yes
20	GH_ACCOUNT= jgaeddert	18	GH_ACCOUNT= jgaeddert

Removed Link Here

(-)a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c (-39 lines)
1	--- src/dotprod/src/dotprod_crcf.av.c.orig 2018-12-04 23:40:11 UTC
2	+++ src/dotprod/src/dotprod_crcf.av.c
3	@@ -26,6 +26,7 @@
4
5	#include <stdio.h>
6	#include <stdlib.h>
7	+#include <altivec.h>
8
9	#include "liquid.internal.h"
10
11	@@ -168,8 +169,8 @@ void dotprod_crcf_execute(dotprod_crcf _q,
12	union { vector float v; float w[4];} s;
13	unsigned int nblocks;
14
15	- ar = (vector float*)( (int)_x & ~15);
16	- al = ((int)_x & 15)/sizeof(float);
17	+ ar = (vector float*)( (uintptr_t)_x & ~15);
18	+ al = ((uintptr_t)_x & 15)/sizeof(float);
19
20	d = (vector float*)_q->h[al];
21
22	@@ -179,7 +180,7 @@ void dotprod_crcf_execute(dotprod_crcf _q,
23	// split into four vectors each with four 32-bit
24	// partial sums. Effectively each loop iteration
25	// operates on 16 input samples at a time.
26	- s0 = s1 = s2 = s3 = (vector float)(0);
27	+ s0 = s1 = s2 = s3 = (vector float){0,0,0,0};
28	while (nblocks >= 4) {
29	s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0);
30	s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1);
31	@@ -200,7 +201,7 @@ void dotprod_crcf_execute(dotprod_crcf _q,
32	// move the result into the union s (effetively,
33	// this loads the four 32-bit values in s0 into
34	// the array w).
35	- s.v = vec_add(s0,(vector float)(0));
36	+ s.v = vec_add(s0,(vector float){0,0,0,0});
37
38	// sum the resulting array
39	//*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3];

Removed Link Here

(-)a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c (-39 lines)
1	--- src/dotprod/src/dotprod_rrrf.av.c.orig 2018-12-04 23:41:32 UTC
2	+++ src/dotprod/src/dotprod_rrrf.av.c
3	@@ -26,6 +26,7 @@
4
5	#include <stdio.h>
6	#include <stdlib.h>
7	+#include <altivec.h>
8
9	#include "liquid.internal.h"
10
11	@@ -163,8 +164,8 @@ void dotprod_rrrf_execute(dotprod_rrrf _q,
12	union { vector float v; float w[4];} s;
13	unsigned int nblocks;
14
15	- ar = (vector float*)( (int)_x & ~15);
16	- al = ((int)_x & 15)/sizeof(float);
17	+ ar = (vector float*)( (uintptr_t)_x & ~15);
18	+ al = ((uintptr_t)_x & 15)/sizeof(float);
19
20	d = (vector float*)_q->h[al];
21
22	@@ -173,7 +174,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q,
23	// split into four vectors each with four 32-bit
24	// partial sums. Effectively each loop iteration
25	// operates on 16 input samples at a time.
26	- s0 = s1 = s2 = s3 = (vector float)(0);
27	+ s0 = s1 = s2 = s3 = (vector float){0,0,0,0};
28	while (nblocks >= 4) {
29	s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0);
30	s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1);
31	@@ -194,7 +195,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q,
32	// move the result into the union s (effetively,
33	// this loads the four 32-bit values in s0 into
34	// the array w).
35	- s.v = vec_add(s0,(vector float)(0));
36	+ s.v = vec_add(s0,(vector float){0,0,0,0});
37
38	// sum the resulting array
39	*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3];