From 2e30a853f257252c98bb9edcb55ad95274931cde Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 02:27:34 -0500 Subject: [PATCH 1/6] Makefile sets HAVE_CONFIG_H so use it. --- src/ffts_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ffts_internal.h b/src/ffts_internal.h index b74ae348858..1825224f170 100644 --- a/src/ffts_internal.h +++ b/src/ffts_internal.h @@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef FFTS_INTERNAL_H #define FFTS_INTERNAL_H -#ifdef AUTOTOOLS_BUILD +#ifdef HAVE_CONFIG_H #include "config.h" #endif From 8d2bb45ecfc291e620924d3fb358ff3afa13811e Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 02:39:45 -0500 Subject: [PATCH 2/6] compiler could not find ffts.h --- src/Makefile.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 2002ad8ffd2..737a2ed3afd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -134,10 +134,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libffts_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libffts_la_LIBADD = -am__libffts_la_SOURCES_DIST = ffts.c ffts_small.c ffts_nd.c \ +am__libffts_la_SOURCES_DIST = ffts.c ffts_chirp_z.c ffts_nd.c \ ffts_real.c ffts_real_nd.c patterns.c codegen.h codegen_arm.h \ codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h \ - ffts_small.h ffts_static.h macros-alpha.h macros-altivec.h \ + ffts_chirp_z.h ffts_static.h macros-alpha.h macros-altivec.h \ macros-neon.h macros-sse.h macros.h neon.h neon_float.h \ patterns.h types.h vfp.h ffts_static.c codegen.c vfp.s neon.s \ neon_static_f.s neon_static_i.s sse.s @@ -149,7 +149,7 @@ am__libffts_la_SOURCES_DIST = ffts.c ffts_small.c ffts_nd.c \ @DYNAMIC_DISABLED_TRUE@@HAVE_NEON_TRUE@@HAVE_VFP_FALSE@ neon_static_i.lo @HAVE_NEON_FALSE@@HAVE_SSE_TRUE@@HAVE_VFP_FALSE@am__objects_6 = \ @HAVE_NEON_FALSE@@HAVE_SSE_TRUE@@HAVE_VFP_FALSE@ sse.lo -am_libffts_la_OBJECTS = ffts.lo ffts_small.lo ffts_nd.lo ffts_real.lo \ +am_libffts_la_OBJECTS = ffts.lo ffts_chirp_z.lo ffts_nd.lo ffts_real.lo \ ffts_real_nd.lo patterns.lo $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) @@ -170,7 +170,7 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -360,10 +360,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libffts.la -libffts_la_SOURCES = ffts.c ffts_small.c ffts_nd.c ffts_real.c \ +libffts_la_SOURCES = ffts.c ffts_chirp_z.c ffts_nd.c ffts_real.c \ ffts_real_nd.c patterns.c codegen.h codegen_arm.h \ codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h \ - ffts_small.h ffts_static.h macros-alpha.h macros-altivec.h \ + ffts_chirp_z.h ffts_static.h macros-alpha.h macros-altivec.h \ macros-neon.h macros-sse.h macros.h neon.h neon_float.h \ patterns.h types.h vfp.h $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) \ From c76b0dd7e4fbe481b6f8c975e89d8289686a6405 Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 03:04:14 -0500 Subject: [PATCH 3/6] typo fix. --- src/ffts_trig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ffts_trig.c b/src/ffts_trig.c index 1094be4d8f7..cd59d9f82f3 100644 --- a/src/ffts_trig.c +++ b/src/ffts_trig.c @@ -881,7 +881,7 @@ int ffts_generate_cosine_sine_pow2_32f(ffts_cpx_32f *const table, int table_size) { const ffts_cpx_64f *FFTS_RESTRICT ct; - const double_t *FFTS_RESTRICT hs; + const ffts_double_t *FFTS_RESTRICT hs; ffts_cpx_64f FFTS_ALIGN(16) w[32]; int i, log_2, offset; @@ -1136,4 +1136,4 @@ ffts_generate_table_1d_real_32f(struct _ffts_plan_t *const p, } return 0; -} \ No newline at end of file +} From 59fc90698037522aefebf701eee91dc9e5a2aae5 Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 03:09:27 -0500 Subject: [PATCH 4/6] fix non-sse use case. --- tests/test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test.c b/tests/test.c index d07f766680b..20ea36d0d7c 100644 --- a/tests/test.c +++ b/tests/test.c @@ -37,6 +37,8 @@ #ifdef HAVE_SSE #include +#else +#include #endif #include From 4add0e0cadd1136d59ef38d103e9e77414ec845e Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 03:10:53 -0500 Subject: [PATCH 5/6] Remove non-existent ffts_small.c and patterns.c; add missing chirp, trig, and static. --- src/Makefile.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 737a2ed3afd..ac55d1d6fd5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -134,11 +134,11 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libffts_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libffts_la_LIBADD = -am__libffts_la_SOURCES_DIST = ffts.c ffts_chirp_z.c ffts_nd.c \ - ffts_real.c ffts_real_nd.c patterns.c codegen.h codegen_arm.h \ +am__libffts_la_SOURCES_DIST = ffts.c ffts_chirp_z.c ffts_nd.c ffts_static.c \ + ffts_real.c ffts_real_nd.c ffts_trig.c codegen.h codegen_arm.h \ codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h \ ffts_chirp_z.h ffts_static.h macros-alpha.h macros-altivec.h \ - macros-neon.h macros-sse.h macros.h neon.h neon_float.h \ + ffts_trig.h macros-neon.h macros-sse.h macros.h neon.h neon_float.h \ patterns.h types.h vfp.h ffts_static.c codegen.c vfp.s neon.s \ neon_static_f.s neon_static_i.s sse.s @DYNAMIC_DISABLED_TRUE@am__objects_1 = ffts_static.lo @@ -150,7 +150,8 @@ am__libffts_la_SOURCES_DIST = ffts.c ffts_chirp_z.c ffts_nd.c \ @HAVE_NEON_FALSE@@HAVE_SSE_TRUE@@HAVE_VFP_FALSE@am__objects_6 = \ @HAVE_NEON_FALSE@@HAVE_SSE_TRUE@@HAVE_VFP_FALSE@ sse.lo am_libffts_la_OBJECTS = ffts.lo ffts_chirp_z.lo ffts_nd.lo ffts_real.lo \ - ffts_real_nd.lo patterns.lo $(am__objects_1) $(am__objects_2) \ + ffts_real_nd.lo ffts_trig.lo ffts_static.lo \ + $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) libffts_la_OBJECTS = $(am_libffts_la_OBJECTS) @@ -361,9 +362,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libffts.la libffts_la_SOURCES = ffts.c ffts_chirp_z.c ffts_nd.c ffts_real.c \ - ffts_real_nd.c patterns.c codegen.h codegen_arm.h \ + ffts_real_nd.c ffts_trig.c ffts_trig.h codegen.h codegen_arm.h \ codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h \ - ffts_chirp_z.h ffts_static.h macros-alpha.h macros-altivec.h \ + ffts_chirp_z.h ffts_static.c ffts_static.h macros-alpha.h macros-altivec.h \ macros-neon.h macros-sse.h macros.h neon.h neon_float.h \ patterns.h types.h vfp.h $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) \ @@ -454,9 +455,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_nd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_real.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_real_nd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_small.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_chirp_z.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_static.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterns.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffts_trig.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< From e4e2c36fbd181d1f00eff694a68ed230258748e5 Mon Sep 17 00:00:00 2001 From: unitrunker Date: Tue, 4 Sep 2018 03:16:22 -0500 Subject: [PATCH 6/6] test.c was oblivious to config.h --- tests/test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test.c b/tests/test.c index 20ea36d0d7c..72e0581f7d6 100644 --- a/tests/test.c +++ b/tests/test.c @@ -32,6 +32,10 @@ #include "../include/ffts.h" #include "../src/ffts_attributes.h" +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + #ifdef __ARM_NEON__ #endif