[140336] trunk/dports/science/volk

[michaelld at macports.org]

Revision: 140336
          https://trac.macports.org/changeset/140336
Author:   michaelld at macports.org
Date:     2015-09-17 10:42:59 -0700 (Thu, 17 Sep 2015)
Log Message:
-----------
volk-devel: update to a5f24520 (20150915), adding in a temporary patch to fix the use of the _mm_bsrli_si128 intrinsic to be _mm_srli_si128 since it should work with many more and older compilers.

Modified Paths:
--------------
    trunk/dports/science/volk/Portfile

Added Paths:
-----------
    trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff

Modified: trunk/dports/science/volk/Portfile
===================================================================
--- trunk/dports/science/volk/Portfile	2015-09-17 16:01:17 UTC (rev 140335)
+++ trunk/dports/science/volk/Portfile	2015-09-17 17:42:59 UTC (rev 140336)
@@ -36,15 +36,20 @@
 
 subport volk-devel {
 
-    github.setup    gnuradio volk 078d078d6c5af25e9901e91dac9bd7865791f226
-    version         20150824
+    github.setup    gnuradio volk a5f24520138d9e1b802722c42372526fad3a460a
+    version         20150915
     checksums       \
-        rmd160 b73b0b12769af9130965648dfb99cc640e3fb8e4 \
-        sha256 42358e339ceed1e189f8e92d0453cb8c07559b7015e6d78b9faf07c998bfbade
+        rmd160 29a94831d5b7ed0805341853ab6baff06f0f9a6a \
+        sha256 c96b40e7f90a00994101313c68e87547bd2bfd8cef560a8225632c6748b0db96
     conflicts       volk
     long_description ${long_description} ${subport} \
 provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
 
+    # temporary patch to do "s/_mm_bsrli_si128/_mm_srli_si128/g" in
+    # kernels/volk/volk_8u_x2_encodeframepolar_8u.h
+
+    patchfiles-append patch-_mm_bsrli_si128.diff
+
 }
 
 # override githib PortGroup homepage setting

Added: trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff
===================================================================
--- trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff	                        (rev 0)
+++ trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff	2015-09-17 17:42:59 UTC (rev 140336)
@@ -0,0 +1,88 @@
+--- kernels/volk/volk_8u_x2_encodeframepolar_8u.h.orig
++++ kernels/volk/volk_8u_x2_encodeframepolar_8u.h
+@@ -121,12 +121,12 @@ volk_8u_x2_encodeframepolar_8u_u_ssse3(unsigned char* frame, unsigned char* temp
+           r_temp1 = _mm_loadu_si128((__m128i *) temp_ptr);
+           temp_ptr += 16;
+ 
+-          shifted = _mm_bsrli_si128(r_temp0, 1);
++          shifted = _mm_srli_si128(r_temp0, 1);
+           shifted = _mm_and_si128(shifted, mask_stage1);
+           r_temp0 = _mm_xor_si128(shifted, r_temp0);
+           r_temp0 = _mm_shuffle_epi8(r_temp0, shuffle_separate);
+ 
+-          shifted = _mm_bsrli_si128(r_temp1, 1);
++          shifted = _mm_srli_si128(r_temp1, 1);
+           shifted = _mm_and_si128(shifted, mask_stage1);
+           r_temp1 = _mm_xor_si128(shifted, r_temp1);
+           r_temp1 = _mm_shuffle_epi8(r_temp1, shuffle_separate);
+@@ -170,7 +170,7 @@ volk_8u_x2_encodeframepolar_8u_u_ssse3(unsigned char* frame, unsigned char* temp
+     // shuffle once for bit-reversal.
+     r_temp0 = _mm_shuffle_epi8(r_temp0, shuffle_stage4);
+ 
+-    shifted = _mm_bsrli_si128(r_temp0, 8);
++    shifted = _mm_srli_si128(r_temp0, 8);
+     shifted = _mm_and_si128(shifted, mask_stage4);
+     r_frame0 = _mm_xor_si128(shifted, r_temp0);
+ 
+@@ -178,15 +178,15 @@ volk_8u_x2_encodeframepolar_8u_u_ssse3(unsigned char* frame, unsigned char* temp
+     r_temp0 = _mm_loadu_si128((__m128i*) temp_ptr);
+     temp_ptr += 16;
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 4);
++    shifted = _mm_srli_si128(r_frame0, 4);
+     shifted = _mm_and_si128(shifted, mask_stage3);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 2);
++    shifted = _mm_srli_si128(r_frame0, 2);
+     shifted = _mm_and_si128(shifted, mask_stage2);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 1);
++    shifted = _mm_srli_si128(r_frame0, 1);
+     shifted = _mm_and_si128(shifted, mask_stage1);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
+@@ -243,12 +243,12 @@ volk_8u_x2_encodeframepolar_8u_a_ssse3(unsigned char* frame, unsigned char* temp
+           r_temp1 = _mm_load_si128((__m128i *) temp_ptr);
+           temp_ptr += 16;
+ 
+-          shifted = _mm_bsrli_si128(r_temp0, 1);
++          shifted = _mm_srli_si128(r_temp0, 1);
+           shifted = _mm_and_si128(shifted, mask_stage1);
+           r_temp0 = _mm_xor_si128(shifted, r_temp0);
+           r_temp0 = _mm_shuffle_epi8(r_temp0, shuffle_separate);
+ 
+-          shifted = _mm_bsrli_si128(r_temp1, 1);
++          shifted = _mm_srli_si128(r_temp1, 1);
+           shifted = _mm_and_si128(shifted, mask_stage1);
+           r_temp1 = _mm_xor_si128(shifted, r_temp1);
+           r_temp1 = _mm_shuffle_epi8(r_temp1, shuffle_separate);
+@@ -292,7 +292,7 @@ volk_8u_x2_encodeframepolar_8u_a_ssse3(unsigned char* frame, unsigned char* temp
+     // shuffle once for bit-reversal.
+     r_temp0 = _mm_shuffle_epi8(r_temp0, shuffle_stage4);
+ 
+-    shifted = _mm_bsrli_si128(r_temp0, 8);
++    shifted = _mm_srli_si128(r_temp0, 8);
+     shifted = _mm_and_si128(shifted, mask_stage4);
+     r_frame0 = _mm_xor_si128(shifted, r_temp0);
+ 
+@@ -300,15 +300,15 @@ volk_8u_x2_encodeframepolar_8u_a_ssse3(unsigned char* frame, unsigned char* temp
+     r_temp0 = _mm_load_si128((__m128i*) temp_ptr);
+     temp_ptr += 16;
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 4);
++    shifted = _mm_srli_si128(r_frame0, 4);
+     shifted = _mm_and_si128(shifted, mask_stage3);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 2);
++    shifted = _mm_srli_si128(r_frame0, 2);
+     shifted = _mm_and_si128(shifted, mask_stage2);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
+-    shifted = _mm_bsrli_si128(r_frame0, 1);
++    shifted = _mm_srli_si128(r_frame0, 1);
+     shifted = _mm_and_si128(shifted, mask_stage1);
+     r_frame0 = _mm_xor_si128(shifted, r_frame0);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150917/0dfee455/attachment.html>