Skip to content

Enable pixman neon optimisations for arm64 builds #1935

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

Open
tobil4sk wants to merge 5 commits into
base: 8.4.0-dev
Choose a base branch
from
Open

Enable pixman neon optimisations for arm64 builds #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bf77af
Update pixman for llvm assembly fixes
tobil4sk Mar 17, 2025
246d147
Reenable pixman neon support for 32 bit arm
tobil4sk Mar 17, 2025
5109ef6
Fix pixman config for gcc android ndks
tobil4sk Mar 17, 2025
62e1b34
Enable pixman neon support for arm64
tobil4sk Mar 17, 2025
65f4549
Avoid disable pixman neon support for older ndks
tobil4sk Mar 27, 2025
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
43 changes: 2 additions & 41 deletions project/lib/custom/pixman/config.h → project/lib/custom/pixman/pixman-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
3. Update the version number(s) if they've changed.
**/

/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */

/* Whether we have alarm() */
#ifdef HX_LINUX
#define HAVE_ALARM 1
Expand All @@ -32,13 +29,6 @@
/* #undef HAVE_BUILTIN_CLZ */
#endif

/* Define to 1 if you have the <dlfcn.h> header file. */
#ifndef HX_WINDOWS
#define HAVE_DLFCN_H 1
#else
/* #undef HAVE_DLFCN_H */
#endif

/* Whether we have FE_DIVBYZERO */
#ifdef HX_LINUX
#define HAVE_FEDIVBYZERO 1
Expand Down Expand Up @@ -108,13 +98,6 @@
/* #undef HAVE_LIBPNG */
#endif

/* Define to 1 if you have the <memory.h> header file. */
#ifdef HX_LINUX
#define HAVE_MEMORY_H 1
#else
/* #undef HAVE_MEMORY_H */
#endif

/* Whether we have mmap() */
#ifdef HX_LINUX
#define HAVE_MMAP 1
Expand Down Expand Up @@ -200,24 +183,6 @@
/* Name of package */
#define PACKAGE "pixman"

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "pixman@lists.freedesktop.org"

/* Define to the full name of this package. */
#define PACKAGE_NAME "pixman"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "pixman 0.42.2"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pixman"

/* Define to the home page for this package. */
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "0.42.2"

/* enable output that can be piped to gnuplot */
/* #undef PIXMAN_GNUPLOT */

Expand Down Expand Up @@ -252,6 +217,8 @@
/* #undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR */
#endif

#define ASM_HAVE_SYNTAX_UNIFIED

/* use ARM A64_NEON assembly optimizations */
/* #undef USE_ARM_A64_NEON */

Expand Down Expand Up @@ -316,9 +283,6 @@
/* #undef USE_X86_MMX */
#endif

/* Version number of package */
#define VERSION "0.42.2"

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
Expand All @@ -336,6 +300,3 @@
#ifndef __cplusplus
/* #undef inline */
#endif

/* Define to sqrt if you do not have the `sqrtf' function. */
/* #undef sqrtf */
6 changes: 3 additions & 3 deletions project/lib/custom/pixman/pixman/pixman-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#endif

#define PIXMAN_VERSION_MAJOR 0
#define PIXMAN_VERSION_MINOR 40
#define PIXMAN_VERSION_MICRO 1
#define PIXMAN_VERSION_MINOR 44
#define PIXMAN_VERSION_MICRO 2

#define PIXMAN_VERSION_STRING "0.40.1"
#define PIXMAN_VERSION_STRING "0.44.2"

#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \
((major) * 10000) \
Expand Down
2 changes: 1 addition & 1 deletion project/lib/pixman
Open in desktop
Submodule pixman updated from 37216a to 46655e
14 changes: 9 additions & 5 deletions project/lib/pixman-files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<xml>

<!-- TODO: ARM64 NEON -->

<!-- <set name="PIXMAN_ARM_SIMD" value="1" if="android || rpi" unless="HXCPP_ARMV7 || HXCPP_ARMV7S || HXCPP_ARM64 || HXCPP_X86" /> -->
<set name="PIXMAN_ARM_NEON" value="1" if="HXCPP_ARMV7 || HXCPP_ARMV7S || rpi" unless="ios || NDKV22+ || HXCPP_ARM64" />
<set name="PIXMAN_ARM_NEON" value="1" if="HXCPP_ARMV7 || HXCPP_ARMV7S || rpi" unless="ios || HXCPP_ARM64" />

<set name="PIXMAN_ARM_A64_NEON" value="1" if="HXCPP_ARM64"/>

<files id="native-toolkit-pixman">

<compilerflag value="-fno-integrated-as" if="HXCPP_CLANG || NDKV20+" unless="mac || ios || NDKV22+" />
<compilerflag value="-fno-integrated-as" if="PIXMAN_ARM_A64_NEON NDKV18+" unless="NDKV20+" />

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/pixman" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/pixman/pixman" />
Expand All @@ -19,6 +19,7 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/png" if="NATIVE_TOOLKIT_HAVE_PNG" />

<compilerflag value="-DUSE_ARM_NEON=1" if="PIXMAN_ARM_NEON" />
<compilerflag value="-DUSE_ARM_A64_NEON=1" if="PIXMAN_ARM_SIMD" />
<compilerflag value="-DUSE_ARM_SIMD=1" if="PIXMAN_ARM_SIMD" />

<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
Expand All @@ -36,7 +37,9 @@
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-access.c" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon-asm-bilinear.S" if="PIXMAN_ARM_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon-asm.S" if="PIXMAN_ARM_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon.c" if="PIXMAN_ARM_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arma64-neon-asm-bilinear.S" if="PIXMAN_ARM_A64_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arma64-neon-asm.S" if="PIXMAN_ARM_A64_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-neon.c" if="PIXMAN_ARM_NEON || PIXMAN_ARM64_NEON" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd-asm-scaled.S" if="PIXMAN_ARM_SIMD" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd-asm.S" if="PIXMAN_ARM_SIMD" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-arm-simd.c" if="PIXMAN_ARM_SIMD" />
Expand Down Expand Up @@ -70,6 +73,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-trap.c" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-utils.c" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-x86.c" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-riscv.c" />
<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman.c" />

</files>
Expand Down