Re: [Buildroot] [PATCH next v2 1/2] package/highway: new package

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

On Thu, 24 Nov 2022 23:05:51 +0100
Julien Olivain <ju.o@free.fr> wrote:

> Highway is a C++ library that provides portable SIMD/vector intrinsics.
> 
> https://github.com/google/highway
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>

Thanks! I've applied, with some small changes, see below.

> diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch
> new file mode 100644
> index 0000000000..df86798613
> --- /dev/null
> +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch
> @@ -0,0 +1,62 @@
> +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001
> +From: Julien Olivain <ju.o@free.fr>
> +Date: Wed, 23 Nov 2022 23:27:11 +0100
> +Subject: [PATCH] Check for the presence of <sys/auxv.h>
> +
> +Not all gcc versions are providing <sys/auxv.h>. Checking for
> +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not
> +sufficient and fail to build in some situations (it was observed for
> +some gcc armv7m toolchains).
> +
> +This patch adds a check for <sys/auxv.h> and include it only if present.
> +
> +Signed-off-by: Julien Olivain <ju.o@free.fr>

Has this patch been submitted upstream?


> diff --git a/package/highway/Config.in b/package/highway/Config.in
> new file mode 100644
> index 0000000000..23861f0b94
> --- /dev/null
> +++ b/package/highway/Config.in
> @@ -0,0 +1,30 @@
> +config BR2_PACKAGE_HIGHWAY
> +	bool "highway"
> +	depends on BR2_TOOLCHAIN_HAS_ATOMIC
> +	depends on BR2_INSTALL_LIBSTDCPP
> +	# For gcc bug 58969, see:
> +	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969
> +	help
> +	  Highway is a C++ library that provides portable SIMD/vector
> +	  intrinsics.
> +
> +	  https://github.com/google/highway
> +
> +if BR2_PACKAGE_HIGHWAY
> +
> +config BR2_PACKAGE_HIGHWAY_CONTRIB
> +	bool "Enable Contrib"
> +	help
> +	  Build Highway contrib library which contains extra
> +	  SIMD-related utilities: an image class with aligned rows, a
> +	  math library (16 functions already implemented, mostly
> +	  trigonometry), and functions for computing dot products and
> +	  sorting.
> +
> +config BR2_PACKAGE_HIGHWAY_EXAMPLES
> +	bool "Enable Examples"
> +	help
> +	  Build Highway examples
> +
> +endif

You forgot the Config.in comment matching the "depends on" of the main
options:

comment "highway needs a toolchain w/ C++, gcc >= 7"
        depends on BR2_TOOLCHAIN_HAS_ATOMIC
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7

> +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS)
> +
> +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y)
> +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON
> +else
> +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF
> +endif
> +
> +# Examples are not installed by cmake. This binary can be useful for
> +# quick testing and debug.
> +define HIGHWAY_INSTALL_EXAMPLES
> +	$(INSTALL) -m 0755 \
> +		$(@D)/examples/hwy_benchmark \
> +		$(TARGET_DIR)/usr/bin/hwy_benchmark
> +endef

I've moved this...

> +
> +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y)
> +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON

... here, as it is used only within this condition.

Applied with those changes, thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot