Merge pull request #293 from flightaware/starch-fixes

Fix generate-wisdom, update dsp cpu detection code

Author: mutability

Makefile

@@ -55,7 +55,6 @@ ifeq ($(UNAME), Linux)
   LIBS += -lrt
   LIBS_USB += -lusb-1.0
   LIBS_CURSES := -lncurses
-  CPUFEATURES ?= yes
 endif
 
 ifeq ($(UNAME), Darwin)
@@ -70,10 +69,6 @@ ifeq ($(UNAME), Darwin)
   endif
   LIBS_USB += -lusb-1.0
   LIBS_CURSES := -lncurses
-  # cpufeatures reportedly does not work (yet) on darwin arm64
-  ifneq ($(ARCH),arm64)
-    CPUFEATURES ?= yes
-  endif
 endif
 
 ifeq ($(UNAME), OpenBSD)
@@ -97,13 +92,6 @@ ifeq ($(UNAME), NetBSD)
   LIBS_CURSES := -lcurses
 endif
 
-CPUFEATURES ?= no
-
-ifeq ($(CPUFEATURES),yes)
-  include Makefile.cpufeatures
-  DUMP1090_CPPFLAGS += -DENABLE_CPUFEATURES -Icpu_features/include
-endif
-
 RTLSDR ?= yes
 BLADERF ?= yes
 
@@ -172,35 +160,30 @@ endif
 ## starch (runtime DSP code selection) mix, architecture-specific
 ##
 
-ifneq ($(CPUFEATURES),yes)
-  # need to be able to detect CPU features at runtime to enable any non-standard compiler flags
+ifeq ($(ARCH),x86_64)
+  # AVX, AVX2
+  STARCH_MIX := x86
+  DUMP1090_CPPFLAGS += -DSTARCH_MIX_X86
+else ifeq ($(ARCH),amd64)
+  # this is the Debian naming of x86_64
+  STARCH_MIX := x86
+  DUMP1090_CPPFLAGS += -DSTARCH_MIX_X86
+else ifeq ($(findstring aarch,$(ARCH)),aarch)
+  STARCH_MIX := aarch64
+  DUMP1090_CPPFLAGS += -DSTARCH_MIX_AARCH64
+else ifeq ($(findstring arm64,$(ARCH)),arm64)
+  # Apple calls this arm64, not aarch64
+  STARCH_MIX := aarch64
+  DUMP1090_CPPFLAGS += -DSTARCH_MIX_AARCH64
+else ifeq ($(findstring arm,$(ARCH)),arm)
+  # ARMv7 NEON
+  STARCH_MIX := arm
+  DUMP1090_CPPFLAGS += -DSTARCH_MIX_ARM
+else
   STARCH_MIX := generic
   DUMP1090_CPPFLAGS += -DSTARCH_MIX_GENERIC
-else
-  ifeq ($(ARCH),x86_64)
-    # AVX, AVX2
-    STARCH_MIX := x86
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_X86
-  else ifeq ($(ARCH),amd64)
-    # this is the Debian naming of x86_64
-    STARCH_MIX := x86
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_X86
-  else ifeq ($(findstring aarch,$(ARCH)),aarch)
-    STARCH_MIX := aarch64
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_AARCH64
-  else ifeq ($(findstring arm64,$(ARCH)),arm64)
-    # Apple calls this arm64, not aarch64
-    STARCH_MIX := aarch64
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_AARCH64
-  else ifeq ($(findstring arm,$(ARCH)),arm)
-    # ARMv7 NEON
-    STARCH_MIX := arm
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_ARM
-  else
-    STARCH_MIX := generic
-    DUMP1090_CPPFLAGS += -DSTARCH_MIX_GENERIC
-  endif
 endif
+
 all: showconfig dump1090 view1090 starch-benchmark
 
 ALL_CCFLAGS := $(CPPFLAGS) $(DUMP1090_CPPFLAGS) $(CFLAGS) $(DUMP1090_CFLAGS)
@@ -222,7 +205,7 @@ showconfig:
 %.o: %.c *.h
 	$(CC) $(ALL_CCFLAGS) -c $< -o $@
 
-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)
+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) $(STARCH_OBJS)
 	$(CC) -g -o $@ $^ $(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)
@@ -231,11 +214,11 @@ view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o comm_b.o net_io.o c
 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)
 
-starch-benchmark: cpu.o dsp/helpers/tables.o $(CPUFEATURES_OBJS) $(STARCH_OBJS) $(STARCH_BENCHMARK_OBJ)
+starch-benchmark: cpu.o dsp/helpers/tables.o $(STARCH_OBJS) $(STARCH_BENCHMARK_OBJ)
 	$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean:
