[Commit-gnuradio] r8056 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell gcell/src/apps gcell/src/apps/spu gcell/src/lib gcell/src/lib/spu

[eb]

Author: eb
Date: 2008-03-19 15:03:20 -0600 (Wed, 19 Mar 2008)
New Revision: 8056

Added:
   gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common.spu
   gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/gcell.pc.in
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/
Modified:
   gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
   gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap
   gnuradio/branches/developers/eb/trunk-with-gcell/config/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/benchmark_dma.cc
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/spu/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
Log:
work-in-progress merging gcell into trunk

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-19 18:28:55 UTC (rev 8055)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-19 21:03:20 UTC (rev 8056)
@@ -80,6 +80,14 @@
 MBLOCK_INCLUDES = @mblock_INCLUDES@
 MBLOCK_LA = @mblock_LA@
 
+# How to link the gcell library from inside the tree (the PPU part)
+GCELL_INCLUDES = @gcell_INCLUDES@
+GCELL_LA = @gcell_LA@
+
+# How to link the gcell library from inside the tree (the SPU part)
+GCELL_SPU_INCLUDES = @gcell_spu_INCLUDES@
+GCELL_SPU_LA = @gcell_spu_LA@
+
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)

Copied: gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common.spu 
(from rev 8038, gnuradio/branches/developers/eb/gcell-wip/Makefile.common.spu)
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common.spu        
                        (rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common.spu        
2008-03-19 21:03:20 UTC (rev 8056)
@@ -0,0 +1,43 @@
+# -*- Makefile -*-
+#
+# Copyright 2007,2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio 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.
+# 
+# GNU Radio 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.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+# We're abusing automake, getting it to generate code for two
+# architectures under the same tree.  If you've got a better way to do
+# this, please let us know
+
+AR=spu-ar
+RANLIB=spu-ranlib
+CC=spu-cc
+LD=spu-ld
+
+C_WARNINGS = \
+  -Wall -Wextra -Wstrict-prototypes -Werror-implicit-function-declaration
+
+# Need to override user stuff even though it gives a warning.
+# (Otherwise these contain PPE related info.)
+
+CPPFLAGS=
+LDFLAGS=
+CFLAGS = -O3 -g --std=gnu99 -fstrict-aliasing $(C_WARNINGS)
+# -funroll-all-loops
+

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap  2008-03-19 
18:28:55 UTC (rev 8055)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap  2008-03-19 
21:03:20 UTC (rev 8056)
@@ -26,4 +26,4 @@
 autoconf
 autoheader
 libtoolize --automake
-automake --add-missing
+automake --add-missing -Wno-portability

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/config/Makefile.am 
2008-03-19 18:28:55 UTC (rev 8055)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/Makefile.am 
2008-03-19 21:03:20 UTC (rev 8056)
@@ -31,6 +31,7 @@
        cppunit.m4 \
        gr_boost.m4 \
        grc_build.m4 \
+       grc_gcell.m4 \
        grc_gnuradio_core.m4 \
        grc_gnuradio_examples.m4 \
        grc_gr_atsc.m4 \

Added: gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
                        (rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-19 21:03:20 UTC (rev 8056)
@@ -0,0 +1,73 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GCELL],[
+    GRC_ENABLE(gcell)
+    dnl GRC_WITH(gcell)
+
+    dnl Don't do gcell if omnithread or mblock skipped
+    dnl (The mblock dependency should be refactored, we're just using some 
timing utilities)
+    GRC_CHECK_DEPENDENCY(gcell, omnithread)
+    GRC_CHECK_DEPENDENCY(gcell, mblock)
+
+    dnl If execution gets to here, $passed will be:
+    dnl   with : if the --with code didn't error out
+    dnl   yes  : if the --enable code passed muster and all dependencies are 
met
+    dnl   no   : otherwise
+    if test $passed = yes; then
+        dnl Don't do gcell if we can't find gcc-spu or we're not 
cross-compiling.
+       dnl The cross-compiling check is a bit over-the-top, but we want to 
avoid
+       dnl accidentally triggering this component unless folks know what 
they're doing
+       if test x$cross_compiling != xyes; then
+           passed=no
+       else
+           AC_CHECK_PROG([SPU_GCC_PROG],[spu-gcc],[yes])
+           if test x$SPU_GCC_PROG != xyes; then
+              passed=no
+            fi
+        fi
+    fi
+
+    if test $passed != with; then
+       dnl how and where to find INCLUDES and LA
+       gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include \
+                       -I\${abs_top_srcdir}/gcell/src/lib"
+        gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la"
+       gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/spu-include \
+                       -I\${abs_top_srcdir}/gcell/src/include \
+                       -I\${abs_top_srcdir}/gcell/src/lib"
+       gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
+       AC_SUBST(gcell_spu_INCLUDES)
+       AC_SUBST(gcell_spu_LA)
+    fi
+
+    AC_CONFIG_FILES([ \
+        gcell/Makefile \
+        gcell/gcell.pc \
+        gcell/src/Makefile \
+        gcell/src/apps/Makefile \
+       gcell/src/apps/spu/Makefile \
+        gcell/src/include/Makefile \
+        gcell/src/lib/Makefile \
+        gcell/src/lib/spu/Makefile \
+        gcell/src/spu-include/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gcell)
+])


Property changes on: 
gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
___________________________________________________________________
Name: svn:eol-style
   + LF

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-19 18:28:55 UTC (rev 8055)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-19 21:03:20 UTC (rev 8056)
@@ -269,6 +269,7 @@
 GRC_GR_WXGUI
 GRC_GR_SOUNDER                 dnl this must come after GRC_USRP
 GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
+GRC_GCELL
 GRC_GNURADIO_EXAMPLES          dnl must come last
 
 # Each component is now either to be built, was skipped, will be


Property changes on: gnuradio/branches/developers/eb/trunk-with-gcell/gcell
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
gcell.pc


Added: gnuradio/branches/developers/eb/trunk-with-gcell/gcell/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/Makefile.am          
                (rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/Makefile.am  
2008-03-19 21:03:20 UTC (rev 8056)
@@ -0,0 +1,26 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio 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.
+# 
+# GNU Radio 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.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA =


Property changes on: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Added: gnuradio/branches/developers/eb/trunk-with-gcell/gcell/gcell.pc.in
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/gcell.pc.in          
                (rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/gcell.pc.in  
2008-03-19 21:03:20 UTC (rev 8056)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gcell
+Description: The GNU Radio SPE scheduler and RPC mechanism
+Requires: gnuradio-omnithread mblock
+Version: @VERSION@
+Libs: -L${libdir} -lgcell
+Cflags: -I${includedir} @DEFINES@

Copied: gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src (from rev 
8038, gnuradio/branches/developers/eb/gcell-wip/src)

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/apps/Makefile.am      
2008-03-18 05:11:55 UTC (rev 8038)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/Makefile.am 
2008-03-19 21:03:20 UTC (rev 8056)
@@ -22,14 +22,15 @@
 
 SUBDIRS = spu .
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) \
+       $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
+
+GCELL_QA_LA = $(top_builddir)/gcell/src/lib/libgcell-qa.la
+
 TESTS = test_all
 
-LIBGCELL    = $(top_builddir)/src/lib/libgcell.la
-LIBGCELL_QA = $(top_builddir)/src/lib/libgcell-qa.la
 
-
 bin_PROGRAMS = \
        test_all \
        benchmark_dma \
@@ -37,10 +38,10 @@
 
 
 test_all_SOURCES = test_all.cc
-test_all_LDADD = $(LIBGCELL_QA) $(LIBGCELL)
+test_all_LDADD = $(GCELL_QA_LA) $(GCELL_LA)
 
 benchmark_dma_SOURCES = benchmark_dma.cc
-benchmark_dma_LDADD = spu/benchmark_procs $(LIBGCELL) -lmblock
+benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA)
 
 benchmark_nop_SOURCES = benchmark_nop.cc
-benchmark_nop_LDADD = spu/benchmark_procs $(LIBGCELL) -lmblock
+benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA) $(MBLOCK_LA)

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/benchmark_dma.cc
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/apps/benchmark_dma.cc 
2008-03-18 05:11:55 UTC (rev 8038)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/benchmark_dma.cc
    2008-03-19 21:03:20 UTC (rev 8056)
