From 06e7a0313a09ee812061d855a47206ed303eac7f Mon Sep 17 00:00:00 2001 From: eb Date: Mon, 22 Dec 2008 04:24:34 +0000 Subject: [PATCH] Merged eb/gcell-wip2 rev 10130:10152 into trunk. This makes several gcell related changes. {{{ The first two are INCOMPATIBLE CHANGES: (1) The gcell portion of the code base was reorganized. As part of that reorganization, the paths to the include files changed. They are now installed under PREFIX/include/gcell instead of directly in PREFIX/include. This means that all includes of the form: #include should be changed to #include (2a) If you are directly using gcell-embedspu-libtool or the $(GCELL_EMBEDSPU_LIBTOOL) variable in your Makefiles, the order of the two command line arguments was switched. It's now $(GCELL_EMBEDSPU_LIBTOOL) input_file output_file or equivalently $(GCELL_EMBEDSPU_LIBTOOL) $< $@ gcell-embedspu-libtool allows you to convert an SPE executable into something that libtool will allow you add to a host shared library. (2b) The name of the symbol created by gcell-embedspu-libtool is now suffixed with _spx (SPE executable) to reduce the probability of name collision. If you have lines like this: extern spe_program_handle_t gcell_all; in your code, you may have to change them to: extern spe_program_handle_t gcell_all_spx; The following changes are enhancements and shouldn't break any existing code: (3) We now install two new pkg-config files, gcell.pc and gcell_spu.pc. These can be used to assist in building gcell code that lives outside the GNU Radio repository. The first gives the include and library paths for the PPE host code, the second is the same info for the the SPE code. There is also a new .m4 macro, GR_GCELL, contained in config/gr_gcell.m4, that uses PKG_CONFIG_MODULES to fish out the relevant variables. If you've got standalone code that uses gcell, you'll probably want to copy this macro (along with our version of pkg.m4) to your tree and use it. It sets the following variables: GCELL_CFLAGS GCELL_CPPFLAGS GCELL_INCLUDEDIR GCELL_LIBS GCELL_SPU_CFLAGS GCELL_SPU_CPPFLAGS GCELL_SPU_INCLUDEDIR GCELL_SPU_LIBS GCELL_EMBEDSPU_LIBTOOL (4) make -j now works in the gcell directory (fixes ticket:242). }}} git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10153 221aa14e-8319-0410-a670-987f0aec2ac5 --- Makefile.common | 2 +- config/Makefile.am | 1 + config/gr_gcell.m4 | 36 +++++++++++ config/gr_standalone.m4 | 20 +++++- config/grc_gcell.m4 | 42 +++++------- config/grc_gr_gcell.m4 | 6 ++ config/lf_warnings.m4 | 2 +- config/pkg.m4 | 19 +++++- gcell/Makefile.am | 8 ++- gcell/{src => }/apps/Makefile.am | 2 +- gcell/{src => }/apps/benchmark_dma.cc | 2 +- gcell/{src => }/apps/benchmark_nop.cc | 2 +- gcell/{src => }/apps/gen_script.py | 0 gcell/{src => }/apps/plot_speedup.py | 0 gcell/{src => }/apps/results-071223 | 0 gcell/{src => }/apps/split_and_avg_results.py | 0 gcell/{src => }/apps/spu/Makefile.am | 0 gcell/{src => }/apps/spu/benchmark_procs.c | 4 +- gcell/{src => }/apps/test_all.cc | 4 +- gcell/gcell.pc.in | 3 +- gcell/gcell_spu.pc.in | 11 ++++ gcell/{src => }/ibm/Makefile.am | 0 gcell/{src => }/ibm/README | 0 gcell/{src => }/ibm/sync/ppu_source/atomic.h | 0 .../ibm/sync/ppu_source/atomic_add.h | 0 .../ibm/sync/ppu_source/atomic_add_return.h | 0 .../ibm/sync/ppu_source/atomic_dec.h | 0 .../ibm/sync/ppu_source/atomic_dec_and_test.h | 0 .../sync/ppu_source/atomic_dec_if_positive.h | 0 .../ibm/sync/ppu_source/atomic_dec_return.h | 0 .../ibm/sync/ppu_source/atomic_inc.h | 0 .../ibm/sync/ppu_source/atomic_inc_return.h | 0 .../ibm/sync/ppu_source/atomic_read.h | 0 .../ibm/sync/ppu_source/atomic_set.h | 0 .../ibm/sync/ppu_source/atomic_sub.h | 0 .../ibm/sync/ppu_source/atomic_sub_and_test.h | 0 .../ibm/sync/ppu_source/atomic_sub_return.h | 0 .../{src => }/ibm/sync/ppu_source/complete.h | 0 .../ibm/sync/ppu_source/complete_all.h | 0 .../ibm/sync/ppu_source/completion.h | 0 gcell/{src => }/ibm/sync/ppu_source/cond.h | 0 .../ibm/sync/ppu_source/cond_broadcast.h | 0 .../{src => }/ibm/sync/ppu_source/cond_init.h | 0 .../ibm/sync/ppu_source/cond_signal.h | 0 .../{src => }/ibm/sync/ppu_source/cond_wait.h | 0 .../ibm/sync/ppu_source/init_completion.h | 0 gcell/{src => }/ibm/sync/ppu_source/libsync.h | 0 gcell/{src => }/ibm/sync/ppu_source/mutex.h | 0 .../ibm/sync/ppu_source/mutex_init.h | 0 .../ibm/sync/ppu_source/mutex_lock.h | 0 .../ibm/sync/ppu_source/mutex_trylock.h | 0 .../ibm/sync/ppu_source/mutex_unlock.h | 0 .../ibm/sync/ppu_source/pdt_libsync.xml | 0 .../sync/ppu_source/pdt_libsync_config.xml | 0 .../ibm/sync/ppu_source/sync_utils.h | 0 .../ibm/sync/ppu_source/trace_libsync.h | 0 .../ibm/sync/ppu_source/wait_for_completion.h | 0 gcell/{src => }/ibm/sync/spu_source/atomic.h | 0 .../ibm/sync/spu_source/atomic_add.h | 0 .../ibm/sync/spu_source/atomic_add_return.h | 0 .../ibm/sync/spu_source/atomic_dec.h | 0 .../ibm/sync/spu_source/atomic_dec_and_test.h | 0 .../sync/spu_source/atomic_dec_if_positive.h | 0 .../ibm/sync/spu_source/atomic_dec_return.h | 0 .../ibm/sync/spu_source/atomic_inc.h | 0 .../ibm/sync/spu_source/atomic_inc_return.h | 0 .../ibm/sync/spu_source/atomic_read.h | 0 .../ibm/sync/spu_source/atomic_set.h | 0 .../ibm/sync/spu_source/atomic_sub.h | 0 .../ibm/sync/spu_source/atomic_sub_and_test.h | 0 .../ibm/sync/spu_source/atomic_sub_return.h | 0 .../{src => }/ibm/sync/spu_source/complete.h | 0 .../ibm/sync/spu_source/complete_all.h | 0 .../ibm/sync/spu_source/completion.h | 0 gcell/{src => }/ibm/sync/spu_source/cond.h | 0 .../ibm/sync/spu_source/cond_broadcast.h | 0 .../{src => }/ibm/sync/spu_source/cond_init.h | 0 .../ibm/sync/spu_source/cond_signal.h | 0 .../{src => }/ibm/sync/spu_source/cond_wait.h | 0 .../ibm/sync/spu_source/init_completion.h | 0 gcell/{src => }/ibm/sync/spu_source/libsync.h | 0 gcell/{src => }/ibm/sync/spu_source/mutex.h | 0 .../ibm/sync/spu_source/mutex_init.h | 0 .../ibm/sync/spu_source/mutex_lock.h | 0 .../ibm/sync/spu_source/mutex_trylock.h | 0 .../ibm/sync/spu_source/mutex_unlock.h | 0 .../{src => }/ibm/sync/spu_source/read_lock.h | 0 .../ibm/sync/spu_source/read_trylock.h | 0 .../ibm/sync/spu_source/read_unlock.h | 0 .../ibm/sync/spu_source/rwlock_init.h | 0 .../{src => }/ibm/sync/spu_source/sync_irq.h | 0 .../ibm/sync/spu_source/sync_utils.h | 0 .../ibm/sync/spu_source/trace_libsync.h | 0 .../ibm/sync/spu_source/wait_for_completion.h | 0 .../ibm/sync/spu_source/write_lock.h | 0 .../ibm/sync/spu_source/write_trylock.h | 0 .../ibm/sync/spu_source/write_unlock.h | 0 gcell/{src => include}/Makefile.am | 5 +- .../include => include/gcell}/Makefile.am | 3 + .../{src/include => include/gcell}/compiler.h | 6 +- .../gcell}/gc_aligned_alloc.h | 0 .../include => include/gcell}/gc_atomic.h | 6 +- .../{src/include => include/gcell}/gc_cdefs.h | 6 +- .../gcell}/gc_declare_proc.h | 8 +-- .../include => include/gcell}/gc_jd_queue.h | 8 +-- .../gcell}/gc_jd_queue_data.h | 10 +-- .../include => include/gcell}/gc_jd_stack.h | 10 +-- .../include => include/gcell}/gc_job_desc.h | 10 +-- .../gcell}/gc_job_desc_private.h | 6 +- .../gcell}/gc_job_manager.h | 0 .../include => include/gcell}/gc_logging.h | 8 +-- .../{src/include => include/gcell}/gc_mbox.h | 6 +- .../include => include/gcell}/gc_spu_args.h | 10 +-- .../{src/include => include/gcell}/gc_types.h | 10 +-- .../wrapper => include/gcell}/gcp_fft_1d_r2.h | 2 +- .../gcell}/memory_barrier.h | 14 ++-- .../include => include/gcell}/spu/Makefile.am | 6 +- .../general => include/gcell}/spu/fft_1d.h | 0 .../general => include/gcell}/spu/fft_1d_r2.h | 0 .../include => include/gcell}/spu/gc_delay.h | 6 +- .../gcell}/spu/gc_jd_queue.h | 8 +-- .../include => include/gcell}/spu/gc_random.h | 6 +- .../gcell}/spu/gc_spu_macs.h | 2 +- .../general => include/gcell}/spu/libfft.h | 0 gcell/{src => }/lib/Makefile.am | 0 gcell/{src => }/lib/general/Makefile.am | 0 gcell/{src => }/lib/general/spu/fft_1d_r2.c | 4 +- gcell/{src => }/lib/general/spu/memset.S | 2 +- gcell/{src => }/lib/general/spu/qa_memset.c | 6 +- gcell/{src => }/lib/runtime/Makefile.am | 8 +-- .../{src => }/lib/runtime/gc_aligned_alloc.cc | 2 +- .../lib/runtime/gc_client_thread_info.h | 0 gcell/{src => }/lib/runtime/gc_jd_queue.c | 4 +- gcell/{src => }/lib/runtime/gc_jd_stack.c | 64 ++++++++++++++++++- gcell/{src => }/lib/runtime/gc_job_manager.cc | 2 +- .../lib/runtime/gc_job_manager_impl.cc | 10 +-- .../lib/runtime/gc_job_manager_impl.h | 8 +-- .../lib/runtime/gc_proc_def_utils.cc | 2 +- .../{src => }/lib/runtime/gc_proc_def_utils.h | 2 +- gcell/lib/runtime/gcell-embedspu-libtool | 40 ++++++++++++ .../{src => }/lib/runtime/qa_gcell_runtime.cc | 0 .../{src => }/lib/runtime/qa_gcell_runtime.h | 0 gcell/{src => }/lib/runtime/qa_jd_queue.cc | 2 +- gcell/{src => }/lib/runtime/qa_jd_queue.h | 0 gcell/{src => }/lib/runtime/qa_jd_stack.cc | 2 +- gcell/{src => }/lib/runtime/qa_jd_stack.h | 0 gcell/{src => }/lib/runtime/qa_job_manager.cc | 34 +++++----- gcell/{src => }/lib/runtime/qa_job_manager.h | 0 gcell/{src => }/lib/runtime/spu/gc_delay.c | 4 +- gcell/{src => }/lib/runtime/spu/gc_logging.c | 4 +- gcell/{src => }/lib/runtime/spu/gc_main.c | 15 +++-- gcell/{src => }/lib/runtime/spu/gc_random.c | 2 +- .../{src => }/lib/runtime/spu/gc_spu_config.h | 8 +-- .../lib/runtime/spu/gc_spu_jd_queue.c | 6 +- .../lib/runtime/spu/gcell_runtime_qa.c | 4 +- gcell/{src => }/lib/runtime/spu/spu_buffers.c | 4 +- gcell/{src => }/lib/runtime/spu/spu_buffers.h | 0 gcell/{src => }/lib/spu/Makefile.am | 24 ++++--- gcell/{src => }/lib/wrapper/Makefile.am | 9 +-- gcell/{src => }/lib/wrapper/gcp_fft_1d_r2.cc | 2 +- .../{src => }/lib/wrapper/qa_gcell_general.cc | 6 +- .../{src => }/lib/wrapper/qa_gcell_general.h | 0 .../{src => }/lib/wrapper/qa_gcell_wrapper.cc | 0 .../{src => }/lib/wrapper/qa_gcell_wrapper.h | 0 .../{src => }/lib/wrapper/qa_gcp_fft_1d_r2.cc | 8 +-- .../{src => }/lib/wrapper/qa_gcp_fft_1d_r2.h | 2 +- .../{src => }/lib/wrapper/spu/gcs_fft_1d_r2.c | 4 +- gcell/src/lib/runtime/gcell-embedspu-libtool | 29 --------- gr-gcell/src/gcell.i | 2 +- gr-gcell/src/gcell_fft_vcc.cc | 6 +- gr-gcell/src/qa_fft.py | 2 +- 171 files changed, 406 insertions(+), 247 deletions(-) create mode 100644 config/gr_gcell.m4 rename gcell/{src => }/apps/Makefile.am (95%) rename gcell/{src => }/apps/benchmark_dma.cc (99%) rename gcell/{src => }/apps/benchmark_nop.cc (99%) rename gcell/{src => }/apps/gen_script.py (100%) rename gcell/{src => }/apps/plot_speedup.py (100%) rename gcell/{src => }/apps/results-071223 (100%) rename gcell/{src => }/apps/split_and_avg_results.py (100%) rename gcell/{src => }/apps/spu/Makefile.am (100%) rename gcell/{src => }/apps/spu/benchmark_procs.c (96%) rename gcell/{src => }/apps/test_all.cc (92%) create mode 100644 gcell/gcell_spu.pc.in rename gcell/{src => }/ibm/Makefile.am (100%) rename gcell/{src => }/ibm/README (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_add.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_add_return.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_dec.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_dec_and_test.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_dec_if_positive.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_dec_return.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_inc.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_inc_return.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_read.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_set.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_sub.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_sub_and_test.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/atomic_sub_return.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/complete.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/complete_all.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/completion.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/cond.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/cond_broadcast.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/cond_init.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/cond_signal.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/cond_wait.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/init_completion.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/libsync.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/mutex.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/mutex_init.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/mutex_lock.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/mutex_trylock.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/mutex_unlock.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/pdt_libsync.xml (100%) rename gcell/{src => }/ibm/sync/ppu_source/pdt_libsync_config.xml (100%) rename gcell/{src => }/ibm/sync/ppu_source/sync_utils.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/trace_libsync.h (100%) rename gcell/{src => }/ibm/sync/ppu_source/wait_for_completion.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_add.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_add_return.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_dec.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_dec_and_test.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_dec_if_positive.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_dec_return.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_inc.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_inc_return.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_read.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_set.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_sub.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_sub_and_test.h (100%) rename gcell/{src => }/ibm/sync/spu_source/atomic_sub_return.h (100%) rename gcell/{src => }/ibm/sync/spu_source/complete.h (100%) rename gcell/{src => }/ibm/sync/spu_source/complete_all.h (100%) rename gcell/{src => }/ibm/sync/spu_source/completion.h (100%) rename gcell/{src => }/ibm/sync/spu_source/cond.h (100%) rename gcell/{src => }/ibm/sync/spu_source/cond_broadcast.h (100%) rename gcell/{src => }/ibm/sync/spu_source/cond_init.h (100%) rename gcell/{src => }/ibm/sync/spu_source/cond_signal.h (100%) rename gcell/{src => }/ibm/sync/spu_source/cond_wait.h (100%) rename gcell/{src => }/ibm/sync/spu_source/init_completion.h (100%) rename gcell/{src => }/ibm/sync/spu_source/libsync.h (100%) rename gcell/{src => }/ibm/sync/spu_source/mutex.h (100%) rename gcell/{src => }/ibm/sync/spu_source/mutex_init.h (100%) rename gcell/{src => }/ibm/sync/spu_source/mutex_lock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/mutex_trylock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/mutex_unlock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/read_lock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/read_trylock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/read_unlock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/rwlock_init.h (100%) rename gcell/{src => }/ibm/sync/spu_source/sync_irq.h (100%) rename gcell/{src => }/ibm/sync/spu_source/sync_utils.h (100%) rename gcell/{src => }/ibm/sync/spu_source/trace_libsync.h (100%) rename gcell/{src => }/ibm/sync/spu_source/wait_for_completion.h (100%) rename gcell/{src => }/ibm/sync/spu_source/write_lock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/write_trylock.h (100%) rename gcell/{src => }/ibm/sync/spu_source/write_unlock.h (100%) rename gcell/{src => include}/Makefile.am (90%) rename gcell/{src/include => include/gcell}/Makefile.am (94%) rename gcell/{src/include => include/gcell}/compiler.h (92%) rename gcell/{src/lib/runtime => include/gcell}/gc_aligned_alloc.h (100%) rename gcell/{src/include => include/gcell}/gc_atomic.h (88%) rename gcell/{src/include => include/gcell}/gc_cdefs.h (90%) rename gcell/{src/include => include/gcell}/gc_declare_proc.h (91%) rename gcell/{src/include => include/gcell}/gc_jd_queue.h (88%) rename gcell/{src/include => include/gcell}/gc_jd_queue_data.h (87%) rename gcell/{src/include => include/gcell}/gc_jd_stack.h (90%) rename gcell/{src/include => include/gcell}/gc_job_desc.h (96%) rename gcell/{src/include => include/gcell}/gc_job_desc_private.h (89%) rename gcell/{src/lib/runtime => include/gcell}/gc_job_manager.h (100%) rename gcell/{src/include => include/gcell}/gc_logging.h (96%) rename gcell/{src/include => include/gcell}/gc_mbox.h (94%) rename gcell/{src/include => include/gcell}/gc_spu_args.h (92%) rename gcell/{src/include => include/gcell}/gc_types.h (89%) rename gcell/{src/lib/wrapper => include/gcell}/gcp_fft_1d_r2.h (98%) rename gcell/{src/include => include/gcell}/memory_barrier.h (88%) rename gcell/{src/include => include/gcell}/spu/Makefile.am (92%) rename gcell/{src/lib/general => include/gcell}/spu/fft_1d.h (100%) rename gcell/{src/lib/general => include/gcell}/spu/fft_1d_r2.h (100%) rename gcell/{src/include => include/gcell}/spu/gc_delay.h (88%) rename gcell/{src/include => include/gcell}/spu/gc_jd_queue.h (90%) rename gcell/{src/include => include/gcell}/spu/gc_random.h (89%) rename gcell/{src/lib/general => include/gcell}/spu/gc_spu_macs.h (99%) rename gcell/{src/lib/general => include/gcell}/spu/libfft.h (100%) rename gcell/{src => }/lib/Makefile.am (100%) rename gcell/{src => }/lib/general/Makefile.am (100%) rename gcell/{src => }/lib/general/spu/fft_1d_r2.c (94%) rename gcell/{src => }/lib/general/spu/memset.S (99%) rename gcell/{src => }/lib/general/spu/qa_memset.c (99%) rename gcell/{src => }/lib/runtime/Makefile.am (91%) rename gcell/{src => }/lib/runtime/gc_aligned_alloc.cc (97%) rename gcell/{src => }/lib/runtime/gc_client_thread_info.h (100%) rename gcell/{src => }/lib/runtime/gc_jd_queue.c (96%) rename gcell/{src => }/lib/runtime/gc_jd_stack.c (60%) rename gcell/{src => }/lib/runtime/gc_job_manager.cc (99%) rename gcell/{src => }/lib/runtime/gc_job_manager_impl.cc (99%) rename gcell/{src => }/lib/runtime/gc_job_manager_impl.h (98%) rename gcell/{src => }/lib/runtime/gc_proc_def_utils.cc (98%) rename gcell/{src => }/lib/runtime/gc_proc_def_utils.h (97%) create mode 100755 gcell/lib/runtime/gcell-embedspu-libtool rename gcell/{src => }/lib/runtime/qa_gcell_runtime.cc (100%) rename gcell/{src => }/lib/runtime/qa_gcell_runtime.h (100%) rename gcell/{src => }/lib/runtime/qa_jd_queue.cc (98%) rename gcell/{src => }/lib/runtime/qa_jd_queue.h (100%) rename gcell/{src => }/lib/runtime/qa_jd_stack.cc (98%) rename gcell/{src => }/lib/runtime/qa_jd_stack.h (100%) rename gcell/{src => }/lib/runtime/qa_job_manager.cc (98%) rename gcell/{src => }/lib/runtime/qa_job_manager.h (100%) rename gcell/{src => }/lib/runtime/spu/gc_delay.c (96%) rename gcell/{src => }/lib/runtime/spu/gc_logging.c (97%) rename gcell/{src => }/lib/runtime/spu/gc_main.c (98%) rename gcell/{src => }/lib/runtime/spu/gc_random.c (97%) rename gcell/{src => }/lib/runtime/spu/gc_spu_config.h (88%) rename gcell/{src => }/lib/runtime/spu/gc_spu_jd_queue.c (96%) rename gcell/{src => }/lib/runtime/spu/gcell_runtime_qa.c (97%) rename gcell/{src => }/lib/runtime/spu/spu_buffers.c (95%) rename gcell/{src => }/lib/runtime/spu/spu_buffers.h (100%) rename gcell/{src => }/lib/spu/Makefile.am (89%) rename gcell/{src => }/lib/wrapper/Makefile.am (91%) rename gcell/{src => }/lib/wrapper/gcp_fft_1d_r2.cc (99%) rename gcell/{src => }/lib/wrapper/qa_gcell_general.cc (95%) rename gcell/{src => }/lib/wrapper/qa_gcell_general.h (100%) rename gcell/{src => }/lib/wrapper/qa_gcell_wrapper.cc (100%) rename gcell/{src => }/lib/wrapper/qa_gcell_wrapper.h (100%) rename gcell/{src => }/lib/wrapper/qa_gcp_fft_1d_r2.cc (98%) rename gcell/{src => }/lib/wrapper/qa_gcp_fft_1d_r2.h (97%) rename gcell/{src => }/lib/wrapper/spu/gcs_fft_1d_r2.c (97%) delete mode 100755 gcell/src/lib/runtime/gcell-embedspu-libtool diff --git a/Makefile.common b/Makefile.common index fabe8eb2..f7c88b0d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -101,7 +101,7 @@ GCELL_SPU_INCLUDES = @gcell_spu_INCLUDES@ GCELL_SPU_LA = @gcell_spu_LA@ # libtool aware wrapper for ppu-embedspu -GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/src/lib/runtime/gcell-embedspu-libtool +GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libtool # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/config/Makefile.am b/config/Makefile.am index bdc79a5f..22de44b9 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -79,6 +79,7 @@ m4macros = \ grc_gr_msdd6000.m4 \ gr_doxygen.m4 \ gr_fortran.m4 \ + gr_gcell.m4 \ gr_gprof.m4 \ gr_lib64.m4 \ gr_libgnuradio_core_extra_ldflags.m4 \ diff --git a/config/gr_gcell.m4 b/config/gr_gcell.m4 new file mode 100644 index 00000000..0b8b9780 --- /dev/null +++ b/config/gr_gcell.m4 @@ -0,0 +1,36 @@ +# +# 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. +# + +AC_DEFUN([GR_GCELL],[ + passed=yes + PKG_CHECK_MODULES(GCELL, gcell >= 3.1, [], + [passed=no; AC_MSG_RESULT([gcell not found])]) + PKG_CHECK_MODULES(GCELL_SPU, gcell_spu >= 3.1, [], + [passed=no; AC_MSG_RESULT([gcell_spu not found])]) + + GCELL_EMBEDSPU_LIBTOOL= + if test $passed = yes; then + GCELL_EMBEDSPU_LIBTOOL=`$PKG_CONFIG --variable=gcell_embedspu_libtool gcell 2>/dev/null` + AC_DEFINE(HAVE_GCELL,[1],[Define if you have gcell installed]) + fi + AC_SUBST([GCELL_EMBEDSPU_LIBTOOL]) + + AM_CONDITIONAL([HAVE_GCELL], [test "$passed" = "yes"]) +]) diff --git a/config/gr_standalone.m4 b/config/gr_standalone.m4 index 09744542..370f7fb0 100644 --- a/config/gr_standalone.m4 +++ b/config/gr_standalone.m4 @@ -70,6 +70,17 @@ m4_define([GR_STANDALONE], GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag GR_SCRIPTING dnl Locate python, SWIG, etc + AC_ARG_WITH([python], + AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]), + [case "$with_python" in + (no | yes) ;; + (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;; + esac], + [with_python=yes]) + + AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes]) + + dnl Set the c++ compiler that we use for the build system when cross compiling if test "x$CXX_FOR_BUILD" = x then @@ -93,6 +104,13 @@ m4_define([GR_STANDALONE], AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) + dnl Define where to look for cppunit includes and libs + dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS + dnl Try using pkg-config first, then fall back to cppunit-config. + PKG_CHECK_EXISTS(cppunit, + [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)], + [AM_PATH_CPPUNIT([1.9.14],[], + [AC_MSG_ERROR([GNU Radio requires cppunit. Stop])])]) + PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) - LIBS="$LIBS $GNURADIO_CORE_LIBS" ]) diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4 index 38854b95..ff289d1a 100644 --- a/config/grc_gcell.m4 +++ b/config/grc_gcell.m4 @@ -50,40 +50,30 @@ AC_DEFUN([GRC_GCELL],[ 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/runtime \ - -I\${abs_top_srcdir}/gcell/src/lib/general \ - -I\${abs_top_srcdir}/gcell/src/lib/wrapper" - gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la" - gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include/spu \ - -I\${abs_top_srcdir}/gcell/src/include \ - -I\${abs_top_srcdir}/gcell/src/lib/runtime/spu \ - -I\${abs_top_srcdir}/gcell/src/lib/general/spu \ - -I\${abs_top_srcdir}/gcell/src/lib/wrapper/spu" - gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a" + gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include" + gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la" + gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include" + gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a" AC_SUBST(gcell_spu_INCLUDES) AC_SUBST(gcell_spu_LA) - dnl kludge up initial swig dependency files - AC_CONFIG_COMMANDS([swig_gcell_deps], [ - touch gr-gcell/src/gcell.d - ]) fi AC_CONFIG_FILES([ \ gcell/Makefile \ gcell/gcell.pc \ - gcell/src/Makefile \ - gcell/src/include/Makefile \ - gcell/src/include/spu/Makefile \ - gcell/src/lib/Makefile \ - gcell/src/lib/spu/Makefile \ - gcell/src/lib/general/Makefile \ - gcell/src/lib/wrapper/Makefile \ - gcell/src/lib/runtime/Makefile \ - gcell/src/apps/Makefile \ - gcell/src/apps/spu/Makefile \ - gcell/src/ibm/Makefile \ + gcell/gcell_spu.pc \ + gcell/include/Makefile \ + gcell/include/gcell/Makefile \ + gcell/include/gcell/spu/Makefile \ + gcell/lib/Makefile \ + gcell/lib/spu/Makefile \ + gcell/lib/general/Makefile \ + gcell/lib/wrapper/Makefile \ + gcell/lib/runtime/Makefile \ + gcell/apps/Makefile \ + gcell/apps/spu/Makefile \ + gcell/ibm/Makefile \ ]) GRC_BUILD_CONDITIONAL(gcell) diff --git a/config/grc_gr_gcell.m4 b/config/grc_gr_gcell.m4 index d425337e..191afdc0 100644 --- a/config/grc_gr_gcell.m4 +++ b/config/grc_gr_gcell.m4 @@ -31,6 +31,12 @@ AC_DEFUN([GRC_GR_GCELL],[ gr-gcell/src/run_tests \ ]) + dnl kludge up initial swig dependency files + AC_CONFIG_COMMANDS([swig_gcell_deps], [ + touch gr-gcell/src/gcell.d + ]) + + GRC_BUILD_CONDITIONAL(gr-gcell,[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_gcell], [chmod +x gr-gcell/src/run_tests]) diff --git a/config/lf_warnings.m4 b/config/lf_warnings.m4 index e1828801..7bb8b60f 100644 --- a/config/lf_warnings.m4 +++ b/config/lf_warnings.m4 @@ -115,7 +115,7 @@ AC_DEFUN([LF_SET_WARNINGS],[ dnl Warnings for the two main compilers dnl add -Wextra when you're got time to fix a bunch of them ;-) - cc_warning_flags="-Wall $lf_warnings_as_errors" + cc_warning_flags="-Wall -Werror-implicit-function-declaration $lf_warnings_as_errors" cxx_warning_flags="-Wall -Woverloaded-virtual $lf_warnings_as_errors" if test -n "${CC}" then diff --git a/config/pkg.m4 b/config/pkg.m4 index 80bdfed4..2d4d9610 100644 --- a/config/pkg.m4 +++ b/config/pkg.m4 @@ -111,8 +111,11 @@ fi[]dnl # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac # # -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_DEFUN([PKG_CHECK_MODULES],[ +AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl + AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl @@ -124,7 +127,17 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) if test x$cross_compiling = xyes then - _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2]) + dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2]) + _PKG_CONFIG([$1][_LIBS], [libs --static], [$2]) + dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong filesystem root + _pkg_tmp= + for flag in [$]pkg_cv_[$1][_LIBS]; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_[$1][_LIBS]="$_pkg_tmp" else _PKG_CONFIG([$1][_LIBS], [libs --static], [$2]) fi diff --git a/gcell/Makefile.am b/gcell/Makefile.am index 959d3563..fe222e5f 100644 --- a/gcell/Makefile.am +++ b/gcell/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,7 +20,9 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = src +SUBDIRS = include lib apps ibm pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = +pkgconfig_DATA = \ + gcell.pc \ + gcell_spu.pc diff --git a/gcell/src/apps/Makefile.am b/gcell/apps/Makefile.am similarity index 95% rename from gcell/src/apps/Makefile.am rename to gcell/apps/Makefile.am index 7dd69565..e6768523 100644 --- a/gcell/src/apps/Makefile.am +++ b/gcell/apps/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \ $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -GCELL_QA_LA = $(top_builddir)/gcell/src/lib/libgcell-qa.la +GCELL_QA_LA = $(top_builddir)/gcell/lib/libgcell-qa.la TESTS = test_all diff --git a/gcell/src/apps/benchmark_dma.cc b/gcell/apps/benchmark_dma.cc similarity index 99% rename from gcell/src/apps/benchmark_dma.cc rename to gcell/apps/benchmark_dma.cc index 7dfaa4c2..bce1953a 100644 --- a/gcell/src/apps/benchmark_dma.cc +++ b/gcell/apps/benchmark_dma.cc @@ -22,7 +22,7 @@ #if defined(HAVE_CONFIG_H) #include #endif -#include "gc_job_manager.h" +#include #include #include #include diff --git a/gcell/src/apps/benchmark_nop.cc b/gcell/apps/benchmark_nop.cc similarity index 99% rename from gcell/src/apps/benchmark_nop.cc rename to gcell/apps/benchmark_nop.cc index f427c85d..10f9d4c5 100644 --- a/gcell/src/apps/benchmark_nop.cc +++ b/gcell/apps/benchmark_nop.cc @@ -22,7 +22,7 @@ #if defined(HAVE_CONFIG_H) #include #endif -#include "gc_job_manager.h" +#include #include #include #include diff --git a/gcell/src/apps/gen_script.py b/gcell/apps/gen_script.py similarity index 100% rename from gcell/src/apps/gen_script.py rename to gcell/apps/gen_script.py diff --git a/gcell/src/apps/plot_speedup.py b/gcell/apps/plot_speedup.py similarity index 100% rename from gcell/src/apps/plot_speedup.py rename to gcell/apps/plot_speedup.py diff --git a/gcell/src/apps/results-071223 b/gcell/apps/results-071223 similarity index 100% rename from gcell/src/apps/results-071223 rename to gcell/apps/results-071223 diff --git a/gcell/src/apps/split_and_avg_results.py b/gcell/apps/split_and_avg_results.py similarity index 100% rename from gcell/src/apps/split_and_avg_results.py rename to gcell/apps/split_and_avg_results.py diff --git a/gcell/src/apps/spu/Makefile.am b/gcell/apps/spu/Makefile.am similarity index 100% rename from gcell/src/apps/spu/Makefile.am rename to gcell/apps/spu/Makefile.am diff --git a/gcell/src/apps/spu/benchmark_procs.c b/gcell/apps/spu/benchmark_procs.c similarity index 96% rename from gcell/src/apps/spu/benchmark_procs.c rename to gcell/apps/spu/benchmark_procs.c index 0fddb2d1..fbc70334 100644 --- a/gcell/src/apps/spu/benchmark_procs.c +++ b/gcell/apps/spu/benchmark_procs.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include static void diff --git a/gcell/src/apps/test_all.cc b/gcell/apps/test_all.cc similarity index 92% rename from gcell/src/apps/test_all.cc rename to gcell/apps/test_all.cc index 798549be..9823960c 100644 --- a/gcell/src/apps/test_all.cc +++ b/gcell/apps/test_all.cc @@ -21,8 +21,8 @@ #include -#include -#include +#include "../lib/runtime/qa_gcell_runtime.h" +#include "../lib/wrapper/qa_gcell_wrapper.h" int main(int argc, char **argv) diff --git a/gcell/gcell.pc.in b/gcell/gcell.pc.in index 2b6101d1..d88d0fb6 100644 --- a/gcell/gcell.pc.in +++ b/gcell/gcell.pc.in @@ -2,10 +2,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +gcell_embedspu_libtool=@bindir@/gcell-embedspu-libtool Name: gcell Description: The GNU Radio SPE scheduler and RPC mechanism -Requires: gnuradio-omnithread mblock +Requires: gnuradio-omnithread Version: @VERSION@ Libs: -L${libdir} -lgcell Cflags: -I${includedir} @DEFINES@ diff --git a/gcell/gcell_spu.pc.in b/gcell/gcell_spu.pc.in new file mode 100644 index 00000000..b59043b9 --- /dev/null +++ b/gcell/gcell_spu.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@spu +includedir=@includedir@ + +Name: gcell_spu +Description: The GNU Radio SPE scheduler and RPC mechanism (SPU components) +Requires: +Version: @VERSION@ +Libs: -L${libdir} -lgcell_spu +Cflags: -I${includedir} diff --git a/gcell/src/ibm/Makefile.am b/gcell/ibm/Makefile.am similarity index 100% rename from gcell/src/ibm/Makefile.am rename to gcell/ibm/Makefile.am diff --git a/gcell/src/ibm/README b/gcell/ibm/README similarity index 100% rename from gcell/src/ibm/README rename to gcell/ibm/README diff --git a/gcell/src/ibm/sync/ppu_source/atomic.h b/gcell/ibm/sync/ppu_source/atomic.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic.h rename to gcell/ibm/sync/ppu_source/atomic.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_add.h b/gcell/ibm/sync/ppu_source/atomic_add.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_add.h rename to gcell/ibm/sync/ppu_source/atomic_add.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_add_return.h b/gcell/ibm/sync/ppu_source/atomic_add_return.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_add_return.h rename to gcell/ibm/sync/ppu_source/atomic_add_return.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec.h b/gcell/ibm/sync/ppu_source/atomic_dec.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_dec.h rename to gcell/ibm/sync/ppu_source/atomic_dec.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_and_test.h b/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_dec_and_test.h rename to gcell/ibm/sync/ppu_source/atomic_dec_and_test.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_dec_if_positive.h rename to gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_return.h b/gcell/ibm/sync/ppu_source/atomic_dec_return.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_dec_return.h rename to gcell/ibm/sync/ppu_source/atomic_dec_return.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_inc.h b/gcell/ibm/sync/ppu_source/atomic_inc.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_inc.h rename to gcell/ibm/sync/ppu_source/atomic_inc.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_inc_return.h b/gcell/ibm/sync/ppu_source/atomic_inc_return.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_inc_return.h rename to gcell/ibm/sync/ppu_source/atomic_inc_return.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_read.h b/gcell/ibm/sync/ppu_source/atomic_read.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_read.h rename to gcell/ibm/sync/ppu_source/atomic_read.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_set.h b/gcell/ibm/sync/ppu_source/atomic_set.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_set.h rename to gcell/ibm/sync/ppu_source/atomic_set.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub.h b/gcell/ibm/sync/ppu_source/atomic_sub.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_sub.h rename to gcell/ibm/sync/ppu_source/atomic_sub.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub_and_test.h b/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_sub_and_test.h rename to gcell/ibm/sync/ppu_source/atomic_sub_and_test.h diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub_return.h b/gcell/ibm/sync/ppu_source/atomic_sub_return.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/atomic_sub_return.h rename to gcell/ibm/sync/ppu_source/atomic_sub_return.h diff --git a/gcell/src/ibm/sync/ppu_source/complete.h b/gcell/ibm/sync/ppu_source/complete.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/complete.h rename to gcell/ibm/sync/ppu_source/complete.h diff --git a/gcell/src/ibm/sync/ppu_source/complete_all.h b/gcell/ibm/sync/ppu_source/complete_all.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/complete_all.h rename to gcell/ibm/sync/ppu_source/complete_all.h diff --git a/gcell/src/ibm/sync/ppu_source/completion.h b/gcell/ibm/sync/ppu_source/completion.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/completion.h rename to gcell/ibm/sync/ppu_source/completion.h diff --git a/gcell/src/ibm/sync/ppu_source/cond.h b/gcell/ibm/sync/ppu_source/cond.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/cond.h rename to gcell/ibm/sync/ppu_source/cond.h diff --git a/gcell/src/ibm/sync/ppu_source/cond_broadcast.h b/gcell/ibm/sync/ppu_source/cond_broadcast.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/cond_broadcast.h rename to gcell/ibm/sync/ppu_source/cond_broadcast.h diff --git a/gcell/src/ibm/sync/ppu_source/cond_init.h b/gcell/ibm/sync/ppu_source/cond_init.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/cond_init.h rename to gcell/ibm/sync/ppu_source/cond_init.h diff --git a/gcell/src/ibm/sync/ppu_source/cond_signal.h b/gcell/ibm/sync/ppu_source/cond_signal.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/cond_signal.h rename to gcell/ibm/sync/ppu_source/cond_signal.h diff --git a/gcell/src/ibm/sync/ppu_source/cond_wait.h b/gcell/ibm/sync/ppu_source/cond_wait.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/cond_wait.h rename to gcell/ibm/sync/ppu_source/cond_wait.h diff --git a/gcell/src/ibm/sync/ppu_source/init_completion.h b/gcell/ibm/sync/ppu_source/init_completion.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/init_completion.h rename to gcell/ibm/sync/ppu_source/init_completion.h diff --git a/gcell/src/ibm/sync/ppu_source/libsync.h b/gcell/ibm/sync/ppu_source/libsync.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/libsync.h rename to gcell/ibm/sync/ppu_source/libsync.h diff --git a/gcell/src/ibm/sync/ppu_source/mutex.h b/gcell/ibm/sync/ppu_source/mutex.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/mutex.h rename to gcell/ibm/sync/ppu_source/mutex.h diff --git a/gcell/src/ibm/sync/ppu_source/mutex_init.h b/gcell/ibm/sync/ppu_source/mutex_init.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/mutex_init.h rename to gcell/ibm/sync/ppu_source/mutex_init.h diff --git a/gcell/src/ibm/sync/ppu_source/mutex_lock.h b/gcell/ibm/sync/ppu_source/mutex_lock.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/mutex_lock.h rename to gcell/ibm/sync/ppu_source/mutex_lock.h diff --git a/gcell/src/ibm/sync/ppu_source/mutex_trylock.h b/gcell/ibm/sync/ppu_source/mutex_trylock.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/mutex_trylock.h rename to gcell/ibm/sync/ppu_source/mutex_trylock.h diff --git a/gcell/src/ibm/sync/ppu_source/mutex_unlock.h b/gcell/ibm/sync/ppu_source/mutex_unlock.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/mutex_unlock.h rename to gcell/ibm/sync/ppu_source/mutex_unlock.h diff --git a/gcell/src/ibm/sync/ppu_source/pdt_libsync.xml b/gcell/ibm/sync/ppu_source/pdt_libsync.xml similarity index 100% rename from gcell/src/ibm/sync/ppu_source/pdt_libsync.xml rename to gcell/ibm/sync/ppu_source/pdt_libsync.xml diff --git a/gcell/src/ibm/sync/ppu_source/pdt_libsync_config.xml b/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml similarity index 100% rename from gcell/src/ibm/sync/ppu_source/pdt_libsync_config.xml rename to gcell/ibm/sync/ppu_source/pdt_libsync_config.xml diff --git a/gcell/src/ibm/sync/ppu_source/sync_utils.h b/gcell/ibm/sync/ppu_source/sync_utils.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/sync_utils.h rename to gcell/ibm/sync/ppu_source/sync_utils.h diff --git a/gcell/src/ibm/sync/ppu_source/trace_libsync.h b/gcell/ibm/sync/ppu_source/trace_libsync.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/trace_libsync.h rename to gcell/ibm/sync/ppu_source/trace_libsync.h diff --git a/gcell/src/ibm/sync/ppu_source/wait_for_completion.h b/gcell/ibm/sync/ppu_source/wait_for_completion.h similarity index 100% rename from gcell/src/ibm/sync/ppu_source/wait_for_completion.h rename to gcell/ibm/sync/ppu_source/wait_for_completion.h diff --git a/gcell/src/ibm/sync/spu_source/atomic.h b/gcell/ibm/sync/spu_source/atomic.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic.h rename to gcell/ibm/sync/spu_source/atomic.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_add.h b/gcell/ibm/sync/spu_source/atomic_add.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_add.h rename to gcell/ibm/sync/spu_source/atomic_add.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_add_return.h b/gcell/ibm/sync/spu_source/atomic_add_return.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_add_return.h rename to gcell/ibm/sync/spu_source/atomic_add_return.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec.h b/gcell/ibm/sync/spu_source/atomic_dec.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_dec.h rename to gcell/ibm/sync/spu_source/atomic_dec.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_and_test.h b/gcell/ibm/sync/spu_source/atomic_dec_and_test.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_dec_and_test.h rename to gcell/ibm/sync/spu_source/atomic_dec_and_test.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_dec_if_positive.h rename to gcell/ibm/sync/spu_source/atomic_dec_if_positive.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_return.h b/gcell/ibm/sync/spu_source/atomic_dec_return.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_dec_return.h rename to gcell/ibm/sync/spu_source/atomic_dec_return.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_inc.h b/gcell/ibm/sync/spu_source/atomic_inc.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_inc.h rename to gcell/ibm/sync/spu_source/atomic_inc.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_inc_return.h b/gcell/ibm/sync/spu_source/atomic_inc_return.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_inc_return.h rename to gcell/ibm/sync/spu_source/atomic_inc_return.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_read.h b/gcell/ibm/sync/spu_source/atomic_read.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_read.h rename to gcell/ibm/sync/spu_source/atomic_read.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_set.h b/gcell/ibm/sync/spu_source/atomic_set.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_set.h rename to gcell/ibm/sync/spu_source/atomic_set.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub.h b/gcell/ibm/sync/spu_source/atomic_sub.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_sub.h rename to gcell/ibm/sync/spu_source/atomic_sub.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub_and_test.h b/gcell/ibm/sync/spu_source/atomic_sub_and_test.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_sub_and_test.h rename to gcell/ibm/sync/spu_source/atomic_sub_and_test.h diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub_return.h b/gcell/ibm/sync/spu_source/atomic_sub_return.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/atomic_sub_return.h rename to gcell/ibm/sync/spu_source/atomic_sub_return.h diff --git a/gcell/src/ibm/sync/spu_source/complete.h b/gcell/ibm/sync/spu_source/complete.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/complete.h rename to gcell/ibm/sync/spu_source/complete.h diff --git a/gcell/src/ibm/sync/spu_source/complete_all.h b/gcell/ibm/sync/spu_source/complete_all.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/complete_all.h rename to gcell/ibm/sync/spu_source/complete_all.h diff --git a/gcell/src/ibm/sync/spu_source/completion.h b/gcell/ibm/sync/spu_source/completion.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/completion.h rename to gcell/ibm/sync/spu_source/completion.h diff --git a/gcell/src/ibm/sync/spu_source/cond.h b/gcell/ibm/sync/spu_source/cond.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/cond.h rename to gcell/ibm/sync/spu_source/cond.h diff --git a/gcell/src/ibm/sync/spu_source/cond_broadcast.h b/gcell/ibm/sync/spu_source/cond_broadcast.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/cond_broadcast.h rename to gcell/ibm/sync/spu_source/cond_broadcast.h diff --git a/gcell/src/ibm/sync/spu_source/cond_init.h b/gcell/ibm/sync/spu_source/cond_init.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/cond_init.h rename to gcell/ibm/sync/spu_source/cond_init.h diff --git a/gcell/src/ibm/sync/spu_source/cond_signal.h b/gcell/ibm/sync/spu_source/cond_signal.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/cond_signal.h rename to gcell/ibm/sync/spu_source/cond_signal.h diff --git a/gcell/src/ibm/sync/spu_source/cond_wait.h b/gcell/ibm/sync/spu_source/cond_wait.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/cond_wait.h rename to gcell/ibm/sync/spu_source/cond_wait.h diff --git a/gcell/src/ibm/sync/spu_source/init_completion.h b/gcell/ibm/sync/spu_source/init_completion.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/init_completion.h rename to gcell/ibm/sync/spu_source/init_completion.h diff --git a/gcell/src/ibm/sync/spu_source/libsync.h b/gcell/ibm/sync/spu_source/libsync.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/libsync.h rename to gcell/ibm/sync/spu_source/libsync.h diff --git a/gcell/src/ibm/sync/spu_source/mutex.h b/gcell/ibm/sync/spu_source/mutex.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/mutex.h rename to gcell/ibm/sync/spu_source/mutex.h diff --git a/gcell/src/ibm/sync/spu_source/mutex_init.h b/gcell/ibm/sync/spu_source/mutex_init.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/mutex_init.h rename to gcell/ibm/sync/spu_source/mutex_init.h diff --git a/gcell/src/ibm/sync/spu_source/mutex_lock.h b/gcell/ibm/sync/spu_source/mutex_lock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/mutex_lock.h rename to gcell/ibm/sync/spu_source/mutex_lock.h diff --git a/gcell/src/ibm/sync/spu_source/mutex_trylock.h b/gcell/ibm/sync/spu_source/mutex_trylock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/mutex_trylock.h rename to gcell/ibm/sync/spu_source/mutex_trylock.h diff --git a/gcell/src/ibm/sync/spu_source/mutex_unlock.h b/gcell/ibm/sync/spu_source/mutex_unlock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/mutex_unlock.h rename to gcell/ibm/sync/spu_source/mutex_unlock.h diff --git a/gcell/src/ibm/sync/spu_source/read_lock.h b/gcell/ibm/sync/spu_source/read_lock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/read_lock.h rename to gcell/ibm/sync/spu_source/read_lock.h diff --git a/gcell/src/ibm/sync/spu_source/read_trylock.h b/gcell/ibm/sync/spu_source/read_trylock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/read_trylock.h rename to gcell/ibm/sync/spu_source/read_trylock.h diff --git a/gcell/src/ibm/sync/spu_source/read_unlock.h b/gcell/ibm/sync/spu_source/read_unlock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/read_unlock.h rename to gcell/ibm/sync/spu_source/read_unlock.h diff --git a/gcell/src/ibm/sync/spu_source/rwlock_init.h b/gcell/ibm/sync/spu_source/rwlock_init.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/rwlock_init.h rename to gcell/ibm/sync/spu_source/rwlock_init.h diff --git a/gcell/src/ibm/sync/spu_source/sync_irq.h b/gcell/ibm/sync/spu_source/sync_irq.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/sync_irq.h rename to gcell/ibm/sync/spu_source/sync_irq.h diff --git a/gcell/src/ibm/sync/spu_source/sync_utils.h b/gcell/ibm/sync/spu_source/sync_utils.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/sync_utils.h rename to gcell/ibm/sync/spu_source/sync_utils.h diff --git a/gcell/src/ibm/sync/spu_source/trace_libsync.h b/gcell/ibm/sync/spu_source/trace_libsync.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/trace_libsync.h rename to gcell/ibm/sync/spu_source/trace_libsync.h diff --git a/gcell/src/ibm/sync/spu_source/wait_for_completion.h b/gcell/ibm/sync/spu_source/wait_for_completion.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/wait_for_completion.h rename to gcell/ibm/sync/spu_source/wait_for_completion.h diff --git a/gcell/src/ibm/sync/spu_source/write_lock.h b/gcell/ibm/sync/spu_source/write_lock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/write_lock.h rename to gcell/ibm/sync/spu_source/write_lock.h diff --git a/gcell/src/ibm/sync/spu_source/write_trylock.h b/gcell/ibm/sync/spu_source/write_trylock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/write_trylock.h rename to gcell/ibm/sync/spu_source/write_trylock.h diff --git a/gcell/src/ibm/sync/spu_source/write_unlock.h b/gcell/ibm/sync/spu_source/write_unlock.h similarity index 100% rename from gcell/src/ibm/sync/spu_source/write_unlock.h rename to gcell/ibm/sync/spu_source/write_unlock.h diff --git a/gcell/src/Makefile.am b/gcell/include/Makefile.am similarity index 90% rename from gcell/src/Makefile.am rename to gcell/include/Makefile.am index af76eb67..c96c6f0a 100644 --- a/gcell/src/Makefile.am +++ b/gcell/include/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2008 Free Software Foundation, Inc. +# Copyright 2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,4 +20,5 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = include lib apps ibm +SUBDIRS = gcell + diff --git a/gcell/src/include/Makefile.am b/gcell/include/gcell/Makefile.am similarity index 94% rename from gcell/src/include/Makefile.am rename to gcell/include/gcell/Makefile.am index 1e65282d..03255e51 100644 --- a/gcell/src/include/Makefile.am +++ b/gcell/include/gcell/Makefile.am @@ -24,9 +24,11 @@ SUBDIRS = spu gcellinclude_HEADERS = \ compiler.h \ + gc_aligned_alloc.h \ gc_atomic.h \ gc_cdefs.h \ gc_declare_proc.h \ + gc_job_manager.h \ gc_jd_queue_data.h \ gc_jd_queue.h \ gc_jd_stack.h \ @@ -36,4 +38,5 @@ gcellinclude_HEADERS = \ gc_mbox.h \ gc_spu_args.h \ gc_types.h \ + gcp_fft_1d_r2.h \ memory_barrier.h diff --git a/gcell/src/include/compiler.h b/gcell/include/gcell/compiler.h similarity index 92% rename from gcell/src/include/compiler.h rename to gcell/include/gcell/compiler.h index 5f1c99c5..d1adcd12 100644 --- a/gcell/src/include/compiler.h +++ b/gcell/include/gcell/compiler.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_COMPILER_H -#define INCLUDED_COMPILER_H +#ifndef INCLUDED_GCELL_COMPILER_H +#define INCLUDED_GCELL_COMPILER_H /*! * \brief Compiler specific hackery. These are for GCC. @@ -42,4 +42,4 @@ #endif -#endif /* INCLUDED_COMPILER_H */ +#endif /* INCLUDED_GCELL_COMPILER_H */ diff --git a/gcell/src/lib/runtime/gc_aligned_alloc.h b/gcell/include/gcell/gc_aligned_alloc.h similarity index 100% rename from gcell/src/lib/runtime/gc_aligned_alloc.h rename to gcell/include/gcell/gc_aligned_alloc.h diff --git a/gcell/src/include/gc_atomic.h b/gcell/include/gcell/gc_atomic.h similarity index 88% rename from gcell/src/include/gc_atomic.h rename to gcell/include/gcell/gc_atomic.h index 01737cd0..51d38af4 100644 --- a/gcell/src/include/gc_atomic.h +++ b/gcell/include/gcell/gc_atomic.h @@ -18,12 +18,12 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_ATOMIC_H -#define INCLUDED_GC_ATOMIC_H +#ifndef INCLUDED_GCELL_GC_ATOMIC_H +#define INCLUDED_GCELL_GC_ATOMIC_H #include typedef uint32_t gc_atomic_t; -#endif /* INCLUDED_GC_ATOMIC_H */ +#endif /* INCLUDED_GCELL_GC_ATOMIC_H */ diff --git a/gcell/src/include/gc_cdefs.h b/gcell/include/gcell/gc_cdefs.h similarity index 90% rename from gcell/src/include/gc_cdefs.h rename to gcell/include/gcell/gc_cdefs.h index 93084bae..0c5fc4ad 100644 --- a/gcell/src/include/gc_cdefs.h +++ b/gcell/include/gcell/gc_cdefs.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_CDEFS_H -#define INCLUDED_GC_CDEFS_H +#ifndef INCLUDED_GCELL_GC_CDEFS_H +#define INCLUDED_GCELL_GC_CDEFS_H /* C++ needs to know that types and declarations are C, not C++. */ #ifdef __cplusplus @@ -31,4 +31,4 @@ # define __GC_END_DECLS #endif -#endif /* INCLUDED_GC_CDEFS_H */ +#endif /* INCLUDED_GCELL_GC_CDEFS_H */ diff --git a/gcell/src/include/gc_declare_proc.h b/gcell/include/gcell/gc_declare_proc.h similarity index 91% rename from gcell/src/include/gc_declare_proc.h rename to gcell/include/gcell/gc_declare_proc.h index 37af5bab..ba77e0fb 100644 --- a/gcell/src/include/gc_declare_proc.h +++ b/gcell/include/gcell/gc_declare_proc.h @@ -18,11 +18,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_DECLARE_PROC_H -#define INCLUDED_GC_DECLARE_PROC_H +#ifndef INCLUDED_GCELL_GC_DECLARE_PROC_H +#define INCLUDED_GCELL_GC_DECLARE_PROC_H #include -#include +#include /* * This is C, not C++ code... @@ -61,4 +61,4 @@ static struct gc_proc_def \ __GC_END_DECLS -#endif /* INCLUDED_GC_DECLARE_PROC_H */ +#endif /* INCLUDED_GCELL_GC_DECLARE_PROC_H */ diff --git a/gcell/src/include/gc_jd_queue.h b/gcell/include/gcell/gc_jd_queue.h similarity index 88% rename from gcell/src/include/gc_jd_queue.h rename to gcell/include/gcell/gc_jd_queue.h index f5f8a1a0..50777a39 100644 --- a/gcell/src/include/gc_jd_queue.h +++ b/gcell/include/gcell/gc_jd_queue.h @@ -19,10 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_JD_QUEUE_H -#define INCLUDED_GC_JD_QUEUE_H +#ifndef INCLUDED_GCELL_GC_JD_QUEUE_H +#define INCLUDED_GCELL_GC_JD_QUEUE_H -#include "gc_jd_queue_data.h" +#include __GC_BEGIN_DECLS @@ -49,4 +49,4 @@ gc_jd_queue_dequeue(gc_jd_queue_t *q); __GC_END_DECLS -#endif /* INCLUDED_GC_JD_QUEUE_H */ +#endif /* INCLUDED_GCELL_GC_JD_QUEUE_H */ diff --git a/gcell/src/include/gc_jd_queue_data.h b/gcell/include/gcell/gc_jd_queue_data.h similarity index 87% rename from gcell/src/include/gc_jd_queue_data.h rename to gcell/include/gcell/gc_jd_queue_data.h index 3fd7270d..819b3712 100644 --- a/gcell/src/include/gc_jd_queue_data.h +++ b/gcell/include/gcell/gc_jd_queue_data.h @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_JD_QUEUE_DATA_H -#define INCLUDED_GC_JD_QUEUE_DATA_H +#ifndef INCLUDED_GCELL_GC_JD_QUEUE_DATA_H +#define INCLUDED_GCELL_GC_JD_QUEUE_DATA_H -#include "gc_types.h" -#include "gc_job_desc.h" +#include +#include __GC_BEGIN_DECLS @@ -47,6 +47,6 @@ typedef struct gc_jd_queue __GC_END_DECLS -#endif /* INCLUDED_GC_JD_QUEUE_DATA_H */ +#endif /* INCLUDED_GCELL_GC_JD_QUEUE_DATA_H */ diff --git a/gcell/src/include/gc_jd_stack.h b/gcell/include/gcell/gc_jd_stack.h similarity index 90% rename from gcell/src/include/gc_jd_stack.h rename to gcell/include/gcell/gc_jd_stack.h index 72e9435c..9eab4e40 100644 --- a/gcell/src/include/gc_jd_stack.h +++ b/gcell/include/gcell/gc_jd_stack.h @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_JD_STACK_H -#define INCLUDED_GC_JD_STACK_H +#ifndef INCLUDED_GCELL_GC_JD_STACK_H +#define INCLUDED_GCELL_GC_JD_STACK_H -#include "gc_types.h" -#include "gc_job_desc.h" +#include +#include __GC_BEGIN_DECLS @@ -67,4 +67,4 @@ gc_jd_stack_pop(gc_jd_stack_t *stack); __GC_END_DECLS -#endif /* INCLUDED_GC_JD_STACK_H */ +#endif /* INCLUDED_GCELL_GC_JD_STACK_H */ diff --git a/gcell/src/include/gc_job_desc.h b/gcell/include/gcell/gc_job_desc.h similarity index 96% rename from gcell/src/include/gc_job_desc.h rename to gcell/include/gcell/gc_job_desc.h index b7915067..5ff99e2e 100644 --- a/gcell/src/include/gc_job_desc.h +++ b/gcell/include/gcell/gc_job_desc.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_JOB_DESC_H -#define INCLUDED_GC_JOB_DESC_H +#ifndef INCLUDED_GCELL_GC_JOB_DESC_H +#define INCLUDED_GCELL_GC_JOB_DESC_H /*! * This file contains the structures that are used to describe how to @@ -42,8 +42,8 @@ * notify the entity that submitted the job. */ -#include "gc_types.h" -#include "gc_job_desc_private.h" +#include +#include /* * This is C, not C++ code... @@ -210,4 +210,4 @@ jdp_to_ea(gc_job_desc_t *item) __GC_END_DECLS -#endif /* INCLUDED_GC_JOB_DESC_H */ +#endif /* INCLUDED_GCELL_GC_JOB_DESC_H */ diff --git a/gcell/src/include/gc_job_desc_private.h b/gcell/include/gcell/gc_job_desc_private.h similarity index 89% rename from gcell/src/include/gc_job_desc_private.h rename to gcell/include/gcell/gc_job_desc_private.h index 1f76d862..fa831a88 100644 --- a/gcell/src/include/gc_job_desc_private.h +++ b/gcell/include/gcell/gc_job_desc_private.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_JOB_DESC_PRIVATE_H -#define INCLUDED_GC_JOB_DESC_PRIVATE_H +#ifndef INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H +#define INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H // #include @@ -35,5 +35,5 @@ typedef struct gc_job_desc_private uint32_t direction_union; // union of all gc_job_ea_arg.direction fields } gc_job_desc_private_t; -#endif /* INCLUDED_GC_JOB_PRIVATE_H */ +#endif /* INCLUDED_GCELL_GC_JOB_PRIVATE_H */ diff --git a/gcell/src/lib/runtime/gc_job_manager.h b/gcell/include/gcell/gc_job_manager.h similarity index 100% rename from gcell/src/lib/runtime/gc_job_manager.h rename to gcell/include/gcell/gc_job_manager.h diff --git a/gcell/src/include/gc_logging.h b/gcell/include/gcell/gc_logging.h similarity index 96% rename from gcell/src/include/gc_logging.h rename to gcell/include/gcell/gc_logging.h index b98c283a..9cc6fa77 100644 --- a/gcell/src/include/gc_logging.h +++ b/gcell/include/gcell/gc_logging.h @@ -18,10 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_LOGGING_H -#define INCLUDED_GC_LOGGING_H +#ifndef INCLUDED_GCELL_GC_LOGGING_H +#define INCLUDED_GCELL_GC_LOGGING_H -#include +#include #include __GC_BEGIN_DECLS @@ -163,4 +163,4 @@ _gc_log_init(gc_log_t log_info); __GC_END_DECLS -#endif /* INCLUDED_GC_LOGGING_H */ +#endif /* INCLUDED_GCELL_GC_LOGGING_H */ diff --git a/gcell/src/include/gc_mbox.h b/gcell/include/gcell/gc_mbox.h similarity index 94% rename from gcell/src/include/gc_mbox.h rename to gcell/include/gcell/gc_mbox.h index 32b23c6f..1d577ff8 100644 --- a/gcell/src/include/gc_mbox.h +++ b/gcell/include/gcell/gc_mbox.h @@ -18,8 +18,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_MBOX_H -#define INCLUDED_GC_MBOX_H +#ifndef INCLUDED_GCELL_GC_MBOX_H +#define INCLUDED_GCELL_GC_MBOX_H /* * The PPE and SPE exchange a few 32-bit messages via mailboxes. @@ -49,4 +49,4 @@ #define OP_SPU_BUFSIZE 0x3 // arg is max number of bytes -#endif /* INCLUDED_GC_MBOX_H */ +#endif /* INCLUDED_GCELL_GC_MBOX_H */ diff --git a/gcell/src/include/gc_spu_args.h b/gcell/include/gcell/gc_spu_args.h similarity index 92% rename from gcell/src/include/gc_spu_args.h rename to gcell/include/gcell/gc_spu_args.h index f5a21227..3719bac2 100644 --- a/gcell/src/include/gc_spu_args.h +++ b/gcell/include/gcell/gc_spu_args.h @@ -18,11 +18,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_SPU_ARGS_H -#define INCLUDED_GC_SPU_ARGS_H +#ifndef INCLUDED_GCELL_GC_SPU_ARGS_H +#define INCLUDED_GCELL_GC_SPU_ARGS_H -#include -#include +#include +#include // args passed to SPE at initialization time @@ -57,4 +57,4 @@ typedef struct gc_comp_info { uint16_t job_id[GC_CI_NJOBS]; // job_id's of completed jobs } _AL128 gc_comp_info_t; -#endif /* INCLUDED_GC_SPU_ARGS_H */ +#endif /* INCLUDED_GCELL_GC_SPU_ARGS_H */ diff --git a/gcell/src/include/gc_types.h b/gcell/include/gcell/gc_types.h similarity index 89% rename from gcell/src/include/gc_types.h rename to gcell/include/gcell/gc_types.h index 9a4d0546..b75bcd8d 100644 --- a/gcell/src/include/gc_types.h +++ b/gcell/include/gcell/gc_types.h @@ -19,12 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_TYPES_H -#define INCLUDED_GC_TYPES_H +#ifndef INCLUDED_GCELL_GC_TYPES_H +#define INCLUDED_GCELL_GC_TYPES_H #include -#include -#include "compiler.h" +#include +#include __GC_BEGIN_DECLS @@ -60,4 +60,4 @@ ptr_to_ea(void *p) __GC_END_DECLS -#endif /* INCLUDED_GC_TYPES_H */ +#endif /* INCLUDED_GCELL_GC_TYPES_H */ diff --git a/gcell/src/lib/wrapper/gcp_fft_1d_r2.h b/gcell/include/gcell/gcp_fft_1d_r2.h similarity index 98% rename from gcell/src/lib/wrapper/gcp_fft_1d_r2.h rename to gcell/include/gcell/gcp_fft_1d_r2.h index 1207a5f3..c1d33183 100644 --- a/gcell/src/lib/wrapper/gcp_fft_1d_r2.h +++ b/gcell/include/gcell/gcp_fft_1d_r2.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_GCP_FFT_1D_R2_H #define INCLUDED_GCP_FFT_1D_R2_H -#include +#include #include /*! diff --git a/gcell/src/include/memory_barrier.h b/gcell/include/gcell/memory_barrier.h similarity index 88% rename from gcell/src/include/memory_barrier.h rename to gcell/include/gcell/memory_barrier.h index b373ffd9..4a1f8700 100644 --- a/gcell/src/include/memory_barrier.h +++ b/gcell/include/gcell/memory_barrier.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_MEMORY_BARRIER_H -#define INCLUDED_MEMORY_BARRIER_H +#ifndef INCLUDED_GCELL_MEMORY_BARRIER_H +#define INCLUDED_GCELL_MEMORY_BARRIER_H /* * powerpc memory barriers @@ -45,22 +45,20 @@ * Control Instructions." (site:ibm.com) */ -#include - static inline void smp_mb(void) { - __sync(); + __asm__ volatile ("sync" : : : "memory"); } static inline void smp_rmb(void) { - __lwsync(); + __asm__ volatile ("lwsync" : : : "memory"); } static inline void smp_wmb(void) { - __eieio(); + __asm__ volatile ("eieio" : : : "memory"); } -#endif /* INCLUDED_MEMORY_BARRIER_H */ +#endif /* INCLUDED_GCELL_MEMORY_BARRIER_H */ diff --git a/gcell/src/include/spu/Makefile.am b/gcell/include/gcell/spu/Makefile.am similarity index 92% rename from gcell/src/include/spu/Makefile.am rename to gcell/include/gcell/spu/Makefile.am index 81a8bfdf..58816819 100644 --- a/gcell/src/include/spu/Makefile.am +++ b/gcell/include/gcell/spu/Makefile.am @@ -21,6 +21,10 @@ include $(top_srcdir)/Makefile.common gcellspuinclude_HEADERS = \ + fft_1d.h \ + fft_1d_r2.h \ gc_delay.h \ gc_jd_queue.h \ - gc_random.h + gc_random.h \ + gc_spu_macs.h \ + libfft.h diff --git a/gcell/src/lib/general/spu/fft_1d.h b/gcell/include/gcell/spu/fft_1d.h similarity index 100% rename from gcell/src/lib/general/spu/fft_1d.h rename to gcell/include/gcell/spu/fft_1d.h diff --git a/gcell/src/lib/general/spu/fft_1d_r2.h b/gcell/include/gcell/spu/fft_1d_r2.h similarity index 100% rename from gcell/src/lib/general/spu/fft_1d_r2.h rename to gcell/include/gcell/spu/fft_1d_r2.h diff --git a/gcell/src/include/spu/gc_delay.h b/gcell/include/gcell/spu/gc_delay.h similarity index 88% rename from gcell/src/include/spu/gc_delay.h rename to gcell/include/gcell/spu/gc_delay.h index 78f16fb2..e995b3a9 100644 --- a/gcell/src/include/spu/gc_delay.h +++ b/gcell/include/gcell/spu/gc_delay.h @@ -18,10 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_DELAY_H -#define INCLUDED_GC_DELAY_H +#ifndef INCLUDED_GCELL_SPU_GC_DELAY_H +#define INCLUDED_GCELL_SPU_GC_DELAY_H void gc_udelay(unsigned int usecs); void gc_cdelay(unsigned int cpu_cycles); -#endif /* INCLUDED_GC_DELAY_H */ +#endif /* INCLUDED_GCELL_SPU_GC_DELAY_H */ diff --git a/gcell/src/include/spu/gc_jd_queue.h b/gcell/include/gcell/spu/gc_jd_queue.h similarity index 90% rename from gcell/src/include/spu/gc_jd_queue.h rename to gcell/include/gcell/spu/gc_jd_queue.h index b65b15fe..ce1977c9 100644 --- a/gcell/src/include/spu/gc_jd_queue.h +++ b/gcell/include/gcell/spu/gc_jd_queue.h @@ -19,10 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_SPU_GC_JD_QUEUE_H -#define INCLUDED_SPU_GC_JD_QUEUE_H +#ifndef INCLUDED_GCELL_SPU_GC_JD_QUEUE_H +#define INCLUDED_GCELL_SPU_GC_JD_QUEUE_H -#include "gc_jd_queue_data.h" +#include /* * Declarations for SPU side of job queue interface @@ -50,4 +50,4 @@ gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea, __GC_END_DECLS -#endif /* INCLUDED_SPU_GC_JD_QUEUE_H */ +#endif /* INCLUDED_GCELL_SPU_GC_JD_QUEUE_H */ diff --git a/gcell/src/include/spu/gc_random.h b/gcell/include/gcell/spu/gc_random.h similarity index 89% rename from gcell/src/include/spu/gc_random.h rename to gcell/include/gcell/spu/gc_random.h index ccb56473..f51b187d 100644 --- a/gcell/src/include/spu/gc_random.h +++ b/gcell/include/gcell/spu/gc_random.h @@ -18,8 +18,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_RANDOM_H -#define INCLUDED_GC_RANDOM_H +#ifndef INCLUDED_GCELL_SPU_GC_RANDOM_H +#define INCLUDED_GCELL_SPU_GC_RANDOM_H /*! * \brief Return a uniformly distributed value in the range [0, 1.0) @@ -29,4 +29,4 @@ float gc_uniform_deviate(void); void gc_set_seed(int seed); -#endif /* INCLUDED_GC_RANDOM_H */ +#endif /* INCLUDED_GCELL_SPU_GC_RANDOM_H */ diff --git a/gcell/src/lib/general/spu/gc_spu_macs.h b/gcell/include/gcell/spu/gc_spu_macs.h similarity index 99% rename from gcell/src/lib/general/spu/gc_spu_macs.h rename to gcell/include/gcell/spu/gc_spu_macs.h index 8e3e3f2a..0d7dc997 100644 --- a/gcell/src/lib/general/spu/gc_spu_macs.h +++ b/gcell/include/gcell/spu/gc_spu_macs.h @@ -182,7 +182,7 @@ // r3 - r74 are volatile (caller saves) // r74 - r79 are volatile (scratch regs possibly destroyed by fct prolog/epilog) -// r80 - r127 are non-volatile (caller-saves) +// r80 - r127 are non-volatile (callee-saves) // scratch registers reserved for use by the macros in this file. diff --git a/gcell/src/lib/general/spu/libfft.h b/gcell/include/gcell/spu/libfft.h similarity index 100% rename from gcell/src/lib/general/spu/libfft.h rename to gcell/include/gcell/spu/libfft.h diff --git a/gcell/src/lib/Makefile.am b/gcell/lib/Makefile.am similarity index 100% rename from gcell/src/lib/Makefile.am rename to gcell/lib/Makefile.am diff --git a/gcell/src/lib/general/Makefile.am b/gcell/lib/general/Makefile.am similarity index 100% rename from gcell/src/lib/general/Makefile.am rename to gcell/lib/general/Makefile.am diff --git a/gcell/src/lib/general/spu/fft_1d_r2.c b/gcell/lib/general/spu/fft_1d_r2.c similarity index 94% rename from gcell/src/lib/general/spu/fft_1d_r2.c rename to gcell/lib/general/spu/fft_1d_r2.c index a0660b30..0a87e74a 100644 --- a/gcell/src/lib/general/spu/fft_1d_r2.c +++ b/gcell/lib/general/spu/fft_1d_r2.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include /* diff --git a/gcell/src/lib/general/spu/memset.S b/gcell/lib/general/spu/memset.S similarity index 99% rename from gcell/src/lib/general/spu/memset.S rename to gcell/lib/general/spu/memset.S index 88e2dbea..39eabce0 100644 --- a/gcell/src/lib/general/spu/memset.S +++ b/gcell/lib/general/spu/memset.S @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include .file "memset.S" diff --git a/gcell/src/lib/general/spu/qa_memset.c b/gcell/lib/general/spu/qa_memset.c similarity index 99% rename from gcell/src/lib/general/spu/qa_memset.c rename to gcell/lib/general/spu/qa_memset.c index 0d35a423..e51b02c9 100644 --- a/gcell/src/lib/general/spu/qa_memset.c +++ b/gcell/lib/general/spu/qa_memset.c @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include -#include +#include #include #include +#include +#include #define MAX_QA_BYTES 1024 diff --git a/gcell/src/lib/runtime/Makefile.am b/gcell/lib/runtime/Makefile.am similarity index 91% rename from gcell/src/lib/runtime/Makefile.am rename to gcell/lib/runtime/Makefile.am index 89d6f1bb..2c653918 100644 --- a/gcell/src/lib/runtime/Makefile.am +++ b/gcell/lib/runtime/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/Makefile.common -IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/ppu_source +IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) $(CPPUNIT_INCLUDES) \ @@ -46,10 +46,6 @@ libruntime_qa_la_SOURCES = \ qa_job_manager.cc -gcellinclude_HEADERS = \ - gc_aligned_alloc.h \ - gc_job_manager.h - noinst_HEADERS = \ gc_client_thread_info.h \ gc_job_manager_impl.h \ @@ -61,7 +57,7 @@ noinst_HEADERS = \ # generate a libtool.lo that contains an embeded SPU executable gcell_runtime_qa.lo: ../spu/gcell_runtime_qa - $(GCELL_EMBEDSPU_LIBTOOL) $@ $< + $(GCELL_EMBEDSPU_LIBTOOL) $< $@ libruntime_qa_la_LIBADD = \ gcell_runtime_qa.lo \ diff --git a/gcell/src/lib/runtime/gc_aligned_alloc.cc b/gcell/lib/runtime/gc_aligned_alloc.cc similarity index 97% rename from gcell/src/lib/runtime/gc_aligned_alloc.cc rename to gcell/lib/runtime/gc_aligned_alloc.cc index 6f9a999b..905154e3 100644 --- a/gcell/src/lib/runtime/gc_aligned_alloc.cc +++ b/gcell/lib/runtime/gc_aligned_alloc.cc @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include #include #include diff --git a/gcell/src/lib/runtime/gc_client_thread_info.h b/gcell/lib/runtime/gc_client_thread_info.h similarity index 100% rename from gcell/src/lib/runtime/gc_client_thread_info.h rename to gcell/lib/runtime/gc_client_thread_info.h diff --git a/gcell/src/lib/runtime/gc_jd_queue.c b/gcell/lib/runtime/gc_jd_queue.c similarity index 96% rename from gcell/src/lib/runtime/gc_jd_queue.c rename to gcell/lib/runtime/gc_jd_queue.c index b5cdcac9..aeabd305 100644 --- a/gcell/src/lib/runtime/gc_jd_queue.c +++ b/gcell/lib/runtime/gc_jd_queue.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "gc_jd_queue.h" -#include "memory_barrier.h" +#include +#include #include #include #include diff --git a/gcell/src/lib/runtime/gc_jd_stack.c b/gcell/lib/runtime/gc_jd_stack.c similarity index 60% rename from gcell/src/lib/runtime/gc_jd_stack.c rename to gcell/lib/runtime/gc_jd_stack.c index 0fffc0d1..4d865acf 100644 --- a/gcell/src/lib/runtime/gc_jd_stack.c +++ b/gcell/lib/runtime/gc_jd_stack.c @@ -19,8 +19,68 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "gc_jd_stack.h" -#include "memory_barrier.h" +#include +#include + +/* + * begin extract from ppu_intrinics.h + * FIXME handle this a different way + */ + +#if !defined(__PPU__) && !defined(__ppc__) && !defined(__ppc64__) + && !defined(__GNUC__) + #error ppu_intrinsics.h included on wrong platform/compiler +#endif + +#define __lwarx(base) __extension__ \ + ({unsigned int result; \ + typedef struct {char a[4];} wordsize; \ + wordsize *ptrp = (wordsize*)(base); \ + __asm__ volatile ("lwarx %0,%y1" \ + : "=r" (result) \ + : "Z" (*ptrp)); \ + result; }) + +#ifdef __powerpc64__ +#define __ldarx(base) __extension__ \ + ({unsigned long long result; \ + typedef struct {char a[8];} doublewordsize; \ + doublewordsize *ptrp = (doublewordsize*)(base); \ + __asm__ volatile ("ldarx %0,%y1" \ + : "=r" (result) \ + : "Z" (*ptrp)); \ + result; }) +#endif /* __powerpc64__ */ + +#define __stwcx(base, value) __extension__ \ + ({unsigned int result; \ + typedef struct {char a[4];} wordsize; \ + wordsize *ptrp = (wordsize*)(base); \ + __asm__ volatile ("stwcx. %2,%y1\n" \ + "\tmfocrf %0,0x80" \ + : "=r" (result), \ + "=Z" (*ptrp) \ + : "r" (value)); \ + ((result & 0x20000000) >> 29); }) + + +#ifdef __powerpc64__ +#define __stdcx(base, value) __extension__ \ + ({unsigned long long result; \ + typedef struct {char a[8];} doublewordsize; \ + doublewordsize *ptrp = (doublewordsize*)(base); \ + __asm__ volatile ("stdcx. %2,%y1\n" \ + "\tmfocrf %0,0x80" \ + : "=r" (result), \ + "=Z" (*ptrp) \ + : "r" (value)); \ + ((result & 0x20000000) >> 29); }) +#endif /* __powerpc64__ */ + + +/* + * --- end extract from ppu_intrinics.h -- + */ void diff --git a/gcell/src/lib/runtime/gc_job_manager.cc b/gcell/lib/runtime/gc_job_manager.cc similarity index 99% rename from gcell/src/lib/runtime/gc_job_manager.cc rename to gcell/lib/runtime/gc_job_manager.cc index ac2e989a..d96bc538 100644 --- a/gcell/src/lib/runtime/gc_job_manager.cc +++ b/gcell/lib/runtime/gc_job_manager.cc @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include "gc_job_manager.h" +#include #include "gc_job_manager_impl.h" #include #include diff --git a/gcell/src/lib/runtime/gc_job_manager_impl.cc b/gcell/lib/runtime/gc_job_manager_impl.cc similarity index 99% rename from gcell/src/lib/runtime/gc_job_manager_impl.cc rename to gcell/lib/runtime/gc_job_manager_impl.cc index 2b4b83f4..629019f4 100644 --- a/gcell/src/lib/runtime/gc_job_manager_impl.cc +++ b/gcell/lib/runtime/gc_job_manager_impl.cc @@ -22,15 +22,15 @@ #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include "gc_job_manager_impl.h" +#include +#include +#include #include -#include +#include #include #include #include -#include -#include #include #include #include diff --git a/gcell/src/lib/runtime/gc_job_manager_impl.h b/gcell/lib/runtime/gc_job_manager_impl.h similarity index 98% rename from gcell/src/lib/runtime/gc_job_manager_impl.h rename to gcell/lib/runtime/gc_job_manager_impl.h index fcc24dc0..dad7873a 100644 --- a/gcell/src/lib/runtime/gc_job_manager_impl.h +++ b/gcell/lib/runtime/gc_job_manager_impl.h @@ -22,11 +22,11 @@ #ifndef INCLUDED_GC_JOB_MANAGER_IMPL_H #define INCLUDED_GC_JOB_MANAGER_IMPL_H -#include "gc_job_manager.h" +#include +#include +#include +#include #include "gc_client_thread_info.h" -#include "gc_jd_stack.h" -#include "gc_jd_queue.h" -#include "gc_spu_args.h" #include #include #include diff --git a/gcell/src/lib/runtime/gc_proc_def_utils.cc b/gcell/lib/runtime/gc_proc_def_utils.cc similarity index 98% rename from gcell/src/lib/runtime/gc_proc_def_utils.cc rename to gcell/lib/runtime/gc_proc_def_utils.cc index c5b9848f..0250d677 100644 --- a/gcell/src/lib/runtime/gc_proc_def_utils.cc +++ b/gcell/lib/runtime/gc_proc_def_utils.cc @@ -24,7 +24,7 @@ #endif #include -#include +#include #include #include #include diff --git a/gcell/src/lib/runtime/gc_proc_def_utils.h b/gcell/lib/runtime/gc_proc_def_utils.h similarity index 97% rename from gcell/src/lib/runtime/gc_proc_def_utils.h rename to gcell/lib/runtime/gc_proc_def_utils.h index c59e472a..79c9b51a 100644 --- a/gcell/src/lib/runtime/gc_proc_def_utils.h +++ b/gcell/lib/runtime/gc_proc_def_utils.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_GC_PROC_DEF_UTILS_H #define INCLUDED_GC_PROC_DEF_UTILS_H -#include +#include #include /*! diff --git a/gcell/lib/runtime/gcell-embedspu-libtool b/gcell/lib/runtime/gcell-embedspu-libtool new file mode 100755 index 00000000..c206086a --- /dev/null +++ b/gcell/lib/runtime/gcell-embedspu-libtool @@ -0,0 +1,40 @@ +#!/bin/bash +# +# Take a spu executable and turn into into a libtool compatible .lo (and .o) file. +# This is needed when you want to embed a SPU executable into a shared library. +# +# The symbol assigned to the embedded executable is the basename of the +# output file with an _spx appended. E.g., if the output filename is +# my_spe_tricks.lo the symbol name is my_spe_tricks_spx. +# ("_spx" stands for SPE executable) + +if [ $# -ne 2 ]; then + echo "usage: gcell-embedspu-libtool spu_executable output_file.lo " 1>&2 + exit 1 +fi + +spu_executable=$1 +lo_file=$2 +symbol_name=${lo_file%%.lo}_spx + +# try to make .libs in case it's not there +mkdir .libs >/dev/null 2>/dev/null + +# generate the .o file that wraps the SPU executable +ppu-embedspu -m32 -fpic ${symbol_name} ${spu_executable} .libs/${symbol_name}.o + +# generate the .lo libtool file that points at all the right places +rm -f $lo_file +cat >$lo_file.new < -#include "gc_jd_queue.h" +#include #include diff --git a/gcell/src/lib/runtime/qa_jd_queue.h b/gcell/lib/runtime/qa_jd_queue.h similarity index 100% rename from gcell/src/lib/runtime/qa_jd_queue.h rename to gcell/lib/runtime/qa_jd_queue.h diff --git a/gcell/src/lib/runtime/qa_jd_stack.cc b/gcell/lib/runtime/qa_jd_stack.cc similarity index 98% rename from gcell/src/lib/runtime/qa_jd_stack.cc rename to gcell/lib/runtime/qa_jd_stack.cc index 67e97c9a..ce4ce2d0 100644 --- a/gcell/src/lib/runtime/qa_jd_stack.cc +++ b/gcell/lib/runtime/qa_jd_stack.cc @@ -21,7 +21,7 @@ #include "qa_jd_stack.h" #include -#include "gc_jd_stack.h" +#include #include diff --git a/gcell/src/lib/runtime/qa_jd_stack.h b/gcell/lib/runtime/qa_jd_stack.h similarity index 100% rename from gcell/src/lib/runtime/qa_jd_stack.h rename to gcell/lib/runtime/qa_jd_stack.h diff --git a/gcell/src/lib/runtime/qa_job_manager.cc b/gcell/lib/runtime/qa_job_manager.cc similarity index 98% rename from gcell/src/lib/runtime/qa_job_manager.cc rename to gcell/lib/runtime/qa_job_manager.cc index e37e3c37..45cf26cf 100644 --- a/gcell/src/lib/runtime/qa_job_manager.cc +++ b/gcell/lib/runtime/qa_job_manager.cc @@ -21,7 +21,7 @@ #include "qa_job_manager.h" #include -#include "gc_job_manager.h" +#include #include #include #include @@ -31,7 +31,7 @@ #include // handle to embedded SPU executable w/ QA routines -extern spe_program_handle_t gcell_runtime_qa; +extern spe_program_handle_t gcell_runtime_qa_spx; #if 0 static void @@ -177,7 +177,7 @@ qa_job_manager::t1_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); mgr = gc_make_job_manager(&opts); } @@ -186,7 +186,7 @@ qa_job_manager::t2_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 100; opts.gang_schedule = false; mgr = gc_make_job_manager(&opts); @@ -202,7 +202,7 @@ qa_job_manager::t3_body() #if 0 gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 100; opts.gang_schedule = true; CPPUNIT_ASSERT_THROW(mgr = gc_make_job_manager(&opts), std::out_of_range); @@ -223,7 +223,7 @@ qa_job_manager::t4_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); //mgr->set_debug(-1); @@ -262,7 +262,7 @@ qa_job_manager::t5_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 0; // use them all mgr = gc_make_job_manager(&opts); //mgr->set_debug(-1); @@ -297,7 +297,7 @@ qa_job_manager::t6_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); gc_proc_id_t gcp_qa_nop = mgr->lookup_proc("qa_nop"); @@ -375,7 +375,7 @@ qa_job_manager::t7_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); @@ -404,7 +404,7 @@ qa_job_manager::t8_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); gc_job_desc *jd = mgr->alloc_job_desc(); @@ -437,7 +437,7 @@ qa_job_manager::t9_body() static const int M = 201; gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); gc_job_desc *jd = mgr->alloc_job_desc(); @@ -548,7 +548,7 @@ qa_job_manager::t10_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); @@ -576,7 +576,7 @@ qa_job_manager::t11_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); gc_job_desc *jd = mgr->alloc_job_desc(); @@ -611,7 +611,7 @@ qa_job_manager::t12_body() static const int M = 201; gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); gc_job_desc *jd = mgr->alloc_job_desc(); @@ -659,7 +659,7 @@ qa_job_manager::t13_body() { gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); @@ -729,7 +729,7 @@ qa_job_manager::t14_body() gc_job_manager_sptr mgr; gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; mgr = gc_make_job_manager(&opts); @@ -778,7 +778,7 @@ void qa_job_manager::t15_body() { gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx); opts.nspes = 1; gc_job_manager_sptr mgr = gc_make_job_manager(&opts); diff --git a/gcell/src/lib/runtime/qa_job_manager.h b/gcell/lib/runtime/qa_job_manager.h similarity index 100% rename from gcell/src/lib/runtime/qa_job_manager.h rename to gcell/lib/runtime/qa_job_manager.h diff --git a/gcell/src/lib/runtime/spu/gc_delay.c b/gcell/lib/runtime/spu/gc_delay.c similarity index 96% rename from gcell/src/lib/runtime/spu/gc_delay.c rename to gcell/lib/runtime/spu/gc_delay.c index 21ee587f..4d58935a 100644 --- a/gcell/src/lib/runtime/spu/gc_delay.c +++ b/gcell/lib/runtime/spu/gc_delay.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "gc_delay.h" -#include +#include +#include inline static void gc_udelay_1us(void) diff --git a/gcell/src/lib/runtime/spu/gc_logging.c b/gcell/lib/runtime/spu/gc_logging.c similarity index 97% rename from gcell/src/lib/runtime/spu/gc_logging.c rename to gcell/lib/runtime/spu/gc_logging.c index 65a53750..48b7e5f2 100644 --- a/gcell/src/lib/runtime/spu/gc_logging.c +++ b/gcell/lib/runtime/spu/gc_logging.c @@ -19,10 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include +#include #include #include -#include static gc_eaddr_t log_base_ea; // base address of log entries in EA static uint32_t log_idx_mask; // nentries - 1 diff --git a/gcell/src/lib/runtime/spu/gc_main.c b/gcell/lib/runtime/spu/gc_main.c similarity index 98% rename from gcell/src/lib/runtime/spu/gc_main.c rename to gcell/lib/runtime/spu/gc_main.c index 1e5b03de..0866c3c3 100644 --- a/gcell/src/lib/runtime/spu/gc_main.c +++ b/gcell/lib/runtime/spu/gc_main.c @@ -25,14 +25,15 @@ #include #include #include "gc_spu_config.h" -#include "gc_spu_args.h" -#include "gc_job_desc.h" -#include "gc_mbox.h" -#include "gc_jd_queue.h" -#include "gc_delay.h" -#include "gc_declare_proc.h" -#include "gc_random.h" #include "spu_buffers.h" +#include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/gcell/src/lib/runtime/spu/gc_random.c b/gcell/lib/runtime/spu/gc_random.c similarity index 97% rename from gcell/src/lib/runtime/spu/gc_random.c rename to gcell/lib/runtime/spu/gc_random.c index 618cc7eb..214309b5 100644 --- a/gcell/src/lib/runtime/spu/gc_random.c +++ b/gcell/lib/runtime/spu/gc_random.c @@ -18,7 +18,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include static int last_val = 0; diff --git a/gcell/src/lib/runtime/spu/gc_spu_config.h b/gcell/lib/runtime/spu/gc_spu_config.h similarity index 88% rename from gcell/src/lib/runtime/spu/gc_spu_config.h rename to gcell/lib/runtime/spu/gc_spu_config.h index 6eff7106..d0b131e8 100644 --- a/gcell/src/lib/runtime/spu/gc_spu_config.h +++ b/gcell/lib/runtime/spu/gc_spu_config.h @@ -18,10 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef INCLUDED_GC_SPU_CONFIG_H -#define INCLUDED_GC_SPU_CONFIG_H +#ifndef INCLUDED_GCELL_GC_SPU_CONFIG_H +#define INCLUDED_GCELL_GC_SPU_CONFIG_H -#include +#include #define CACHE_LINE_SIZE 128 // in bytes #define GC_SPU_BUFSIZE_BASE (40 * 1024) // must be multiple of CACHE_LINE_SIZE @@ -30,4 +30,4 @@ #define NGETBUFS 1 // single buffer job arg gets #define NPUTBUFS 2 // double buffer job arg puts -#endif /* INCLUDED_GC_SPU_CONFIG_H */ +#endif /* INCLUDED_GCELL_GC_SPU_CONFIG_H */ diff --git a/gcell/src/lib/runtime/spu/gc_spu_jd_queue.c b/gcell/lib/runtime/spu/gc_spu_jd_queue.c similarity index 96% rename from gcell/src/lib/runtime/spu/gc_spu_jd_queue.c rename to gcell/lib/runtime/spu/gc_spu_jd_queue.c index 6fa2d6af..42deac34 100644 --- a/gcell/src/lib/runtime/spu/gc_spu_jd_queue.c +++ b/gcell/lib/runtime/spu/gc_spu_jd_queue.c @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "gc_jd_queue.h" +#include +#include +#include #include "mutex_lock.h" #include "mutex_unlock.h" -#include "gc_delay.h" -#include "gc_random.h" #define MIN(a,b) ((a) < (b) ? (a) : (b)) diff --git a/gcell/src/lib/runtime/spu/gcell_runtime_qa.c b/gcell/lib/runtime/spu/gcell_runtime_qa.c similarity index 97% rename from gcell/src/lib/runtime/spu/gcell_runtime_qa.c rename to gcell/lib/runtime/spu/gcell_runtime_qa.c index ac442731..47a4b5b5 100644 --- a/gcell/src/lib/runtime/spu/gcell_runtime_qa.c +++ b/gcell/lib/runtime/spu/gcell_runtime_qa.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include diff --git a/gcell/src/lib/runtime/spu/spu_buffers.c b/gcell/lib/runtime/spu/spu_buffers.c similarity index 95% rename from gcell/src/lib/runtime/spu/spu_buffers.c rename to gcell/lib/runtime/spu/spu_buffers.c index 58b40593..29ae99d9 100644 --- a/gcell/src/lib/runtime/spu/spu_buffers.c +++ b/gcell/lib/runtime/spu/spu_buffers.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include "spu_buffers.h" +#include static unsigned char _getbuf[NGETBUFS][GC_SPU_BUFSIZE] _AL128; static unsigned char _putbuf[NPUTBUFS][GC_SPU_BUFSIZE] _AL128; diff --git a/gcell/src/lib/runtime/spu/spu_buffers.h b/gcell/lib/runtime/spu/spu_buffers.h similarity index 100% rename from gcell/src/lib/runtime/spu/spu_buffers.h rename to gcell/lib/runtime/spu/spu_buffers.h diff --git a/gcell/src/lib/spu/Makefile.am b/gcell/lib/spu/Makefile.am similarity index 89% rename from gcell/src/lib/spu/Makefile.am rename to gcell/lib/spu/Makefile.am index 7c8e411f..5afa40e3 100644 --- a/gcell/src/lib/spu/Makefile.am +++ b/gcell/lib/spu/Makefile.am @@ -29,10 +29,10 @@ include $(top_srcdir)/Makefile.common.spu -IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/spu_source +IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/spu_source AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES) -lib_LIBRARIES = libgcell_spu.a +libspu_LIBRARIES = libgcell_spu.a # ---------------------------------------------------------------- # files in the lib/runtime/spu directory @@ -63,13 +63,17 @@ general_spu_sources = \ $(general_srcdir)/fft_1d_r2.c \ $(general_srcdir)/memset.S -general_spu_headers = \ - $(general_srcdir)/gc_spu_macs.h \ - $(general_srcdir)/libfft.h +general_spu_headers = +# These now live in include/gcell/spu +#general_spu_headers = \ +# $(general_srcdir)/gc_spu_macs.h \ +# $(general_srcdir)/libfft.h -general_spu_noinst_headers = \ - $(general_srcdir)/fft_1d.h \ - $(general_srcdir)/fft_1d_r2.h +general_spu_noinst_headers = +# As do these +#general_spu_noinst_headers = \ +# $(general_srcdir)/fft_1d.h \ +# $(general_srcdir)/fft_1d_r2.h # The QA code for (usually) non-PPE visible support routines in lib/general/spu general_spu_qa_sources = \ @@ -108,8 +112,10 @@ noinst_HEADERS = \ # ---------------------------------------------------------------- # build some SPU executables +libspu_PROGRAMS = \ + gcell_all + noinst_PROGRAMS = \ - gcell_all \ gcell_runtime_qa \ gcell_general_qa diff --git a/gcell/src/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am similarity index 91% rename from gcell/src/lib/wrapper/Makefile.am rename to gcell/lib/wrapper/Makefile.am index 8d92b7b0..5a8e328c 100644 --- a/gcell/src/lib/wrapper/Makefile.am +++ b/gcell/lib/wrapper/Makefile.am @@ -28,10 +28,10 @@ noinst_LTLIBRARIES = libwrapper.la libwrapper-qa.la # generate libtool.lo's that contain embedded SPU executables # gcell_all.lo: ../spu/gcell_all - $(GCELL_EMBEDSPU_LIBTOOL) $@ $< + $(GCELL_EMBEDSPU_LIBTOOL) $< $@ gcell_general_qa.lo: ../spu/gcell_general_qa - $(GCELL_EMBEDSPU_LIBTOOL) $@ $< + $(GCELL_EMBEDSPU_LIBTOOL) $< $@ @@ -57,8 +57,9 @@ libwrapper_qa_la_LIBADD = \ # Headers -gcellinclude_HEADERS = \ - gcp_fft_1d_r2.h +# Moved to include/gcell +#gcellinclude_HEADERS = \ +# gcp_fft_1d_r2.h noinst_HEADERS = \ qa_gcell_general.h \ diff --git a/gcell/src/lib/wrapper/gcp_fft_1d_r2.cc b/gcell/lib/wrapper/gcp_fft_1d_r2.cc similarity index 99% rename from gcell/src/lib/wrapper/gcp_fft_1d_r2.cc rename to gcell/lib/wrapper/gcp_fft_1d_r2.cc index 07267e30..9e7e00f4 100644 --- a/gcell/src/lib/wrapper/gcp_fft_1d_r2.cc +++ b/gcell/lib/wrapper/gcp_fft_1d_r2.cc @@ -21,7 +21,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include #include #include diff --git a/gcell/src/lib/wrapper/qa_gcell_general.cc b/gcell/lib/wrapper/qa_gcell_general.cc similarity index 95% rename from gcell/src/lib/wrapper/qa_gcell_general.cc rename to gcell/lib/wrapper/qa_gcell_general.cc index de48201e..af971981 100644 --- a/gcell/src/lib/wrapper/qa_gcell_general.cc +++ b/gcell/lib/wrapper/qa_gcell_general.cc @@ -26,11 +26,11 @@ #include // random, posix_memalign #include #include -#include +#include // handle to embedded SPU executable -extern spe_program_handle_t gcell_general_qa; +extern spe_program_handle_t gcell_general_qa_spx; gc_job_desc_sptr gcp_qa_general_submit(gc_job_manager_sptr mgr, const std::string &proc_name) @@ -55,7 +55,7 @@ bool qa_gcell_general::generic_test_body(const std::string &proc_name) { gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_general_qa); + opts.program_handle = gc_program_handle_from_address(&gcell_general_qa_spx); opts.nspes = 1; gc_job_manager_sptr mgr = gc_make_job_manager(&opts); diff --git a/gcell/src/lib/wrapper/qa_gcell_general.h b/gcell/lib/wrapper/qa_gcell_general.h similarity index 100% rename from gcell/src/lib/wrapper/qa_gcell_general.h rename to gcell/lib/wrapper/qa_gcell_general.h diff --git a/gcell/src/lib/wrapper/qa_gcell_wrapper.cc b/gcell/lib/wrapper/qa_gcell_wrapper.cc similarity index 100% rename from gcell/src/lib/wrapper/qa_gcell_wrapper.cc rename to gcell/lib/wrapper/qa_gcell_wrapper.cc diff --git a/gcell/src/lib/wrapper/qa_gcell_wrapper.h b/gcell/lib/wrapper/qa_gcell_wrapper.h similarity index 100% rename from gcell/src/lib/wrapper/qa_gcell_wrapper.h rename to gcell/lib/wrapper/qa_gcell_wrapper.h diff --git a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc similarity index 98% rename from gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc rename to gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc index dbbe05fb..742c624d 100644 --- a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc +++ b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc @@ -21,7 +21,7 @@ #include "qa_gcp_fft_1d_r2.h" #include -#include +#include #include #include #include // random, posix_memalign @@ -31,7 +31,7 @@ typedef boost::shared_ptr void_sptr; // handle to embedded SPU executable -extern spe_program_handle_t gcell_all; +extern spe_program_handle_t gcell_all_spx; /* * Return pointer to cache-aligned chunk of storage of size size bytes. @@ -68,7 +68,7 @@ void qa_gcp_fft_1d_r2::t1() { gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_all); + opts.program_handle = gc_program_handle_from_address(&gcell_all_spx); opts.nspes = 1; gc_job_manager_sptr mgr = gc_make_job_manager(&opts); @@ -86,7 +86,7 @@ void qa_gcp_fft_1d_r2::t2() { gc_jm_options opts; - opts.program_handle = gc_program_handle_from_address(&gcell_all); + opts.program_handle = gc_program_handle_from_address(&gcell_all_spx); opts.nspes = 1; gc_job_manager_sptr mgr = gc_make_job_manager(&opts); diff --git a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.h b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h similarity index 97% rename from gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.h rename to gcell/lib/wrapper/qa_gcp_fft_1d_r2.h index 38beafb2..339ddd25 100644 --- a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.h +++ b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h @@ -23,7 +23,7 @@ #include #include -#include +#include class qa_gcp_fft_1d_r2 : public CppUnit::TestCase { diff --git a/gcell/src/lib/wrapper/spu/gcs_fft_1d_r2.c b/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c similarity index 97% rename from gcell/src/lib/wrapper/spu/gcs_fft_1d_r2.c rename to gcell/lib/wrapper/spu/gcs_fft_1d_r2.c index 81e5dfd8..582757ab 100644 --- a/gcell/src/lib/wrapper/spu/gcs_fft_1d_r2.c +++ b/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include /* diff --git a/gcell/src/lib/runtime/gcell-embedspu-libtool b/gcell/src/lib/runtime/gcell-embedspu-libtool deleted file mode 100755 index a4ee53b7..00000000 --- a/gcell/src/lib/runtime/gcell-embedspu-libtool +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ $# -ne 2 ]; then - echo "usage: gcell-embedspu-libtool file.lo spu_executable_file" 1>&2 - exit 1 -fi - -lo_file=$1 -spu_executable=$2 -symbol_name=${lo_file%%.lo} - -# generate the .o file that wraps the SPU executable -ppu-embedspu -m32 -fpic ${symbol_name} ${spu_executable} .libs/${symbol_name}.o - -# generate the .lo libtool file that points at all the right places -rm -f $lo_file -cat >$lo_file.new < -#include +#include #include %} diff --git a/gr-gcell/src/gcell_fft_vcc.cc b/gr-gcell/src/gcell_fft_vcc.cc index b53f0c33..8bbcfb2b 100644 --- a/gr-gcell/src/gcell_fft_vcc.cc +++ b/gr-gcell/src/gcell_fft_vcc.cc @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/gr-gcell/src/qa_fft.py b/gr-gcell/src/qa_fft.py index d95b76c4..88a4f520 100755 --- a/gr-gcell/src/qa_fft.py +++ b/gr-gcell/src/qa_fft.py @@ -33,7 +33,7 @@ primes = (2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53, class test_fft_filter(gr_unittest.TestCase): def setUp(self): - ph = gcell.program_handle_from_filename("../../gcell/src/lib/spu/gcell_all") + ph = gcell.program_handle_from_filename("../../gcell/lib/spu/gcell_all") opts = gcell.jm_options(ph, 1) self.mgr = gcell.job_manager(opts) gcell.set_singleton(self.mgr) -- 2.30.2