Changeset 9336

Show
Ignore:
Timestamp:
08/19/08 17:09:56
Author:
eb
Message:

Merged features/mp-sched -r8915:9335 into the trunk. The trunk now
contains the SMP aware scheduler. This changeset
introduces a dependency on boost 1.35 or later.
See source:gnuradio/trunk/README.building-boost for additional info.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/Makefile.am

    r8457 r9336  
    3030        config.h.in \ 
    3131        run_tests.sh.in \ 
    32         README.hacking 
     32        README.hacking \ 
     33        README.building-boost 
    3334 
    3435SUBDIRS = @build_dirs@ 

  • gnuradio/trunk/Makefile.common

    r8642 r9336  
    106106# This used to be set in configure.ac but is now defined here for all  
    107107# Makefiles when this fragment is included. 
    108 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) 
     108STD_DEFINES_AND_INCLUDES=$(DEFINES) $(BOOST_CPPFLAGS) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) 
    109109 
    110110# Fix for BSD make not defining $(RM).  We define it now in configure.ac 

  • gnuradio/trunk/README

    r6868 r9336  
    186186http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103 
    187187 
    188 (6) The Boost C++ Libraries     http://www.boost.org 
    189  
    190 We use the Smart Pointer library.  Most systems already have the boost 
    191 libraries available.  In the unlikely event that yours doesn't, 
    192 download the source and follow the build instructions.  They're 
    193 different from the normal ./configure && make 
     188 
     189(6) The Boost C++ Libraries (1.35 or later)  http://www.boost.org 
     190 
     191We use Smart Pointers, the thread library and a bunch of other boost stuff. 
     192If your system doesn't have boost 1.35 or later, see README.building-boost 
     193for additional info. 
    194194 
    195195 

  • gnuradio/trunk/config/Makefile.am

    r8642 r9336  
    11# 
    2 # Copyright 2001,2006 Free Software Foundation, Inc. 
     2# Copyright 2001,2006,2008 Free Software Foundation, Inc. 
    33#  
    44# This file is part of GNU Radio 
    …… 
    2828m4macros = \ 
    2929        acx_pthread.m4 \ 
     30        ax_boost_base.m4 \ 
     31        ax_boost_date_time.m4 \ 
     32        ax_boost_filesystem.m4 \ 
     33        ax_boost_iostreams.m4 \ 
     34        ax_boost_program_options.m4 \ 
     35        ax_boost_python.m4 \ 
     36        ax_boost_regex.m4 \ 
     37        ax_boost_serialization.m4 \ 
     38        ax_boost_signals.m4 \ 
     39        ax_boost_system.m4 \ 
     40        ax_boost_test_exec_monitor.m4 \ 
     41        ax_boost_thread.m4 \ 
     42        ax_boost_unit_test_framework.m4 \ 
     43        ax_boost_wserialization.m4 \ 
    3044        bnv_have_qt.m4 \ 
    3145        cppunit.m4 \ 
    32         gr_boost.m4 \ 
    3346        grc_build.m4 \ 
    3447        grc_gcell.m4 \ 
    …… 
    6578        gr_fortran.m4 \ 
    6679        gr_gprof.m4 \ 
     80        gr_lib64.m4 \ 
    6781        gr_libgnuradio_core_extra_ldflags.m4 \ 
    6882        gr_no_undefined.m4 \ 
    …… 
    7690        gr_swig.m4 \ 
    7791        gr_sysv_shm.m4 \ 
    78         gr_x86_64.m4 \ 
    7992        lf_cc.m4 \ 
    8093        lf_cxx.m4 \ 

  • gnuradio/trunk/config/acx_pthread.m4

    r3746 r9336  
    1 dnl Available from the GNU Autoconf Macro Archive at: 
    2 dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html 
    3 dnl 
     1# =========================================================================== 
     2#              http://autoconf-archive.cryp.to/acx_pthread.html 
     3# =========================================================================== 
     4# 
     5# SYNOPSIS 
     6# 
     7#   ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) 
     8# 
     9# DESCRIPTION 
     10# 
     11#   This macro figures out how to build C programs using POSIX threads. It 
     12#   sets the PTHREAD_LIBS output variable to the threads library and linker 
     13#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler 
     14#   flags that are needed. (The user can also force certain compiler 
     15#   flags/libs to be tested by setting these environment variables.) 
     16# 
     17#   Also sets PTHREAD_CC to any special C compiler that is needed for 
     18#   multi-threaded programs (defaults to the value of CC otherwise). (This 
     19#   is necessary on AIX to use the special cc_r compiler alias.) 
     20# 
     21#   NOTE: You are assumed to not only compile your program with these flags, 
     22#   but also link it with them as well. e.g. you should link with 
     23#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS 
     24# 
     25#   If you are only building threads programs, you may wish to use these 
     26#   variables in your default LIBS, CFLAGS, and CC: 
     27# 
     28#          LIBS="$PTHREAD_LIBS $LIBS" 
     29#          CFLAGS="$CFLAGS $PTHREAD_CFLAGS" 
     30#          CC="$PTHREAD_CC" 
     31# 
     32#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant 
     33#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name 
     34#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX). 
     35# 
     36#   ACTION-IF-FOUND is a list of shell commands to run if a threads library 
     37#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it 
     38#   is not found. If ACTION-IF-FOUND is not specified, the default action 
     39#   will define HAVE_PTHREAD. 
     40# 
     41#   Please let the authors know if this macro fails on any platform, or if 
     42#   you have any other suggestions or comments. This macro was based on work 
     43#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help 
     44#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by 
     45#   Alejandro Forero Cuervo to the autoconf macro repository. We are also 
     46#   grateful for the helpful feedback of numerous users. 
     47# 
     48# LAST MODIFICATION 
     49# 
     50#   2008-04-12 
     51# 
     52# COPYLEFT 
     53# 
     54#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> 
     55# 
     56#   This program is free software: you can redistribute it and/or modify it 
     57#   under the terms of the GNU General Public License as published by the 
     58#   Free Software Foundation, either version 3 of the License, or (at your 
     59#   option) any later version. 
     60# 
     61#   This program is distributed in the hope that it will be useful, but 
     62#   WITHOUT ANY WARRANTY; without even the implied warranty of 
     63#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
     64#   Public License for more details. 
     65# 
     66#   You should have received a copy of the GNU General Public License along 
     67#   with this program. If not, see <http://www.gnu.org/licenses/>. 
     68# 
     69#   As a special exception, the respective Autoconf Macro's copyright owner 
     70#   gives unlimited permission to copy, distribute and modify the configure 
     71#   scripts that are the output of Autoconf when processing the Macro. You 
     72#   need not follow the terms of the GNU General Public License when using 
     73#   or distributing such scripts, even though portions of the text of the 
     74#   Macro appear in them. The GNU General Public License (GPL) does govern 
     75#   all other use of the material that constitutes the Autoconf Macro. 
     76# 
     77#   This special exception to the GPL applies to versions of the Autoconf 
     78#   Macro released by the Autoconf Macro Archive. When you make and 
     79#   distribute a modified version of the Autoconf Macro, you may extend this 
     80#   special exception to the GPL to apply to your modified version as well. 
     81 
    482AC_DEFUN([ACX_PTHREAD], [ 
    583AC_REQUIRE([AC_CANONICAL_HOST]) 
    …… 
    38116# Create a list of thread flags to try.  Items starting with a "-" are 
    39117# C compiler flags, and other items are library names, except for "none" 
    40 # which indicates that we try without any flags at all. 
    41  
    42 acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" 
     118# which indicates that we try without any flags at all, and "pthread-config" 
     119# which is a program returning the flags for the Pth emulation library. 
     120 
     121acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" 
    43122 
    44123# The ordering *is* (sometimes) important.  Some notes on the 
    …… 
    57136#      doesn't hurt to check since this sometimes defines pthreads too; 
    58137#      also defines -D_REENTRANT) 
     138#      ... -mt is also the pthreads flag for HP/aCC 
    59139# pthread: Linux, etcetera 
    60140# --thread-safe: KAI C++ 
     141# pthread-config: use pthread-config program (for GNU Pth library) 
    61142 
    62143case "${host_cpu}-${host_os}" in 
    …… 
    65146        # On Solaris (at least, for some versions), libc contains stubbed 
    66147        # (non-functional) versions of the pthreads routines, so link-based 
    67         # tests will erroneously succeed.  (We need to link with -pthread or 
     148        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/ 
    68149        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather 
    69150        # a function called by this macro, so we could check for that, but 
    …… 
    71152        # we'll just look for -pthreads and -lpthread first: 
    72153 
    73         acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" 
     154        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" 
    74155        ;; 
    75156esac 
    …… 
    87168                PTHREAD_CFLAGS="$flag" 
    88169                ;; 
     170 
     171                pthread-config) 
     172                AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) 
     173                if test x"$acx_pthread_config" = xno; then continue; fi 
     174                PTHREAD_CFLAGS="`pthread-config --cflags`" 
     175                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" 
     176                ;; 
    89177 
    90178                *) 
    …… 
    134222        CFLAGS="$CFLAGS $PTHREAD_CFLAGS" 
    135223 
    136         # Detect AIX lossage: threads are created detached by default 
    137         # and the JOINABLE attribute has a nonstandard name (UNDETACHED). 
    138         AC_MSG_CHECKING([for joinable pthread attribute]) 
    139         AC_TRY_LINK([#include <pthread.h>], 
    140                     [int attr=PTHREAD_CREATE_JOINABLE;], 
    141                     ok=PTHREAD_CREATE_JOINABLE, ok=unknown) 
    142         if test x"$ok" = xunknown; then 
    143                 AC_TRY_LINK([#include <pthread.h>], 
    144                             [int attr=PTHREAD_CREATE_UNDETACHED;], 
    145                             ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) 
    146         fi 
    147         if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then 
    148                 AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, 
    149                           [Define to the necessary symbol if this constant 
    150                            uses a non-standard name on your system.]) 
    151         fi 
    152         AC_MSG_RESULT(${ok}) 
    153         if test x"$ok" = xunknown; then 
    154                 AC_MSG_WARN([we do not know how to create joinable pthreads]) 
     224        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. 
     225        AC_MSG_CHECKING([for joinable pthread attribute]) 
     226        attr_name=unknown 
     227        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do 
     228            AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;], 
     229                        [attr_name=$attr; break]) 
     230        done 
     231        AC_MSG_RESULT($attr_name) 
     232        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then 
     233            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, 
     234                               [Define to necessary symbol if this constant 
     235                                uses a non-standard name on your system.]) 
    155236        fi 
    156237 
    …… 
    158239        flag=no 
    159240        case "${host_cpu}-${host_os}" in 
    160                 *-aix* | *-freebsd*)    flag="-D_THREAD_SAFE";; 
    161                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; 
     241            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; 
     242            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; 
    162243        esac 
    163244        AC_MSG_RESULT(${flag}) 
    164245        if test "x$flag" != xno; then 
    165                 PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" 
     246            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" 
    166247        fi 
    167248 
    …… 
    169250        CFLAGS="$save_CFLAGS" 
    170251 
    171         # More AIX lossage: must compile with cc_r 
    172         AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) 
     252        # More AIX lossage: must compile with xlc_r or cc_r 
     253        if test x"$GCC" != xyes; then 
     254          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) 
     255        else 
     256          PTHREAD_CC=$CC 
     257        fi 
    173258else 
    174259        PTHREAD_CC="$CC" 

  • gnuradio/trunk/config/gr_set_md_cpu.m4

    r6044 r9336  
    11dnl 
    2 dnl Copyright 2003 Free Software Foundation, Inc. 
     2dnl Copyright 2003,2008 Free Software Foundation, Inc. 
    33dnl  
    44dnl This file is part of GNU Radio 
    …… 
    2929  AC_MSG_CHECKING([for machine dependent speedups]) 
    3030  case "$cf_with_md_cpu" in 
    31    x86 | i[[3-7]]86)    MD_CPU=x86      MD_SUBCPU=x86  ;; 
    32    x86_64)              MD_CPU=x86      MD_SUBCPU=x86_64       ;; 
    33 #  sparc)       MD_CPU=sparc    ;; 
    34    *)           MD_CPU=generic  ;; 
     31   x86 | i[[3-7]]86)    MD_CPU=x86      MD_SUBCPU=x86 ;; 
     32   x86_64)              MD_CPU=x86      MD_SUBCPU=x86_64 ;; 
     33   powerpc*)            MD_CPU=powerpc ;; 
     34   *)                  MD_CPU=generic ;; 
    3535  esac 
    3636  AC_MSG_RESULT($MD_CPU) 
    …… 
    4040  AM_CONDITIONAL(MD_CPU_x86,     test "$MD_CPU" = "x86") 
    4141  AM_CONDITIONAL(MD_SUBCPU_x86_64,  test "$MD_SUBCPU" = "x86_64") 
     42  AM_CONDITIONAL(MD_CPU_powerpc, test "$MD_CPU" = "powerpc") 
    4243  AM_CONDITIONAL(MD_CPU_generic, test "$MD_CPU" = "generic") 
    4344]) 

  • gnuradio/trunk/config/grc_gnuradio_core.m4

    r8206 r9336  
    2929    ]) 
    3030 
    31     dnl Don't do gnuradio-core if omnithread skipped 
     31    dnl Don't do gnuradio-core if gruel or omnithread skipped 
     32    GRC_CHECK_DEPENDENCY(gnuradio-core, gruel) 
    3233    GRC_CHECK_DEPENDENCY(gnuradio-core, omnithread) 
    3334 

  • gnuradio/trunk/config/grc_gnuradio_examples.m4

    r7888 r9336  
    3535        gnuradio-examples/python/digital/Makefile \ 
    3636        gnuradio-examples/python/digital_voice/Makefile \ 
     37        gnuradio-examples/python/mp-sched/Makefile \ 
    3738        gnuradio-examples/python/multi-antenna/Makefile \ 
    3839        gnuradio-examples/python/multi_usrp/Makefile \ 

  • gnuradio/trunk/configure-cell-cross

    r7048 r9336  
    3232cell_root=/mnt/cell-root 
    3333python_version=2.5 
    34 # compiler_includes="-I${cell_root}/usr/include -I${cell_root}/usr/local/include -I${cell_root}/usr/lib/gcc/ppu/4.1.1/include -I${cell_root}/usr/lib/gcc/ppu/4.1.1/include/c++" 
    35 compiler_includes="-I${cell_root}/usr/include" 
     34compiler_includes="-isystem ${cell_root}/usr/include" 
    3635 
    3736$scriptdir/configure                        \ 

  • gnuradio/trunk/configure.ac

    r9314 r9336  
    3030 
    3131dnl add ${prefix}/lib/pkgconfig to the head of the PKG_CONFIG_PATH 
    32 if test [x]${PKG_CONFIG_PATH} = x; then 
     32if test x${PKG_CONFIG_PATH} = x; then 
    3333    PKG_CONFIG_PATH=${prefix}/lib/pkgconfig 
    3434else 
    …… 
    4545fi 
    4646 
    47 GR_X86_64               dnl check for lib64 suffix 
    4847LF_CONFIGURE_CC 
    4948LF_CONFIGURE_CXX 
     49GR_LIB64                dnl check for lib64 suffix after choosing compilers 
    5050 
    5151dnl The three macros above are known to override CXXFLAGS if the user 
    …… 
    101101AC_CHECK_LIB(socket,socket) 
    102102 
    103 dnl check for threads (mandatory) 
     103dnl check for omnithreads (will soon be removed) 
    104104GR_OMNITHREAD 
    105 CFLAGS="${CFLAGS} $PTHREAD_CFLAGS" 
    106 CXXFLAGS="${CXXFLAGS} $PTHREAD_CFLAGS" 
     105CFLAGS="$CFLAGS $PTHREAD_CFLAGS" 
     106CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" 
    107107 
    108108if test x$CXX_FOR_BUILD = x 
    …… 
    205205                [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])]) 
    206206 
     207CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS 
     208AC_SUBST(CPPUNIT_INCLUDES) 
     209 
    207210dnl see if GUILE is installed 
    208211AC_PATH_PROG(GUILE,guile) 
    209212 
    210 CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS 
    211 AC_SUBST(CPPUNIT_INCLUDES) 
    212  
    213 dnl Define where to find boost includes 
    214 dnl defines BOOST_CFLAGS 
    215 GR_REQUIRE_BOOST_INCLUDES 
     213dnl 
     214dnl We require the boost headers, thread lib and date_time lib. 
     215dnl AX_BOOST_BASE finds the headers and the lib dir (-L<foo>) 
     216dnl 
     217dnl calls AC_SUBST(BOOST_CPPFLAGS), AC_SUBST(BOOST_LDFLAGS) and defines HAVE_BOOST 
     218AX_BOOST_BASE([1.35]) 
     219 
     220dnl calls AC_SUBST(BOOST_THREAD_LIB), AC_SUBST(BOOST_CXXFLAGS) and defines HAVE_BOOST_THREAD 
     221AX_BOOST_THREAD 
     222CXXFLAGS="$CXXFLAGS $BOOST_CXXFLAGS"       dnl often picks up a -pthread or something similar 
     223CFLAGS="$CFLAGS $BOOST_CXXFLAGS"           dnl often picks up a -pthread or something similar 
     224 
     225dnl 
     226dnl all the rest of these call AC_SUBST(BOOST_<foo>_LIB) and define HAVE_BOOST_<foo> 
     227dnl 
     228AX_BOOST_DATE_TIME 
     229dnl AX_BOOST_FILESYSTEM 
     230dnl AX_BOOST_IOSTREAMS 
     231dnl AX_BOOST_PROGRAM_OPTIONS 
     232dnl AX_BOOST_REGEX 
     233dnl AX_BOOST_SERIALIZATION 
     234dnl AX_BOOST_SIGNALS 
     235dnl AX_BOOST_SYSTEM 
     236dnl AX_BOOST_TEST_EXEC_MONITOR 
     237dnl AX_BOOST_UNIT_TEST_FRAMEWORK 
     238dnl AX_BOOST_WSERIALIZATION 
     239 
    216240 
    217241dnl If this is being done from a subversion tree, create variables 

  • gnuradio/trunk/dtools/bin/check-tarball-h-files

    r3708 r9336  
    1818  | grep -v ./$path | sort >/tmp/build-h-files 
    1919 
    20 comm -23 /tmp/build-h-files /tmp/tarball-h-files 
     20comm -23 /tmp/build-h-files /tmp/tarball-h-files \ 
     21 | grep -Ev '(GrAtsc|_swig_|limbo|config\.h|std_paths\.h)' 
    2122 
    2223# rm /tmp/tarball-h-files /tmp/build-h-files 

  • gnuradio/trunk/gcell/src/lib/spu/Makefile.am

    r8618 r9336  
    6565 
    6666general_spu_headers = \ 
     67        $(general_srcdir)/gc_spu_macs.h \ 
    6768        $(general_srcdir)/libfft.h 
    6869 

  • gnuradio/trunk/gcell/src/lib/wrapper/Makefile.am

    r8308 r9336  
    6363noinst_HEADERS = \ 
    6464        qa_gcell_general.h \ 
    65         qa_gcell_wrapper.h 
     65        qa_gcell_wrapper.h \ 
     66        qa_gcp_fft_1d_r2.h 
    6667 
    6768 

  • gnuradio/trunk/gnuradio-core/src/lib/Makefile.am

    r8206 r9336  
    3737libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \ 
    3838                                 $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) 
     39 
     40 
    3941libgnuradio_core_la_LIBADD  =           \ 
    4042        filter/libfilter.la             \ 
    …… 
    4850        runtime/libruntime.la           \ 
    4951        $(OMNITHREAD_LA)                \ 
     52        $(GRUEL_LA)                     \ 
    5053        $(FFTW3F_LIBS) 
    5154 

  • gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am

    r8057 r9336  
    118118        sysconfig_x86.cc                \ 
    119119        gr_fir_sysconfig_x86.cc         \ 
    120         gr_cpu.cc                     \ 
     120        gr_cpu_x86.cc                 \ 
    121121        gr_fir_ccc_simd.cc              \ 
    122122        gr_fir_ccc_x86.cc               \ 
    …… 
    167167        qa_ccomplex_dotprod_x86.cc       
    168168 
     169powerpc_CODE = \ 
     170        sysconfig_powerpc.cc \ 
     171        gr_fir_sysconfig_powerpc.cc \ 
     172        gr_cpu_powerpc.cc \ 
     173        gr_fir_fff_altivec.cc \ 
     174        gr_altivec.c \ 
     175        dotprod_fff_altivec.c 
     176 
     177powerpc_qa_CODE = \ 
     178        qa_dotprod_powerpc.cc 
     179 
     180 
    169181# 
    170182# include each <foo>_CODE entry here... 
    …… 
    176188        $(x86_SUBCODE)                  \ 
    177189        $(x86_64_SUBCODE)               \ 
    178         $(x86_qa_CODE) 
     190        $(x86_qa_CODE)                  \ 
     191        $(powerpc_CODE)                 \ 
     192        $(powerpc_qa_CODE) 
    179193 
    180194 
    …… 
    235249endif 
    236250 
     251if MD_CPU_powerpc 
     252libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(powerpc_CODE) 
     253libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(powerpc_qa_CODE) 
     254endif 
     255 
    237256 
    238257grinclude_HEADERS =                     \ 
    …… 
    246265        float_dotprod_x86.h             \ 
    247266        gr_adaptive_fir_ccf.h           \ 
     267        gr_altivec.h                    \ 
    248268        gr_cma_equalizer_cc.h           \ 
    249269        gr_cpu.h                        \ 
    …… 
    252272        gr_filter_delay_fc.h            \ 
    253273        gr_fir_sysconfig_x86.h          \ 
     274        gr_fir_sysconfig_powerpc.h      \ 
    254275        gr_fractional_interpolator_ff.h \ 
    255276        gr_fractional_interpolator_cc.h \ 
    …… 
    273294noinst_HEADERS =                        \ 
    274295        assembly.h                      \ 
     296        dotprod_fff_altivec.h           \ 
    275297        gr_fir_scc_simd.h               \ 
    276298        gr_fir_scc_x86.h                \ 
    …… 
    281303        gr_fir_ccc_simd.h               \ 
    282304        gr_fir_ccc_x86.h                \ 
     305        gr_fir_fff_altivec.h            \ 
    283306        gr_fir_fff_simd.h               \ 
    284307        gr_fir_fff_x86.h                \ 

  • gnuradio/trunk/gnuradio-core/src/lib/filter/gr_cpu.h

    r9176 r9336  
    3434  static bool has_3dnow (); 
    3535  static bool has_3dnowext ();&n