Skip to content
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

Jump to bottom

Changed the file structure #140

Closed
wants to merge 3 commits into from
Closed

Changed the file structure #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
600b0c9
Update .gitignore for the new file structure
snake-4 Jul 27, 2021
e287f22
Made cpu_features into a submodule
snake-4 Jul 27, 2021
1b21ab7
Changed the file structure, modified the...
snake-4 Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Changed the file structure, modified the... 
Makefile and starch template files in order to change the file structure.
  • Loading branch information
@snake-4
snake-4 committed Jul 27, 2021
commit 1b21ab7b30ab0f05b9226a0adbaea250a03e5850
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ before_install:
fi

script:
- if [ `uname` = "Linux" ]; then
- cd src
if [ `uname` = "Linux" ]; then
dpkg-buildpackage -b -us -uc;
elif [ `uname` = "Darwin" ]; then
make;
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ node(label: 'raspberrypi') {

stage("Prepare source for ${dist}") {
sh "rm -fr ${pkgdir}"
sh "${srcdir}/prepare-build.sh ${dist} ${pkgdir}"
sh "cd ${srcdir}/src && ${srcdir}/prepare-build.sh ${dist} ${pkgdir}"
}

stage("Build for ${dist}") {
Expand Down
146 changes: 84 additions & 62 deletions Makefile → src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,32 @@ PROGNAME=dump1090

DUMP1090_VERSION ?= unknown

CPPFLAGS += -I. -DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\" -DMODES_DUMP1090_VARIANT=\"dump1090-fa\"
CPPFLAGS += -I. -DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\" -D_DEFAULT_SOURCE -DMODES_DUMP1090_VARIANT=\"dump1090-fa\"

DIALECT = -std=c11
CFLAGS += $(DIALECT) -O3 -g -Wall -Wmissing-declarations -Werror -W -D_DEFAULT_SOURCE -fno-common
CFLAGS += $(DIALECT) -O3 -g -Wall -Wmissing-declarations -Werror -W -fno-common
LIBS = -lpthread -lm
SDR_OBJ = cpu.o sdr.o fifo.o sdr_ifile.o dsp/helpers/tables.o

# Try to autodetect available libraries via pkg-config if no explicit setting was used
PKGCONFIG=$(shell pkg-config --version >/dev/null 2>&1 && echo "yes" || echo "no")
ifeq ($(PKGCONFIG), yes)
ifndef RTLSDR
ifdef RTLSDR_PREFIX
RTLSDR := yes
else
RTLSDR := $(shell pkg-config --exists librtlsdr && echo "yes" || echo "no")
endif
endif
BIN_PATH = ./build
OBJ_PATH = ./build/obj/
MKDIR_P = mkdir -p
CPU_FEATURES_PATH = ../external/cpu_features

ifndef BLADERF
BLADERF := $(shell pkg-config --exists libbladeRF && echo "yes" || echo "no")
endif

ifndef HACKRF
HACKRF := $(shell pkg-config --exists libhackrf && echo "yes" || echo "no")
endif

ifndef LIMESDR
LIMESDR := $(shell pkg-config --exists LimeSuite && echo "yes" || echo "no")
endif
ifeq ($(OS),Windows_NT)
DETECTED_OS := Windows
else
# pkg-config not available. Only use explicitly enabled libraries.
RTLSDR ?= no
BLADERF ?= no
HACKRF ?= no
LIMESDR ?= no
DETECTED_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
endif

UNAME := $(shell uname)

ifeq ($(UNAME), Linux)
CPPFLAGS += -D_DEFAULT_SOURCE
ifeq ($(DETECTED_OS), Linux)
LIBS += -lrt
LIBS_USB += -lusb-1.0
LIBS_CURSES := -lncurses
CPUFEATURES ?= yes
endif

ifeq ($(UNAME), Darwin)
ifeq ($(DETECTED_OS), Darwin)
ifneq ($(shell sw_vers -productVersion | egrep '^10\.([0-9]|1[01])\.'),) # Mac OS X ver <= 10.11
CPPFLAGS += -DMISSING_GETTIME
COMPAT += compat/clock_gettime/clock_gettime.o
Expand All @@ -61,36 +39,62 @@ ifeq ($(UNAME), Darwin)
CPUFEATURES ?= yes
endif

ifeq ($(UNAME), OpenBSD)
ifeq ($(DETECTED_OS), OpenBSD)
CPPFLAGS += -DMISSING_NANOSLEEP
COMPAT += compat/clock_nanosleep/clock_nanosleep.o
LIBS_USB += -lusb-1.0
LIBS_CURSES := -lncurses
CPUFEATURES ?= yes
endif

ifeq ($(UNAME), FreeBSD)
CPPFLAGS += -D_DEFAULT_SOURCE
# TODO: Does google/cpu_features support FreeBSD and NetBSD?

ifeq ($(DETECTED_OS), FreeBSD)
LIBS += -lrt
LIBS_USB += -lusb
LIBS_CURSES := -lncurses
endif

ifeq ($(UNAME), NetBSD)
CFLAGS += -D_DEFAULT_SOURCE
ifeq ($(DETECTED_OS), NetBSD)
LIBS += -lrt
LIBS_USB += -lusb-1.0
LIBS_CURSES := -lcurses
endif

CPUFEATURES ?= no
##
## SDR Libraries
##

ifeq ($(CPUFEATURES),yes)
include Makefile.cpufeatures
CPPFLAGS += -DENABLE_CPUFEATURES -Iexternal/cpu_features/include
endif
# Try to autodetect available libraries via pkg-config if no explicit setting was used

PKGCONFIG=$(shell pkg-config --version >/dev/null 2>&1 && echo "yes" || echo "no")
ifeq ($(PKGCONFIG), yes)
ifndef RTLSDR
ifdef RTLSDR_PREFIX
RTLSDR := yes
else
RTLSDR := $(shell pkg-config --exists librtlsdr && echo "yes" || echo "no")
endif
endif

RTLSDR ?= yes
BLADERF ?= yes
ifndef BLADERF
BLADERF := $(shell pkg-config --exists libbladeRF && echo "yes" || echo "no")
endif

ifndef HACKRF
HACKRF := $(shell pkg-config --exists libhackrf && echo "yes" || echo "no")
endif

ifndef LIMESDR
LIMESDR := $(shell pkg-config --exists LimeSuite && echo "yes" || echo "no")
endif
else
# pkg-config not available. Only use explicitly enabled libraries.
RTLSDR ?= no
BLADERF ?= no
HACKRF ?= no
LIMESDR ?= no
endif

ifeq ($(RTLSDR), yes)
SDR_OBJ += sdr_rtlsdr.o
Expand Down Expand Up @@ -145,11 +149,21 @@ ifeq ($(LIMESDR), yes)
LIBS_SDR += $(shell pkg-config --libs LimeSuite)
endif

##
## END SDR Libraries
##


##
## starch (runtime DSP code selection) mix, architecture-specific
##

CPUFEATURES ?= no
ifeq ($(CPUFEATURES),yes)
include Makefile.cpufeatures
CPPFLAGS += -DENABLE_CPUFEATURES -I"$(CPU_FEATURES_PATH)/include"
endif

ARCH ?= $(shell uname -m)
ifneq ($(CPUFEATURES),yes)
# need to be able to detect CPU features at runtime to enable any non-standard compiler flags
Expand Down Expand Up @@ -177,6 +191,10 @@ all: showconfig dump1090 view1090 starch-benchmark
STARCH_COMPILE := $(CC) $(CPPFLAGS) $(CFLAGS) -c
include dsp/generated/makefile.$(STARCH_MIX)

##
## END starch
##

showconfig:
@echo "Building with:" >&2
@echo " Version string: $(DUMP1090_VERSION)" >&2
Expand All @@ -186,52 +204,56 @@ showconfig:
@echo " HackRF support: $(HACKRF)" >&2
@echo " LimeSDR support: $(LIMESDR)" >&2

$(BIN_PATH) $(OBJ_PATH):
@${MKDIR_P} $@

%.o: %.c *.h
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
@${MKDIR_P} $(dir $(OBJ_PATH)$@)
@$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $(OBJ_PATH)$@

dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o ais_charset.o adaptive.o $(SDR_OBJ) $(COMPAT) $(CPUFEATURES_OBJS) $(STARCH_OBJS)
$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_SDR) $(LIBS_CURSES)
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) $(LDFLAGS) $(LIBS) $(LIBS_SDR) $(LIBS_CURSES)

