diff options
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/Makefile.am | 18 | ||||
| -rw-r--r-- | volk/include/volk/machines.xml | 2 | ||||
| -rw-r--r-- | volk/include/volk/make_c.py | 14 | ||||
| -rw-r--r-- | volk/include/volk/make_each_machine_c.py | 6 | ||||
| -rw-r--r-- | volk/include/volk/make_machines_c.py | 6 | ||||
| -rw-r--r-- | volk/include/volk/make_machines_h.py | 4 | ||||
| -rw-r--r-- | volk/include/volk/make_makefile_am.py | 48 | ||||
| -rwxr-xr-x | volk/include/volk/volk_register.py | 6 |
8 files changed, 39 insertions, 65 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index caf707138..876bb7a60 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -25,15 +25,10 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \ volkincludedir = $(prefix)/include/volk -BUILT_SOURCES: \ - volk_tables.h - volkinclude_HEADERS = \ volk_complex.h \ volk_common.h \ volk_config_fixed.h \ - volk_runtime.h \ - volk_tables.h \ volk_typedefs.h \ volk_registry.h \ volk.h \ @@ -128,19 +123,6 @@ volkinclude_HEADERS = \ volk_8i_s32f_convert_32f_a16.h \ volk_8i_s32f_convert_32f_u.h -VOLK_MKTABLES_SOURCES = \ - $(platform_CODE) \ - $(top_srcdir)/lib/volk_rank_archs.c \ - $(top_srcdir)/lib/volk_mktables.c \ - $(top_srcdir)/lib/volk_cpu.c - - -volk_mktables$(EXEEXT): $(VOLK_MKTABLES_SOURCES) - $(CC) -o $@ $^ $(AM_CPPFLAGS) -I$(top_builddir)/include - -volk_tables.h: volk_mktables$(EXEEXT) - ./volk_mktables$(EXEEXT) - distclean-local: rm -f volk_config_fixed.h rm -f volk_cpu.h diff --git a/volk/include/volk/machines.xml b/volk/include/volk/machines.xml index 8eed9e8d7..ad71da177 100644 --- a/volk/include/volk/machines.xml +++ b/volk/include/volk/machines.xml @@ -4,6 +4,7 @@ <archs>generic</archs> </machine> +<!-- <machine name="mmx"> <archs>generic 32|64 mmx</archs> </machine> @@ -11,6 +12,7 @@ <machine name="sse"> <archs>generic 32|64 mmx sse</archs> </machine> +--> <machine name="sse2"> <archs>generic 32|64 mmx sse sse2</archs> diff --git a/volk/include/volk/make_c.py b/volk/include/volk/make_c.py index 5f6669e40..7cb0616c8 100644 --- a/volk/include/volk/make_c.py +++ b/volk/include/volk/make_c.py @@ -28,13 +28,13 @@ def make_c(machines, archs, functions, arched_arglist, my_arglist): // Do not edit this file. """ tempstring += """ -#include <volk_common.h> -#include <volk_machines.h> -#include <volk_registry.h> -#include <volk_typedefs.h> -#include <volk_cpu.h> -#include <volk_rank_archs.h> -#include <volk.h> +#include <volk/volk_common.h> +#include <volk/volk_machines.h> +#include <volk/volk_registry.h> +#include <volk/volk_typedefs.h> +#include <volk/volk_cpu.h> +#include "volk_rank_archs.h" +#include <volk/volk.h> #include <stdio.h> """ diff --git a/volk/include/volk/make_each_machine_c.py b/volk/include/volk/make_each_machine_c.py index abf4bb2d5..866e18bc3 100644 --- a/volk/include/volk/make_each_machine_c.py +++ b/volk/include/volk/make_each_machine_c.py @@ -31,9 +31,9 @@ def make_each_machine_c(machine_name, archs, functions, fcountlist, taglist): tempstring += "#define LV_HAVE_" + arch.swapcase() + " 1\n" tempstring += """ -#include <volk_common.h> -#include <volk_machines.h> -#include <volk_registry.h> +#include <volk/volk_common.h> +#include <volk/volk_machines.h> +#include <volk/volk_registry.h> """ for func in functions: diff --git a/volk/include/volk/make_machines_c.py b/volk/include/volk/make_machines_c.py index 12eabf98d..9ad56fb62 100644 --- a/volk/include/volk/make_machines_c.py +++ b/volk/include/volk/make_machines_c.py @@ -22,9 +22,9 @@ def make_machines_c(machines): // This file is automatically generated by make_machines_c.py. // Do not edit this file. -#include <volk_common.h> -#include <volk_typedefs.h> -#include <volk_machines.h> +#include <volk/volk_common.h> +#include <volk/volk_typedefs.h> +#include <volk/volk_machines.h> struct volk_machine volk_machines[] = { """ diff --git a/volk/include/volk/make_machines_h.py b/volk/include/volk/make_machines_h.py index 68cdf3363..674ee12cd 100644 --- a/volk/include/volk/make_machines_h.py +++ b/volk/include/volk/make_machines_h.py @@ -25,8 +25,8 @@ def make_machines_h(functions, machines): #ifndef INCLUDED_LIBVOLK_MACHINES_H #define INCLUDED_LIBVOLK_MACHINES_H -#include <volk_common.h> -#include <volk_typedefs.h> +#include <volk/volk_common.h> +#include <volk/volk_typedefs.h> struct volk_machine { const unsigned int caps; //capabilities (i.e., archs compiled into this machine, in the volk_get_lvarch format) diff --git a/volk/include/volk/make_makefile_am.py b/volk/include/volk/make_makefile_am.py index 1c4c8fe7d..2c9ef8fb6 100644 --- a/volk/include/volk/make_makefile_am.py +++ b/volk/include/volk/make_makefile_am.py @@ -24,20 +24,14 @@ def make_makefile_am(dom, machines, archflags_dict): include $(top_srcdir)/Makefile.common -#FIXME: forcing the top_builddir for distcheck seems like a bit -# of a hack. Figure out the right way to do this to find built -# volk_config.h and volk_tables.h - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \ -I$(top_builddir)/include \ $(WITH_INCLUDES) lib_LTLIBRARIES = \ - libvolk.la \ - libvolk_runtime.la + libvolk.la EXTRA_DIST = \ - volk_mktables.c \ volk_rank_archs.h \ volk_proccpu_sim.c \ gcc_x86_cpuid.h @@ -46,16 +40,14 @@ EXTRA_DIST = \ # The main library # ---------------------------------------------------------------- -libvolk_runtime_la_SOURCES = \ +libvolk_la_SOURCES = \ $(platform_CODE) \ - volk_runtime.c \ + volk.cc \ + volk_cpu.c \ volk_rank_archs.c \ - volk_cpu.c + volk_machines.cc -libvolk_la_SOURCES = \ - $(platform_CODE) \ - volk.c \ - volk_environment_init.c +libvolk_la_LDFLAGS = volk_orc_LDFLAGS = \ $(ORC_LDFLAGS) \ @@ -66,31 +58,31 @@ volk_orc_LIBADD = \ """ - #here be dragons + #here be dragons + tempstring += "libvolk_la_LIBADD = \n" + tempstring += "libvolk_la_CPPFLAGS = $(AM_CPPFLAGS)\n" + tempstring += "noinst_LTLIBRARIES = \n" for machine_name in machines: tempstring += "if LV_MACHINE_" + machine_name.swapcase() + "\n" - tempstring += "libvolk_" + machine_name + "_ar_LDFLAGS = " + tempstring += "libvolk_" + machine_name + "_la_SOURCES = volk_machine_" + machine_name + ".cc\n" + tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_builddir)/include " for arch in machines[machine_name]: if archflags_dict[arch] != "none": tempstring += "-" + archflags_dict[arch] + " " -# tempstring += "\nlibvolk_" + machine_name + "_ar_CFLAGS = " -# for arch in machines[machine_name]: -# tempstring += "-DLV_HAVE_" + arch.swapcase() + " " - tempstring += "\nlibvolk_" + machine_name + "_ar_SOURCES = libvolk_machine_" + machine_name + ".cc" - tempstring += "\nlibvolk_la_LIBADD = libvolk_" + machine_name + ".ar" + tempstring += "\nnoinst_LTLIBRARIES += libvolk_" + machine_name + ".la " + tempstring += "\nlibvolk_la_LIBADD += libvolk_" + machine_name + ".la\n" + tempstring += "libvolk_la_CPPFLAGS += -DLV_MACHINE_" + machine_name.swapcase() + " " tempstring += "\nendif\n" tempstring += """ if LV_HAVE_ORC -libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS) -libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS) -libvolk_la_LIBADD = $(volk_orc_LIBADD) +libvolk_la_LDFLAGS += $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS) +libvolk_la_LIBADD += $(volk_orc_LIBADD) else -libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -libvolk_la_LIBADD = +libvolk_la_LDFLAGS += $(NO_UNDEFINED) -version-info 0:0:0 +libvolk_la_LIBADD += endif @@ -125,7 +117,6 @@ testqa_LDFLAGS = $(BOOST_UNIT_TEST_FRAMEWORK_LIB) if LV_HAVE_ORC testqa_LDADD = \ libvolk.la \ - libvolk_runtime.la \ ../orc/libvolk_orc.la else testqa_LDADD = \ @@ -141,7 +132,6 @@ distclean-local: rm -f volk_init.h rm -f volk_mktables.c rm -f volk_proccpu_sim.c - rm -f volk_runtime.c rm -f volk_tables.h rm -f volk_environment_init.c """ diff --git a/volk/include/volk/volk_register.py b/volk/include/volk/volk_register.py index 437fb33b1..a319e9dad 100755 --- a/volk/include/volk/volk_register.py +++ b/volk/include/volk/volk_register.py @@ -24,7 +24,7 @@ import copy outfile_set_simd = open("../../config/lv_set_simd_flags.m4", "w"); outfile_reg = open("volk_registry.h", "w"); outfile_h = open("volk.h", "w"); -outfile_c = open("../../lib/volk.c", "w"); +outfile_c = open("../../lib/volk.cc", "w"); outfile_typedefs = open("volk_typedefs.h", "w"); outfile_init_h = open("../../lib/volk_init.h", "w"); outfile_cpu_h = open("volk_cpu.h", "w"); @@ -36,7 +36,7 @@ outfile_environment_c = open("../../lib/volk_environment_init.c", "w"); outfile_environment_h = open("volk_environment_init.h", "w"); outfile_makefile_am = open("../../lib/Makefile.am", "w"); outfile_machines_h = open("volk_machines.h", "w"); -outfile_machines_c = open("../../lib/volk_machines.c", "w"); +outfile_machines_c = open("../../lib/volk_machines.cc", "w"); infile = open("Makefile.am", "r"); @@ -285,7 +285,7 @@ outfile_h.write(make_h(functions)) outfile_h.close() for machine in machines: - machine_c_filename = "../../lib/volk_machine_" + machine + ".c" + machine_c_filename = "../../lib/volk_machine_" + machine + ".cc" outfile_machine_c = open(machine_c_filename, "w") outfile_machine_c.write(make_each_machine_c(machine, machines[machine], functions, fcountlist, taglist)) outfile_machine_c.close() |