@@ -120,8 +120,8 @@
   gc_jm_options opts;
   opts.program_handle = &benchmark_procs;
   opts.nspes = nspes;
-  opts.enable_logging = true;
-  opts.log2_nlog_entries = 13;
+  //opts.enable_logging = true;
+  //opts.log2_nlog_entries = 13;
   gc_job_manager *mgr = gc_make_job_manager(&opts);
 
   if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == 
GCP_UNKNOWN_PROC){

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/spu/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/apps/spu/Makefile.am  
2008-03-18 05:11:55 UTC (rev 8038)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/apps/spu/Makefile.am 
    2008-03-19 21:03:20 UTC (rev 8056)
@@ -21,14 +21,12 @@
 
 include $(top_srcdir)/Makefile.common.spu
 
-AM_CPPFLAGS = $(SPU_DEFINES_AND_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
+AM_CPPFLAGS = $(GCELL_SPU_INCLUDES)
 
-LIBGCELL_SPU = ../../lib/spu/libgcell_spu.a
-
 # SPU executables
 
 noinst_PROGRAMS = \
        benchmark_procs
 
 benchmark_procs_SOURCES = benchmark_procs.c
-benchmark_procs_LDADD = $(LIBGCELL_SPU)
+benchmark_procs_LDADD = $(GCELL_SPU_LA)

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/Makefile.am       
2008-03-18 05:11:55 UTC (rev 8038)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am  
2008-03-19 21:03:20 UTC (rev 8056)
@@ -22,9 +22,13 @@
 
 SUBDIRS = spu .
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) 
$(IBM_PPU_SYNC_INCLUDES)
+IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/ppu_source
 
 
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) 
$(CPPUNIT_INCLUDES) \
+       $(GCELL_INCLUDES) $(IBM_PPU_SYNC_INCLUDES) $(WITH_INCLUDES)
+
+
 lib_LTLIBRARIES = libgcell.la libgcell-qa.la
 
 libgcell_la_SOURCES = \
@@ -36,7 +40,7 @@
 
 libgcell_la_LIBADD = \
        -lspe2 \
-       $(GR_OMNITHREAD_LIBS)
+       $(OMNITHREAD_LA)
 
 libgcell_qa_la_SOURCES = \
        qa_lib.cc \

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip/src/lib/spu/Makefile.am   
2008-03-18 05:11:55 UTC (rev 8038)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am  
    2008-03-19 21:03:20 UTC (rev 8056)
@@ -20,8 +20,10 @@
 
 include $(top_srcdir)/Makefile.common.spu
 
-AM_CPPFLAGS = $(SPU_DEFINES_AND_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
+IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/spu_source
 
+AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
+
 # library of SPU code
 
 noinst_LIBRARIES = \