NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/fftw: break fftw-single into a dedicated package

Browse Source 
fftw's library name depends on the precision option. Consequently,
it's possible to install multiple flavor on the same target.

This patch breaks fftw single precision into a new package and:

- makes BR2_PACKAGE_FFTW_PRECISION_SINGLE select
  BR2_PACKAGE_FFTW_SINGLE to keep compatibility with packages that use
  BR2_PACKAGE_FFTW_PRECISION_SINGLE. This option will be removed in a
  follow-up commit;

- removes the BR2_PACKAGE_FFTW_USE_SSE and BR2_PACKAGE_FFTW_USE_NEON
  otpions since they are only used for single precision. The
  corresponding CPU-capability options are directly handled in
  the fftw-single package;

- makes fftw depend on fftw-single when this package is enabled.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
[Yann/Thomas:
 - Force --disable-single in FFTW_CONF_OPTS, just for the sake of
   clarity (fftw is no longer going to build the single variant)
 - Use FFTW_SINGLE_DL_SUBDIR to avoid downloading fftw multiple times
 - Minor reformatting tweaks in fftw-single.mk
 - Do not deprecate BR2_PACKAGE_FFTW_PRECISION_SINGLE and instead make
   it select BR2_PACKAGE_FFTW_SINGLE, so that packages using
   BR2_PACKAGE_FFTW_PRECISION_SINGLE continue to work.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Gwenhael Goavec-Merou 2019-01-21 14:50:56 +01:00 committed by Thomas Petazzoni
parent da44a9e557
commit fca8b60f86
5 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/fftw/Config.in
View File

@ -12,15 +12,9 @@ config BR2_PACKAGE_FFTW
if BR2_PACKAGE_FFTW
config BR2_PACKAGE_FFTW_USE_SSE
bool
config BR2_PACKAGE_FFTW_USE_SSE2
bool
config BR2_PACKAGE_FFTW_USE_NEON
bool
choice
prompt "fftw precision"
default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
@ -29,9 +23,7 @@ choice
config BR2_PACKAGE_FFTW_PRECISION_SINGLE
bool "single"
select BR2_PACKAGE_FFTW_USE_SSE if BR2_X86_CPU_HAS_SSE
select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
select BR2_PACKAGE_FFTW_USE_NEON if BR2_ARM_CPU_HAS_NEON && !BR2_ARM_SOFT_FLOAT
select BR2_PACKAGE_FFTW_SINGLE
help
Compile fftw in single precision, i.e. use 'float' for
floating point type.
@ -62,6 +54,8 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD
endchoice
source "package/fftw/fftw-single/Config.in"
config BR2_PACKAGE_FFTW_FAST
bool "optimise for speed over accuracy"
help

5
package/fftw/fftw-single/Config.in Normal file
View File

@ -0,0 +1,5 @@
config BR2_PACKAGE_FFTW_SINGLE
bool "fftw-single"
help
Compile fftw in single precision, i.e. use 'float'
for floating point type.

1
package/fftw/fftw-single/fftw-single.hash Symbolic link
View File

@ -0,0 +1 @@
../fftw.hash

37
package/fftw/fftw-single/fftw-single.mk Normal file
View File

@ -0,0 +1,37 @@
################################################################################
#
# fftw-single
#
################################################################################
FFTW_SINGLE_VERSION = $(FFTW_VERSION)
FFTW_SINGLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
FFTW_SINGLE_SITE = $(FFTW_SITE)
FFTW_SINGLE_DL_SUBDIR = fftw
FFTW_SINGLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
FFTW_SINGLE_LICENSE = $(FFTW_LICENSE)
FFTW_SINGLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
FFTW_SINGLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
FFTW_SINGLE_CONF_OPTS = \
$(FFTW_COMMON_CONF_OPTS) \
CFLAGS="$(FFTW_SINGLE_CFLAGS)" \
--enable-single
FFTW_SINGLE_CFLAGS = $(FFTW_COMMON_CFLAGS)
# x86 optimisations
FFTW_SINGLE_CONF_OPTS += \
$(if $(BR2_X86_CPU_HAS_SSE),--enable,--disable)-sse \
$(if $(BR2_X86_CPU_HAS_SSE2),--enable,--disable)-sse2
# ARM optimisations
ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:)
FFTW_SINGLE_CONF_OPTS += --enable-neon
FFTW_SINGLE_CFLAGS += -mfpu=neon
else
FFTW_SINGLE_CONF_OPTS += --disable-neon
endif
$(eval $(autotools-package))

14
package/fftw/fftw.mk
View File

@ -10,6 +10,10 @@ FFTW_INSTALL_STAGING = YES
FFTW_LICENSE = GPL-2.0+
FFTW_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
FFTW_DEPENDENCIES += fftw-single
endif
# fortran support only enables generation and installation of fortran sources
ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
FFTW_COMMON_CONF_OPTS += --enable-fortran
@ -19,18 +23,14 @@ FFTW_COMMON_CONF_OPTS += --disable-fortran
endif
FFTW_COMMON_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_PACKAGE_FFTW_FAST),y)
FFTW_COMMON_CFLAGS += -O3 -ffast-math
endif
# x86 optimisations
FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE),--enable,--disable)-sse
FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
# ARM optimisations
FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),--enable,--disable)-neon
FFTW_COMMON_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
# Generic optimisations
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
FFTW_COMMON_CONF_OPTS += --enable-threads
@ -43,9 +43,11 @@ FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openm
FFTW_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
FFTW_CONF_OPTS += \
$(FFTW_COMMON_CONF_OPTS) \
$(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single \
--disable-single \
$(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double \
$(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision \
CFLAGS="$(FFTW_COMMON_CFLAGS)"
$(eval $(autotools-package))
include $(sort $(wildcard package/fftw/*/*.mk))