-	rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o 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 -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o cpu_features/src/*.o dsp/generated/*.o dsp/helpers/*.o dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark
 
 test: cprtests starch-benchmark
 	./cprtests
@@ -250,13 +233,13 @@ crctests: crc.c crc.h
 benchmarks: oneoff/convert_benchmark
 	oneoff/convert_benchmark
 
-oneoff/convert_benchmark: oneoff/convert_benchmark.o convert.o util.o dsp/helpers/tables.o cpu.o $(CPUFEATURES_OBJS) $(STARCH_OBJS)
+oneoff/convert_benchmark: oneoff/convert_benchmark.o convert.o util.o dsp/helpers/tables.o cpu.o $(STARCH_OBJS)
 	$(CC) $(ALL_CCFLAGS) -g -o $@ $^ -lm -lpthread
 
 oneoff/decode_comm_b: oneoff/decode_comm_b.o comm_b.o ais_charset.o
 	$(CC) $(ALL_CCFLAGS) -g -o $@ $^ -lm
 
-oneoff/dsp_error_measurement: oneoff/dsp_error_measurement.o dsp/helpers/tables.o cpu.o $(CPUFEATURES_OBJS) $(STARCH_OBJS)
+oneoff/dsp_error_measurement: oneoff/dsp_error_measurement.o dsp/helpers/tables.o cpu.o $(STARCH_OBJS)
 	$(CC) $(ALL_CCFLAGS) -g -o $@ $^ -lm
 
 oneoff/uc8_capture_stats: oneoff/uc8_capture_stats.o

cpu.c

@@ -1,108 +1,104 @@
-#include "cpu.h"
+/*
+ *  cpu.c - flavor/CPU detection support for starch
+ *
+ *  Copyright (c) 2026 FlightAware All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
-#include <stdbool.h>
+#include "cpu.h"
 
-#ifdef ENABLE_CPUFEATURES
-#include "cpu_features_macros.h"
+#if defined(__GNUC__) && defined(__x86_64__)
+#  include <cpuid.h>
+#  define HAVE_X86_CPUID
 #endif
 
-//
-// x86
-//
-
-#ifdef CPU_FEATURES_ARCH_X86
-#include "cpuinfo_x86.h"
-
-static X86Info *x86_info()
-{
-    static bool valid = false;
-    static X86Info cache;
-
-    if (!valid) {
-        cache = GetX86Info();
-        valid = true;
-    }
-
-    return &cache;
-}
+#if defined(__linux__) && defined(__arm__)
+#  include <asm/hwcap.h>
+#  include <sys/auxv.h>
+#  define HAVE_ARM32_AUXV
+#endif
 
+#if defined(__linux__) && defined(__aarch64__)
+#  include <asm/hwcap.h>
+#  include <sys/auxv.h>
+#  define HAVE_ARM64_AUXV
 #endif
 
-int cpu_supports_avx(void)
+int cpu_supports_armv7_neon_vfpv4(void)
 {
-#ifdef CPU_FEATURES_ARCH_X86
-    return x86_info()->features.avx;
+#ifdef HAVE_ARM32_AUXV
+    long hwcaps = getauxval(AT_HWCAP);
+    return
+        (hwcaps & HWCAP_ARM_NEON) &&
+        (hwcaps & HWCAP_ARM_VFPv4);
 #else
     return 0;
 #endif
 }
 
-int cpu_supports_avx2(void)
+int cpu_supports_armv8_simd(void)
 {
-#ifdef CPU_FEATURES_ARCH_X86
-    return x86_info()->features.avx2;
+#ifdef HAVE_ARM64_AUXV
+    long hwcaps = getauxval(AT_HWCAP);
+    return (hwcaps & HWCAP_ASIMD);
 #else
     return 0;
 #endif
 }
 
-//
-// ARM
-//
-
-#ifdef CPU_FEATURES_ARCH_ARM
-#include "cpuinfo_arm.h"
-
-static ArmInfo *arm_info()
+int cpu_supports_avx(void)
 {
-    static bool valid = false;
-    static ArmInfo cache;
+#ifdef HAVE_X86_CPUID
+    unsigned int maxlevel = __get_cpuid_max (0, 0);
+    if (maxlevel < 1)
+        return 0;
 
-    if (!valid) {
-        cache = GetArmInfo();
-        valid = true;
-    }
+    unsigned eax, ebx, ecx, edx;
+    __cpuid(1, eax, ebx, ecx, edx);
+    if (!(ecx & bit_AVX))
+        return 0;
 
-    return &cache;
-}
-
-#endif
-
-int cpu_supports_armv7_neon_vfpv4(void)
-{
-#ifdef CPU_FEATURES_ARCH_ARM
-    return arm_info()->architecture >= 7 && arm_info()->features.neon && arm_info()->features.vfpv4 && arm_info()->features.vfpd32;
+    return 1;
 #else
     return 0;
 #endif
 }
 
-//
-// AARCH64
-//
-
-#ifdef CPU_FEATURES_ARCH_AARCH64
-#include "cpuinfo_aarch64.h"
-
-static Aarch64Info *aarch64_info()
+int cpu_supports_avx2(void)
 {
-    static bool valid = false;
-    static Aarch64Info cache;
-
-    if (!valid) {
-        cache = GetAarch64Info();
-        valid = true;
-    }
+#ifdef HAVE_X86_CPUID
+    unsigned int maxlevel = __get_cpuid_max (0, 0);
+    if (maxlevel < 7)
+        return 0;
 
-    return &cache;
-}
+    unsigned eax, ebx, ecx, edx;
+    __cpuid_count(7, 0, eax, ebx, ecx, edx);
+    if (!(ebx & bit_AVX2))
+        return 0;
 
-#endif
-
-int cpu_supports_armv8_simd(void)
-{
-#ifdef CPU_FEATURES_ARCH_AARCH64
-    return aarch64_info()->features.asimd;
+    return 1;
 #else
     return 0;
 #endif