[135976] trunk/dports/science/volk
michaelld at macports.org
michaelld at macports.org
Fri May 8 07:40:35 PDT 2015
Revision: 135976
https://trac.macports.org/changeset/135976
Author: michaelld at macports.org
Date: 2015-05-08 07:40:35 -0700 (Fri, 08 May 2015)
Log Message:
-----------
volk: add back using <cpuid.h> if found, and otherwise providing a local copy of it, to make older GCC (<= 4.2) compilers happy. Does not hurt when using Clang or GCC >= 4.3. Redo compiler blacklisting accordingly.
Modified Paths:
--------------
trunk/dports/science/volk/Portfile
Added Paths:
-----------
trunk/dports/science/volk/files/
trunk/dports/science/volk/files/patch-add-back-cpuid.diff
Modified: trunk/dports/science/volk/Portfile
===================================================================
--- trunk/dports/science/volk/Portfile 2015-05-08 14:19:48 UTC (rev 135975)
+++ trunk/dports/science/volk/Portfile 2015-05-08 14:40:35 UTC (rev 135976)
@@ -29,10 +29,11 @@
depends_build-append port:pkgconfig
depends_lib-append port:boost
-# blacklist GCC < 4.3, since it does not provide <cpuid.h>, which is a
-# required header when compiling using GCC as of 4c967ef1 (2015-05-04).
+# patch to add back using <cpuid.h> if found, and otherwise providing
+# a local copy of it, to make older GCC compilers happy. Does not hurt
+# when using Clang or GCC >= 4.3.
-compiler.blacklist-append *gcc-3.* {*gcc-4.[0-2]}
+patchfiles-append patch-add-back-cpuid.diff
# do VPATH (out of source tree) build
@@ -124,9 +125,8 @@
# Blacklist GCC compilers not supporting C++11 and all CLANG.
# This is probably not necessary, but it's good practice.
- # GCC 3* and 4.[0-2] are already blacklisted above.
- compiler.blacklist-append *clang* {*gcc-4.[3-6]}
+ compiler.blacklist-append *clang* *gcc-3.* {*gcc-4.[0-6]}
# and whitelist those we do want to use. wish there were a better way.
# these will be used in the order provided.
Added: trunk/dports/science/volk/files/patch-add-back-cpuid.diff
===================================================================
--- trunk/dports/science/volk/files/patch-add-back-cpuid.diff (rev 0)
+++ trunk/dports/science/volk/files/patch-add-back-cpuid.diff 2015-05-08 14:40:35 UTC (rev 135976)
@@ -0,0 +1,206 @@
+--- /dev/null
++++ lib/gcc_x86_cpuid.h
+@@ -0,0 +1,188 @@
++/*
++ * Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++ *
++ * This file is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 3, or (at your option) any
++ * later version.
++ *
++ * This file is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * Under Section 7 of GPL version 3, you are granted additional
++ * permissions described in the GCC Runtime Library Exception, version
++ * 3.1, as published by the Free Software Foundation.
++ *
++ * You should have received a copy of the GNU General Public License and
++ * a copy of the GCC Runtime Library Exception along with this program;
++ * see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
++ * <http://www.gnu.org/licenses/>.
++ */
++
++/* %ecx */
++#define bit_SSE3 (1 << 0)
++#define bit_PCLMUL (1 << 1)
++#define bit_SSSE3 (1 << 9)
++#define bit_FMA (1 << 12)
++#define bit_CMPXCHG16B (1 << 13)
++#define bit_SSE4_1 (1 << 19)
++#define bit_SSE4_2 (1 << 20)
++#define bit_MOVBE (1 << 22)
++#define bit_POPCNT (1 << 23)
++#define bit_AES (1 << 25)
++#define bit_XSAVE (1 << 26)
++#define bit_OSXSAVE (1 << 27)
++#define bit_AVX (1 << 28)
++#define bit_F16C (1 << 29)
++#define bit_RDRND (1 << 30)
++
++/* %edx */
++#define bit_CMPXCHG8B (1 << 8)
++#define bit_CMOV (1 << 15)
++#define bit_MMX (1 << 23)
++#define bit_FXSAVE (1 << 24)
++#define bit_SSE (1 << 25)
++#define bit_SSE2 (1 << 26)
++
++/* Extended Features */
++/* %ecx */
++#define bit_LAHF_LM (1 << 0)
++#define bit_ABM (1 << 5)
++#define bit_SSE4a (1 << 6)
++#define bit_XOP (1 << 11)
++#define bit_LWP (1 << 15)
++#define bit_FMA4 (1 << 16)
++#define bit_TBM (1 << 21)
++
++/* %edx */
++#define bit_MMXEXT (1 << 22)
++#define bit_LM (1 << 29)
++#define bit_3DNOWP (1 << 30)
++#define bit_3DNOW (1 << 31)
++
++/* Extended Features (%eax == 7) */
++#define bit_FSGSBASE (1 << 0)
++#define bit_BMI (1 << 3)
++
++#if defined(__i386__) && defined(__PIC__)
++/* %ebx may be the PIC register. */
++#if __GNUC__ >= 3
++#define __cpuid(level, a, b, c, d) \
++ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
++ "cpuid\n\t" \
++ "xchg{l}\t{%%}ebx, %1\n\t" \
++ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
++ : "0" (level))
++
++#define __cpuid_count(level, count, a, b, c, d) \
++ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
++ "cpuid\n\t" \
++ "xchg{l}\t{%%}ebx, %1\n\t" \
++ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
++ : "0" (level), "2" (count))
++#else
++/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
++ nor alternatives in i386 code. */
++#define __cpuid(level, a, b, c, d) \
++ __asm__ ("xchgl\t%%ebx, %1\n\t" \
++ "cpuid\n\t" \
++ "xchgl\t%%ebx, %1\n\t" \
++ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
++ : "0" (level))
++
++#define __cpuid_count(level, count, a, b, c, d) \
++ __asm__ ("xchgl\t%%ebx, %1\n\t" \
++ "cpuid\n\t" \
++ "xchgl\t%%ebx, %1\n\t" \
++ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
++ : "0" (level), "2" (count))
++#endif
++#else
++#define __cpuid(level, a, b, c, d) \
++ __asm__ ("cpuid\n\t" \
++ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
++ : "0" (level))
++
++#define __cpuid_count(level, count, a, b, c, d) \
++ __asm__ ("cpuid\n\t" \
++ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
++ : "0" (level), "2" (count))
++#endif
++
++/* Return highest supported input value for cpuid instruction. ext can
++ be either 0x0 or 0x8000000 to return highest supported value for
++ basic or extended cpuid information. Function returns 0 if cpuid
++ is not supported or whatever cpuid returns in eax register. If sig
++ pointer is non-null, then first four bytes of the signature
++ (as found in ebx register) are returned in location pointed by sig. */
++
++static __inline unsigned int
++__get_cpuid_max (unsigned int __ext, unsigned int *__sig)
++{
++ unsigned int __eax, __ebx, __ecx, __edx;
++
++#ifndef __x86_64__
++ /* See if we can use cpuid. On AMD64 we always can. */
++#if __GNUC__ >= 3
++ __asm__ ("pushf{l|d}\n\t"
++ "pushf{l|d}\n\t"
++ "pop{l}\t%0\n\t"
++ "mov{l}\t{%0, %1|%1, %0}\n\t"
++ "xor{l}\t{%2, %0|%0, %2}\n\t"
++ "push{l}\t%0\n\t"
++ "popf{l|d}\n\t"
++ "pushf{l|d}\n\t"
++ "pop{l}\t%0\n\t"
++ "popf{l|d}\n\t"
++ : "=&r" (__eax), "=&r" (__ebx)
++ : "i" (0x00200000));
++#else
++/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
++ nor alternatives in i386 code. */
++ __asm__ ("pushfl\n\t"
++ "pushfl\n\t"
++ "popl\t%0\n\t"
++ "movl\t%0, %1\n\t"
++ "xorl\t%2, %0\n\t"
++ "pushl\t%0\n\t"
++ "popfl\n\t"
++ "pushfl\n\t"
++ "popl\t%0\n\t"
++ "popfl\n\t"
++ : "=&r" (__eax), "=&r" (__ebx)
++ : "i" (0x00200000));
++#endif
++
++ if (!((__eax ^ __ebx) & 0x00200000))
++ return 0;
++#endif
++
++ /* Host supports cpuid. Return highest supported cpuid input value. */
++ __cpuid (__ext, __eax, __ebx, __ecx, __edx);
++
++ if (__sig)
++ *__sig = __ebx;
++
++ return __eax;
++}
++
++/* Return cpuid data for requested cpuid level, as found in returned
++ eax, ebx, ecx and edx registers. The function checks if cpuid is
++ supported and returns 1 for valid cpuid information or 0 for
++ unsupported cpuid level. All pointers are required to be non-null. */
++
++static __inline int
++__get_cpuid (unsigned int __level,
++ unsigned int *__eax, unsigned int *__ebx,
++ unsigned int *__ecx, unsigned int *__edx)
++{
++ unsigned int __ext = __level & 0x80000000;
++
++ if (__get_cpuid_max (__ext, 0) < __level)
++ return 0;
++
++ __cpuid (__level, *__eax, *__ebx, *__ecx, *__edx);
++ return 1;
++}
+--- tmpl/volk_cpu.tmpl.c.orig
++++ tmpl/volk_cpu.tmpl.c
+@@ -33,7 +33,11 @@ struct VOLK_CPU volk_cpu;
+
+ //implement get cpuid for gcc compilers using a system or local copy of cpuid.h
+ #if defined(__GNUC__)
+- #include <cpuid.h>
++ #if defined(HAVE_CPUID_H)
++ #include <cpuid.h>
++ #else
++ #include "gcc_x86_cpuid.h"
++ #endif
+ #define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3)
+
+ /* Return Intel AVX extended CPU capabilities register.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150508/773661ba/attachment-0001.html>
More information about the macports-changes
mailing list