Skip to content

Fixing minor nits for the win. #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fixing minor nits for the win. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e30a85
Makefile sets HAVE_CONFIG_H so use it.
gh308 Sep 4, 2018
8d2bb45
compiler could not find ffts.h
gh308 Sep 4, 2018
c76b0dd
typo fix.
gh308 Sep 4, 2018
59fc906
fix non-sse use case.
gh308 Sep 4, 2018
4add0e0
Remove non-existent ffts_small.c and patterns.c; add missing chirp, t…
gh308 Sep 4, 2018
e4e2c36
test.c was oblivious to config.h
gh308 Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_small.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_small.h ffts_static.h macros-alpha.h macros-altivec.h \
macros-neon.h macros-sse.h macros.h neon.h neon_float.h \
ffts_chirp_z.h ffts_static.h macros-alpha.h macros-altivec.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
Expand All @@ -149,8 +149,9 @@ 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 \
ffts_real_nd.lo patterns.lo $(am__objects_1) $(am__objects_2) \
am_libffts_la_OBJECTS = ffts.lo ffts_chirp_z.lo ffts_nd.lo ffts_real.lo \
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)
Expand All @@ -170,7 +171,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
Expand Down Expand Up @@ -360,10 +361,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 \
ffts_real_nd.c patterns.c codegen.h codegen_arm.h \
libffts_la_SOURCES = ffts.c ffts_chirp_z.c ffts_nd.c ffts_real.c \
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_small.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) \
Expand Down Expand Up @@ -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 $@ $<
Expand Down
2 changes: 1 addition & 1 deletion src/ffts_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/ffts_trig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -1136,4 +1136,4 @@ ffts_generate_table_1d_real_32f(struct _ffts_plan_t *const p,
}

return 0;
}
}
6 changes: 6 additions & 0 deletions tests/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,17 @@
#include "../include/ffts.h"
#include "../src/ffts_attributes.h"

#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif

#ifdef __ARM_NEON__
#endif

#ifdef HAVE_SSE
#include <xmmintrin.h>
#else
#include <unistd.h>
#endif

#include <stdio.h>
Expand Down