fftw-3: enable avx instructions

[NicosPavlov]

The proposed patch enables avx optimisation in case of clang compiler, along with the other optimizations in the portfile.

[skymoo (Adam Mercer)]

Committed in r114195, with appropriate revision bumps. Thanks.

[ryandesign (Ryan Carsten Schmidt)]

What about when the compiler is e.g. "macports-clang-3.3"? Usually we detect clang by using [string match *clang* ${configure.compiler}].

[skymoo (Adam Mercer)]

Good catch, also on a second look it doesn't apply the flag to the fftw-3-single subport.

[skymoo (Adam Mercer)]

I think the following is now correct?

--- a/math/fftw-3/Portfile
+++ b/math/fftw-3/Portfile
@@ -52,7 +52,7 @@ configure.cflags-append \
     -fomit-frame-pointer \
     -fstrict-aliasing

-if { ![string compare ${configure.compiler} "clang"] } {
+if { [string match *clang* ${configure.compiler}] } {
     set is_clang    1
 } else {
     set is_clang    0
@@ -97,11 +97,20 @@ platform powerpc {
 subport fftw-3-single {
     configure.args-append --enable-float

-    array set merger_configure_args {
-        ppc    "--enable-fma --enable-altivec"
-        ppc64  "--enable-fma --enable-altivec"
-        i386   "--enable-sse"
-        x86_64 "--enable-sse"
+    if { $is_clang == 1 } {
+        array set merger_configure_args {
+            ppc    "--enable-fma --enable-altivec"
+            ppc64  "--enable-fma --enable-altivec"
+            i386   "--enable-sse --enable-avx"
+            x86_64 "--enable-sse --enable-avx"
+        }
+    } else {
+        array set merger_configure_args {
+            ppc    "--enable-fma --enable-altivec"
+            ppc64  "--enable-fma --enable-altivec"
+            i386   "--enable-sse"
+            x86_64 "--enable-sse"
+        }
     }

     depends_lib port:fftw-3
@@ -110,6 +119,9 @@ subport fftw-3-single {
         if {![variant_isset universal]} {
             configure.args-delete --enable-sse2
             configure.args-append --enable-sse
+            if { $is_clang == 1 } {
+                configure.args-append --enable-avx
+            }
         }
     }

[9peppe (Giuseppe C)]

I attached my log. Revision 4 does not work for me.

[skymoo (Adam Mercer)]

That's not from a clean attempted, can you clean the port and rebuild and then attach that log.

[9peppe (Giuseppe C)]

Replying to ram@…:

That's not from a clean attempted, can you clean the port and rebuild and then attach that log.

Done.

 % sudo port clean fftw-3                                                                       
--->  Cleaning fftw-3
 % sudo port upgrade fftw-3                                                                     
--->  Fetching archive for fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://lil.fr.packages.macports.org/fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://mse.uk.packages.macports.org/sites/packages.macports.org/fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://packages.macports.org/fftw-3
--->  Fetching distfiles for fftw-3
--->  Verifying checksums for fftw-3
--->  Extracting fftw-3
--->  Configuring fftw-3
--->  Building fftw-3
Error: org.macports.build for port fftw-3 returned: command execution failed
Please see the log file for port fftw-3 for details:
    /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_ports_math_fftw-3/fftw-3/main.log
Error: Unable to upgrade port: 1
To report a bug, follow the instructions in the guide:
    http://guide.macports.org/#project.tickets

[skymoo (Adam Mercer)]

I can't reproduce this on my Mountain Lion or Mavericks box, it looks like you're using Snow Leopard.

Nicolas: Any ideas as this was your patch?

[9peppe (Giuseppe C)]

Cc Me!

[9peppe (Giuseppe C)]

Replying to ram@…:

it looks like you're using Snow Leopard.

I am.

[NicosPavlov]

Replying to ram@…:

I can't reproduce this on my Mountain Lion or Mavericks box, it looks like you're using Snow Leopard.

Nicolas: Any ideas as this was your patch?

It is quite possible that the patch provoked this indirectly. Looking up this type of error, it seems that people attribute it to a regression in clang-3.2, but testing

sudo port -d install fftw-3 configure.compiler=macports-clang-3.2

on my system also compiles the port (Mavericks). It may be deeper in the libraries, and be dependent on the XCode version. Which one do you have ?

[9peppe (Giuseppe C)]

Replying to nicos@…:

It may be deeper in the libraries, and be dependent on the XCode version. Which one do you have ?

4.2. Should I upgrade?

[NicosPavlov]

Not necessarily, but this may mean that some older versions of clang may have to be blacklisted since they can't handle the additional options from the patch. Another option would be to apply the options from this patch only on some versions of clang, but that seems more complicated.

The attached patch could be used to blacklist the clang compiler from Xcode version 4.2 and older (which would in practice fall back to llvm-gcc-4.2 on 10.6).

[skymoo (Adam Mercer)]

Looks like this also affects Lion: #41662

[skymoo (Adam Mercer)]

OP for #41662 hadn't updated the command line tools in a long time. It looked that the version of clang installed was from Xcode-3.x. Updating to the Lion command line tools fixed the issue.

[skymoo (Adam Mercer)]

peppecal: Does this patch allow you to build?

[9peppe (Giuseppe C)]

Replying to ram@…:

peppecal: Does this patch allow you to build?

yes.

 % patch Portfile Portfile-fftw-3-olderclang.diff                                               /tmp 00:06:31
patching file Portfile
 % sudo port install                                                                            /tmp 00:06:41 
Password:
--->  Fetching archive for fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://lil.fr.packages.macports.org/fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://mse.uk.packages.macports.org/sites/packages.macports.org/fftw-3
--->  Attempting to fetch fftw-3-3.3.3_4.darwin_10.x86_64.tbz2 from http://packages.macports.org/fftw-3
--->  Fetching distfiles for fftw-3
--->  Verifying checksums for fftw-3
--->  Extracting fftw-3
--->  Configuring fftw-3
--->  Building fftw-3
--->  Staging fftw-3 into destroot
--->  Installing fftw-3 @3.3.3_4
--->  Deactivating fftw-3 @3.3.3_3
--->  Cleaning fftw-3
--->  Activating fftw-3 @3.3.3_4
--->  Cleaning fftw-3
--->  Updating database of binaries: 100.0%
--->  Scanning binaries for linking errors: 100.0%
--->  No broken files found.
 %                                                                                              /tmp 00:10:34

[skymoo (Adam Mercer)]

Great, thanks for the confirmation.

[skymoo (Adam Mercer)]

r114261