<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140984] trunk/dports/science/volk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/140984">140984</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-07 06:40:30 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>volk-devel: update to 015b1e27 (20151006), adding in a temporary patch to fix a general build issue.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkPortfile">trunk/dports/science/volk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkfilespatchkernels_volk_volk_32fc_s32fc_x2_rotator_32fchdiff">trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencevolkfilespatch_mm_bsrli_si128diff">trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencevolkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/volk/Portfile (140983 => 140984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk/Portfile 2015-10-07 13:40:22 UTC (rev 140983)
+++ trunk/dports/science/volk/Portfile 2015-10-07 13:40:30 UTC (rev 140984)
</span><span class="lines">@@ -36,20 +36,18 @@
</span><span class="cx">
</span><span class="cx"> subport volk-devel {
</span><span class="cx">
</span><del>- github.setup gnuradio volk a5f24520138d9e1b802722c42372526fad3a460a
- version 20150915
</del><ins>+ github.setup gnuradio volk 015b1e271ac32e100e50670fa1be6d2d4b1294c1
+ version 20151006
</ins><span class="cx"> checksums \
</span><del>- rmd160 29a94831d5b7ed0805341853ab6baff06f0f9a6a \
- sha256 c96b40e7f90a00994101313c68e87547bd2bfd8cef560a8225632c6748b0db96
</del><ins>+ rmd160 4f2253819bbe2cf8c059c6f4ea40a12586979c30 \
+ sha256 f4fd95c3f919130d71020d5e3e8e48af678a10b53f671789ddb4b3748bacab38
</ins><span class="cx"> conflicts volk
</span><span class="cx"> long_description ${long_description} ${subport} \
</span><span class="cx"> provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
</span><span class="cx">
</span><del>- # temporary patch to do "s/_mm_bsrli_si128/_mm_srli_si128/g" in
- # kernels/volk/volk_8u_x2_encodeframepolar_8u.h
</del><ins>+ # temporary patch to fix avx rotator build issue
+ patchfiles-append patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff
</ins><span class="cx">
</span><del>- patchfiles-append patch-_mm_bsrli_si128.diff
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # override githib PortGroup homepage setting
</span></span></pre></div>
<a id="trunkdportssciencevolkfilespatch_mm_bsrli_si128diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff (140983 => 140984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff 2015-10-07 13:40:22 UTC (rev 140983)
+++ trunk/dports/science/volk/files/patch-_mm_bsrli_si128.diff 2015-10-07 13:40:30 UTC (rev 140984)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>---- 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);
-
</del></span></pre></div>
<a id="trunkdportssciencevolkfilespatchkernels_volk_volk_32fc_s32fc_x2_rotator_32fchdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff (0 => 140984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff (rev 0)
+++ trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff 2015-10-07 13:40:30 UTC (rev 140984)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+--- kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h.orig
++++ kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
+@@ -411,11 +411,11 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_a_avx(lv_32fc_t* outVector, c
+ cPtr += 4;
+ }
+ if (i) {
+- tmp1 = _mm_mul_ps(phase_Val, phase_Val);
+- tmp2 = _mm_hadd_ps(tmp1, tmp1);
+- tmp1 = _mm_shuffle_ps(tmp2, tmp2, 0xD8);
+- tmp2 = _mm_sqrt_ps(tmp1);
+- phase_Val = _mm_div_ps(phase_Val, tmp2);
++ tmp1 = _mm256_mul_ps(phase_Val, phase_Val);
++ tmp2 = _mm256_hadd_ps(tmp1, tmp1);
++ tmp1 = _mm256_shuffle_ps(tmp2, tmp2, 0xD8);
++ tmp2 = _mm256_sqrt_ps(tmp1);
++ phase_Val = _mm256_div_ps(phase_Val, tmp2);
+ }
+
+ _mm256_storeu_ps((float*)phase_Ptr, phase_Val);
+@@ -517,11 +517,11 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_u_avx(lv_32fc_t* outVector, c
+ cPtr += 4;
+ }
+ if (i) {
+- tmp1 = _mm_mul_ps(phase_Val, phase_Val);
+- tmp2 = _mm_hadd_ps(tmp1, tmp1);
+- tmp1 = _mm_shuffle_ps(tmp2, tmp2, 0xD8);
+- tmp2 = _mm_sqrt_ps(tmp1);
+- phase_Val = _mm_div_ps(phase_Val, tmp2);
++ tmp1 = _mm256_mul_ps(phase_Val, phase_Val);
++ tmp2 = _mm256_hadd_ps(tmp1, tmp1);
++ tmp1 = _mm256_shuffle_ps(tmp2, tmp2, 0xD8);
++ tmp2 = _mm256_sqrt_ps(tmp1);
++ phase_Val = _mm256_div_ps(phase_Val, tmp2);
+ }
+
+ _mm256_storeu_ps((float*)phase_Ptr, phase_Val);
</ins></span></pre>
</div>
</div>
</body>
</html>