view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o sdr_stub.o $(COMPAT)
$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_CURSES)
view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o sdr_stub.o$(COMPAT)
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) $(LDFLAGS) $(LIBS) $(LIBS_CURSES)

faup1090: faup1090.o anet.o mode_ac.o mode_s.o comm_b.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o ais_charset.o sdr_stub.o $(COMPAT)
$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) $(LDFLAGS) $(LIBS)

starch-benchmark: cpu.o dsp/helpers/tables.o $(CPUFEATURES_OBJS) $(STARCH_OBJS) $(STARCH_BENCHMARK_OBJ)
$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) $(LDFLAGS) $(LIBS)

clean:
rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o external/cpu_features/src/*.o dsp/generated/*.o dsp/helpers/*.o $(CPUFEATURES_OBJS) dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark
@rm -rf build

test: cprtests
./cprtests
$(BIN_PATH)/cprtests

cprtests: cpr.o cprtests.o
$(CC) $(CPPFLAGS) $(CFLAGS) -g -o $@ $^ -lm
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) -lm

crctests: crc.c crc.h
$(CC) $(CPPFLAGS) $(CFLAGS) -g -DCRCDEBUG -o $@ $<
$(CC) -g -DCRCDEBUG -o $(BIN_PATH)/$@ -I. $<

benchmarks: oneoff/convert_benchmark
oneoff/convert_benchmark
$(BIN_PATH)/oneoff/convert_benchmark

oneoff/convert_benchmark: oneoff/convert_benchmark.o convert.o util.o dsp/helpers/tables.o cpu.o $(CPUFEATURES_OBJS) $(STARCH_OBJS)
$(CC) $(CPPFLAGS) $(CFLAGS) -g -o $@ $^ -lm -lpthread
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) -lm -lpthread

oneoff/decode_comm_b: oneoff/decode_comm_b.o comm_b.o ais_charset.o
$(CC) $(CPPFLAGS) $(CFLAGS) -g -o $@ $^ -lm
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) -lm

oneoff/dsp_error_measurement: oneoff/dsp_error_measurement.o dsp/helpers/tables.o cpu.o $(CPUFEATURES_OBJS) $(STARCH_OBJS)
$(CC) $(CPPFLAGS) $(CFLAGS) -g -o $@ $^ -lm
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) -lm

oneoff/uc8_capture_stats: oneoff/uc8_capture_stats.o
$(CC) $(CPPFLAGS) $(CFLAGS) -g -o $@ $^ -lm
$(CC) -g -o $(BIN_PATH)/$@ $(addprefix $(OBJ_PATH), $^) -lm

starchgen:
dsp/starchgen.py .

.PHONY: wisdom.local
wisdom.local: starch-benchmark
./starch-benchmark -i 5 -o wisdom.local mean_power_u16 mean_power_u16_aligned magnitude_uc8 magnitude_uc8_aligned
./starch-benchmark -i 5 -r wisdom.local -o wisdom.local
$(BIN_PATH)/starch-benchmark -i 5 -o wisdom.local mean_power_u16 mean_power_u16_aligned magnitude_uc8 magnitude_uc8_aligned
$(BIN_PATH)/starch-benchmark -i 5 -r wisdom.local -o wisdom.local
14 changes: 7 additions & 7 deletions Makefile.cpufeatures → src/Makefile.cpufeatures
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
CPUFEATURES_UNAME := $(shell uname)
CPUFEATURES_ARCH := $(shell uname -m)

CPUFEATURES_OBJS := external/cpu_features/src/filesystem.o external/cpu_features/src/stack_line_reader.o external/cpu_features/src/string_view.o
CPUFEATURES_OBJS := $(CPU_FEATURES_PATH)/src/filesystem.o $(CPU_FEATURES_PATH)/src/stack_line_reader.o $(CPU_FEATURES_PATH)/src/string_view.o
CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG

ifeq ($(CPUFEATURES_UNAME),Linux)
CPUFEATURES_OBJS += external/cpu_features/src/hwcaps.o
CPUFEATURES_OBJS += $(CPU_FEATURES_PATH)/src/hwcaps.o
CPUFEATURES_CFLAGS += -DHAVE_STRONG_GETAUXVAL
endif

Expand All @@ -18,20 +18,20 @@ ifeq ($(CPUFEATURES_UNAME),Darwin)
endif

ifeq ($(CPUFEATURES_ARCH),x86_64)
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_x86.o
CPUFEATURES_OBJS += $(CPU_FEATURES_PATH)/src/cpuinfo_x86.o
endif

ifneq (,$(filter i%86,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_x86.o
CPUFEATURES_OBJS += $(CPU_FEATURES_PATH)/src/cpuinfo_x86.o
endif

ifneq (,$(findstring arm,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_arm.o
CPUFEATURES_OBJS += $(CPU_FEATURES_PATH)/src/cpuinfo_arm.o
endif

ifneq (,$(findstring aarch64,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_aarch64.o
CPUFEATURES_OBJS += $(CPU_FEATURES_PATH)/src/cpuinfo_aarch64.o
endif

$(CPUFEATURES_OBJS): override CFLAGS := $(CPUFEATURES_CFLAGS)
$(CPUFEATURES_OBJS): override CPPFLAGS := -Iexternal/cpu_features/include
$(CPUFEATURES_OBJS): override CPPFLAGS := -I$(CPU_FEATURES_PATH)/include
0 adaptive.c → src/adaptive.c
View file
Open in desktop
File renamed without changes.
0 adaptive.h → src/adaptive.h
View file
Open in desktop
File renamed without changes.
0 ais_charset.c → src/ais_charset.c
View file
Open in desktop
File renamed without changes.
0 ais_charset.h → src/ais_charset.h
View file
Open in desktop
File renamed without changes.
0 anet.c → src/anet.c
View file
Open in desktop
File renamed without changes.
0 anet.h → src/anet.h
View file
Open in desktop
File renamed without changes.
0 bladerf/README → src/bladerf/README
View file
Open in desktop
File renamed without changes.
0 bladerf/decimate8-x40.rbf → src/bladerf/decimate8-x40.rbf
View file
Open in desktop
File renamed without changes.
0 comm_b.c → src/comm_b.c
View file
Open in desktop
File renamed without changes.
0 comm_b.h → src/comm_b.h
View file
Open in desktop
File renamed without changes.
0 compat/clock_gettime/LICENSE → src/compat/clock_gettime/LICENSE
View file
Open in desktop
File renamed without changes.
0 compat/clock_gettime/clock_gettime.c → src/compat/clock_gettime/clock_gettime.c
View file
Open in desktop
File renamed without changes.
0 compat/clock_gettime/clock_gettime.h → src/compat/clock_gettime/clock_gettime.h
View file
Open in desktop
File renamed without changes.
0 compat/clock_nanosleep/LICENSE → src/compat/clock_nanosleep/LICENSE
View file
Open in desktop
File renamed without changes.
0 compat/clock_nanosleep/clock_nanosleep.c → src/compat/clock_nanosleep/clock_nanosleep.c
View file
Open in desktop
File renamed without changes.
0 compat/clock_nanosleep/clock_nanosleep.h → src/compat/clock_nanosleep/clock_nanosleep.h
View file
Open in desktop
File renamed without changes.
0 compat/compat.h → src/compat/compat.h
View file
Open in desktop
File renamed without changes.
0 convert.c → src/convert.c
View file
Open in desktop
File renamed without changes.
0 convert.h → src/convert.h
View file
Open in desktop
File renamed without changes.
0 cpr.c → src/cpr.c
View file
Open in desktop
File renamed without changes.
0 cpr.h → src/cpr.h
View file
Open in desktop
File renamed without changes.
0 cprtests.c → src/cprtests.c
View file
Open in desktop
File renamed without changes.
0 cpu.c → src/cpu.c
View file
Open in desktop
File renamed without changes.
0 cpu.h → src/cpu.h
View file
Open in desktop
File renamed without changes.
0 crc.c → src/crc.c
View file
Open in desktop
File renamed without changes.
0 crc.h → src/crc.h
View file
Open in desktop
File renamed without changes.
0 debian-jessie/control → src/debian-jessie/control
View file
Open in desktop
File renamed without changes.
0 debian-jessie/rules → src/debian-jessie/rules
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 debian-stretch/control → src/debian-stretch/control
View file
Open in desktop
File renamed without changes.
0 debian-stretch/rules → src/debian-stretch/rules
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 debian/README.librtlsdr → src/debian/README.librtlsdr
View file
Open in desktop
File renamed without changes.
0 debian/changelog → src/debian/changelog
View file
Open in desktop
File renamed without changes.
0 debian/compat → src/debian/compat
View file
Open in desktop
File renamed without changes.
0 debian/control → src/debian/control
View file
Open in desktop
File renamed without changes.
0 debian/copyright → src/debian/copyright
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.default → src/debian/dump1090-fa.default
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.docs → src/debian/dump1090-fa.docs
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.install → src/debian/dump1090-fa.install
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.postinst → src/debian/dump1090-fa.postinst
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.postrm → src/debian/dump1090-fa.postrm
View file
Open in desktop
File renamed without changes.
0 debian/dump1090-fa.service → src/debian/dump1090-fa.service
View file
Open in desktop
File renamed without changes.
0 debian/generate-wisdom → src/debian/generate-wisdom
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...an/lighttpd/88-dump1090-fa-statcache.conf → ...an/lighttpd/88-dump1090-fa-statcache.conf
View file
Open in desktop
File renamed without changes.
0 debian/lighttpd/89-dump1090-fa.conf → src/debian/lighttpd/89-dump1090-fa.conf
View file
Open in desktop
File renamed without changes.
0 debian/lighttpd/89-skyaware.conf → src/debian/lighttpd/89-skyaware.conf
View file
Open in desktop
File renamed without changes.
0 debian/rules → src/debian/rules
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 debian/source/format → src/debian/source/format
View file
Open in desktop
File renamed without changes.
0 debian/start-dump1090-fa → src/debian/start-dump1090-fa
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 debian/upgrade-config → src/debian/upgrade-config
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 demod_2400.c → src/demod_2400.c
View file
Open in desktop
File renamed without changes.
0 demod_2400.h → src/demod_2400.h
View file
Open in desktop
File renamed without changes.
0 dsp-types.h → src/dsp-types.h
View file
Open in desktop
File renamed without changes.
0 dsp/benchmark/count_above_u16_benchmark.c → ...dsp/benchmark/count_above_u16_benchmark.c
View file
Open in desktop
File renamed without changes.
0 ...benchmark/magnitude_power_uc8_benchmark.c → ...benchmark/magnitude_power_uc8_benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/benchmark/magnitude_sc16_benchmark.c → src/dsp/benchmark/magnitude_sc16_benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/benchmark/magnitude_sc16q11_benchmark.c → ...p/benchmark/magnitude_sc16q11_benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/benchmark/magnitude_uc8_benchmark.c → src/dsp/benchmark/magnitude_uc8_benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/benchmark/mean_power_u16_benchmark.c → src/dsp/benchmark/mean_power_u16_benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/benchmark.c → src/dsp/generated/benchmark.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/dispatcher.c → src/dsp/generated/dispatcher.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/flavor.armv7a_neon_vfpv4.c → src/dsp/generated/flavor.armv7a_neon_vfpv4.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/flavor.armv8_a.c → src/dsp/generated/flavor.armv8_a.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/flavor.armv8_neon_simd.c → src/dsp/generated/flavor.armv8_neon_simd.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/flavor.generic.c → src/dsp/generated/flavor.generic.c
View file
Open in desktop
File renamed without changes.
0 dsp/generated/flavor.x86_avx2.c → src/dsp/generated/flavor.x86_avx2.c
View file
Open in desktop
File renamed without changes.
20 changes: 12 additions & 8 deletions dsp/generated/makefile.aarch64 → src/dsp/generated/makefile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,23 @@
STARCH_CFLAGS := -DSTARCH_MIX_AARCH64


dsp/generated/flavor.armv8_neon_simd.o: dsp/generated/flavor.armv8_neon_simd.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) -march=armv8-a+simd -ffast-math dsp/generated/flavor.armv8_neon_simd.c -o dsp/generated/flavor.armv8_neon_simd.o
dsp/generated/flavor.armv8_neon_simd.o: dsp/generated/flavor.armv8_neon_simd.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/flavor.armv8_neon_simd.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) -march=armv8-a+simd -ffast-math dsp/generated/flavor.armv8_neon_simd.c -o $(OBJ_PATH)dsp/generated/flavor.armv8_neon_simd.o

dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o dsp/generated/flavor.generic.o
dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/flavor.generic.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o $(OBJ_PATH)dsp/generated/flavor.generic.o

dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o dsp/generated/dispatcher.o
dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/dispatcher.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o $(OBJ_PATH)dsp/generated/dispatcher.o

STARCH_OBJS := dsp/generated/flavor.armv8_neon_simd.o dsp/generated/flavor.generic.o dsp/generated/dispatcher.o


dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o dsp/generated/benchmark.o
dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/benchmark.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o $(OBJ_PATH)dsp/generated/benchmark.o

STARCH_BENCHMARK_OBJ := dsp/generated/benchmark.o
20 changes: 12 additions & 8 deletions dsp/generated/makefile.arm → src/dsp/generated/makefile.arm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,23 @@
STARCH_CFLAGS := -DSTARCH_MIX_ARM


dsp/generated/flavor.armv7a_neon_vfpv4.o: dsp/generated/flavor.armv7a_neon_vfpv4.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) -march=armv7-a+neon-vfpv4 -mfpu=neon-vfpv4 -ffast-math dsp/generated/flavor.armv7a_neon_vfpv4.c -o dsp/generated/flavor.armv7a_neon_vfpv4.o
dsp/generated/flavor.armv7a_neon_vfpv4.o: dsp/generated/flavor.armv7a_neon_vfpv4.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/flavor.armv7a_neon_vfpv4.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) -march=armv7-a+neon-vfpv4 -mfpu=neon-vfpv4 -ffast-math dsp/generated/flavor.armv7a_neon_vfpv4.c -o $(OBJ_PATH)dsp/generated/flavor.armv7a_neon_vfpv4.o

dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o dsp/generated/flavor.generic.o
dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/flavor.generic.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o $(OBJ_PATH)dsp/generated/flavor.generic.o

dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o dsp/generated/dispatcher.o
dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/dispatcher.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o $(OBJ_PATH)dsp/generated/dispatcher.o

STARCH_OBJS := dsp/generated/flavor.armv7a_neon_vfpv4.o dsp/generated/flavor.generic.o dsp/generated/dispatcher.o


dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o dsp/generated/benchmark.o
dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/benchmark.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o $(OBJ_PATH)dsp/generated/benchmark.o

STARCH_BENCHMARK_OBJ := dsp/generated/benchmark.o
15 changes: 9 additions & 6 deletions dsp/generated/makefile.generic → src/dsp/generated/makefile.generic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
STARCH_CFLAGS := -DSTARCH_MIX_GENERIC


dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o dsp/generated/flavor.generic.o
dsp/generated/flavor.generic.o: dsp/generated/flavor.generic.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/flavor.generic.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/flavor.generic.c -o $(OBJ_PATH)dsp/generated/flavor.generic.o

dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/mean_power_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_uc8.c dsp/impl/magnitude_sc16q11.c dsp/impl/count_above_u16.c dsp/impl/magnitude_sc16.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o dsp/generated/dispatcher.o
dsp/generated/dispatcher.o: dsp/generated/dispatcher.c dsp/impl/count_above_u16.c dsp/impl/magnitude_power_uc8.c dsp/impl/magnitude_sc16.c dsp/impl/magnitude_sc16q11.c dsp/impl/magnitude_uc8.c dsp/impl/mean_power_u16.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/dispatcher.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/dispatcher.c -o $(OBJ_PATH)dsp/generated/dispatcher.o

STARCH_OBJS := dsp/generated/flavor.generic.o dsp/generated/dispatcher.o


dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o dsp/generated/benchmark.o
dsp/generated/benchmark.o: dsp/generated/benchmark.c dsp/benchmark/count_above_u16_benchmark.c dsp/benchmark/magnitude_power_uc8_benchmark.c dsp/benchmark/magnitude_sc16q11_benchmark.c dsp/benchmark/magnitude_sc16_benchmark.c dsp/benchmark/magnitude_uc8_benchmark.c dsp/benchmark/mean_power_u16_benchmark.c
@$(MKDIR_P) $(dir $(OBJ_PATH)dsp/generated/benchmark.o)
$(STARCH_COMPILE) $(STARCH_CFLAGS) dsp/generated/benchmark.c -o $(OBJ_PATH)dsp/generated/benchmark.o

STARCH_BENCHMARK_OBJ := dsp/generated/benchmark.o
Loading