simd corrected DIT

Author: falseywinchnet

CMakeLists.txt

@@ -13,6 +13,8 @@ option(BFFT_BUILD_PROBES "Build optional BFFT comparison probes" ON)
 option(BFFT_ENABLE_AUTO_SIMD "Enable host SIMD flags detected by CMake" ON)
 option(BFFT_COMPARE_WITH_IPP "Enable Intel IPP in the library comparison probe when found" ON)
 option(BFFT_ENABLE_PFFFT_BENCHMARK "Enable PFFFT in the benchmark example when found" ON)
+option(BFFT_USE_DIT_RFFT "Use the experimental DIT RFFT kernel for standard double forward" OFF)
+option(BFFT_USE_DIT_RFFT_INVERSE "Use the experimental DIT RFFT kernel for standard double inverse" OFF)
 
 set(BFFT_PUBLIC_HEADERS
   include/bfft/bfft.h
@@ -43,6 +45,12 @@ function(bfft_configure_library target)
   if(BFFT_PLATFORM_LIBS)
     target_link_libraries(${target} PUBLIC ${BFFT_PLATFORM_LIBS})
   endif()
+  if(BFFT_USE_DIT_RFFT)
+    target_compile_definitions(${target} PRIVATE BFFT_USE_DIT_RFFT=1)
+  endif()
+  if(BFFT_USE_DIT_RFFT_INVERSE)
+    target_compile_definitions(${target} PRIVATE BFFT_USE_DIT_RFFT_INVERSE=1)
+  endif()
 endfunction()
 
 add_library(bfft_static STATIC ${BFFT_SOURCES} ${BFFT_PUBLIC_HEADERS})
@@ -114,6 +122,7 @@ if(BFFT_BUILD_EXAMPLES)
   bfft_add_cpp_executable(locality_probe examples/locality_probe.cpp)
   bfft_add_cpp_executable(cpp_api_demo examples/cpp_api_demo.cpp)
   bfft_add_cpp_executable(atan2_benchmark examples/atan2_benchmark.cpp)
+  bfft_add_cpp_executable(dif_vs_dit_benchmark examples/dif_vs_dit_benchmark.cpp)
   bfft_add_cpp_executable(atan_vectoring_network_experiment src/atan_vectoring_network_experiment.cpp)
   bfft_add_cpp_executable(audio_magphase_roundtrip_benchmark examples/audio_magphase_roundtrip_benchmark.cpp)
   bfft_add_cpp_executable(fftw_polar_roundtrip_benchmark examples/fftw_polar_roundtrip_benchmark.cpp)

Makefile

@@ -16,6 +16,14 @@ CXXWARNFLAGS ?= -Wall -Wextra -Wpedantic
 COPTFLAGS ?= -O2
 CWARNFLAGS ?= -Wall -Wextra -Wpedantic
 CPPFLAGS ?=
+BFFT_USE_DIT_RFFT ?= 0
+BFFT_USE_DIT_RFFT_INVERSE ?= 0
+ifeq ($(BFFT_USE_DIT_RFFT),1)
+  CPPFLAGS += -DBFFT_USE_DIT_RFFT=1
+endif
+ifeq ($(BFFT_USE_DIT_RFFT_INVERSE),1)
+  CPPFLAGS += -DBFFT_USE_DIT_RFFT_INVERSE=1
+endif
 # BFFT_MAKE_DOCTOR_CXXFLAGS_GUARD_BEGIN
 ifeq ($(filter undefined default,$(origin CXXFLAGS)),)
 else
@@ -66,6 +74,7 @@ SHARED_LIB := $(BUILD_DIR)/lib$(LIB_NAME).so
 PC_FILE := $(BUILD_DIR)/$(LIB_NAME).pc
 BENCH := $(BUILD_DIR)/examples/benchmark
 BODFT_BENCH := $(BUILD_DIR)/examples/bodft_benchmark
+DIF_DIT_BENCH := $(BUILD_DIR)/examples/dif_vs_dit_benchmark
 APPLE_BENCH := $(BUILD_DIR)/examples/apple_benchmark
 ATAN2_BENCH := $(BUILD_DIR)/examples/atan2_benchmark
 LOCALITY_PROBE := $(BUILD_DIR)/examples/locality_probe
@@ -96,10 +105,10 @@ all: $(STATIC_LIB) $(SHARED_LIB) examples
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)/src $(BUILD_DIR)/examples $(BUILD_DIR)/tests $(BUILD_DIR)/benchmarks
 
-$(OBJ): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(OBJ): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp src/detail/experimental_radix4_rfft_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(LIB_CPPFLAGS) $(LIB_CXXFLAGS) -c $< -o $@
 
-$(BODFT_OBJ): $(BODFT_SRC) include/bfft/bodft.h include/bfft/bfft.h src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(BODFT_OBJ): $(BODFT_SRC) include/bfft/bodft.h include/bfft/bfft.h src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(LIB_CPPFLAGS) $(LIB_CXXFLAGS) -c $< -o $@
 
 $(STFT_OBJ): $(STFT_SRC) include/bfft/stft.h include/bfft/bfft.h include/bfft/bodft.h | $(BUILD_DIR)
@@ -120,27 +129,30 @@ $(PC_FILE): pkgconfig/bfft.pc.in | $(BUILD_DIR)
 
 examples: $(BENCH) $(BODFT_BENCH) $(APPLE_EXAMPLES) $(LOCALITY_PROBE) $(C_DEMO) $(CPP_DEMO)
 
-benchmarks: $(BENCH) $(BODFT_BENCH) $(ATAN2_BENCH)
+benchmarks: $(BENCH) $(BODFT_BENCH) $(DIF_DIT_BENCH) $(ATAN2_BENCH)
 
 asm-check: $(ASM_OUTPUTS)
 	@if [ -z "$(ASM_OUTPUTS)" ]; then echo "No x86 assembly variants supported by $(CXX)."; fi
 
-$(AVX2_ASM): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(AVX2_ASM): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp src/detail/experimental_radix4_rfft_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(LIB_CPPFLAGS) $(CXXFLAGS) $(AVX2_FLAGS) -S -fverbose-asm $< -o $@
 
-$(BODFT_AVX2_ASM): $(BODFT_SRC) include/bfft/bodft.h include/bfft/bfft.h src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(BODFT_AVX2_ASM): $(BODFT_SRC) include/bfft/bodft.h include/bfft/bfft.h src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(LIB_CPPFLAGS) $(CXXFLAGS) $(AVX2_FLAGS) -S -fverbose-asm $< -o $@
 
-$(SSE2_ASM): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(SSE2_ASM): $(SRC) include/bfft/bfft.h src/detail/bruun_kernel.hpp src/detail/experimental_radix4_rfft_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(LIB_CPPFLAGS) $(CXXFLAGS) $(SSE2_FLAGS) -S -fverbose-asm $< -o $@
 
 $(BENCH): examples/benchmark.cpp include/bfft/bfft.hpp $(STATIC_LIB) | $(BUILD_DIR)
 	$(CXX) $(CPPFLAGS) $(INCLUDES) $(CXXFLAGS) $(AUTO_SIMD_FLAGS) $< $(STATIC_LIB) $(LDLIBS) $(DL_LIBS) -o $@
 
-$(BODFT_BENCH): examples/bodft_benchmark.cpp src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(BODFT_BENCH): examples/bodft_benchmark.cpp src/detail/bodft_kernel.hpp src/detail/bruun_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(CPPFLAGS) $(INCLUDES) $(CXXFLAGS) $(AUTO_SIMD_FLAGS) $< $(LDLIBS) -o $@
 
-$(ATAN2_BENCH): examples/atan2_benchmark.cpp src/detail/bruun_kernel.hpp | $(BUILD_DIR)
+$(DIF_DIT_BENCH): examples/dif_vs_dit_benchmark.cpp src/detail/experimental_radix4_rfft_kernel.hpp src/detail/bruun_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp include/bfft/bfft.hpp $(STATIC_LIB) | $(BUILD_DIR)
+	$(CXX) $(CPPFLAGS) $(INCLUDES) $(CXXFLAGS) $(AUTO_SIMD_FLAGS) $< $(STATIC_LIB) $(LDLIBS) -o $@
+
+$(ATAN2_BENCH): examples/atan2_benchmark.cpp src/detail/bruun_kernel.hpp src/detail/MAG_REPRESENT_KERNEL.hpp | $(BUILD_DIR)
 	$(CXX) $(CPPFLAGS) $(INCLUDES) $(CXXFLAGS) $(AUTO_SIMD_FLAGS) $< $(LDLIBS) -o $@
 
 $(APPLE_BENCH): examples/apple_benchmark.cpp include/bfft/bfft.hpp $(STATIC_LIB) | $(BUILD_DIR)
@@ -234,4 +246,3 @@ print-flags:
 	@echo "AUTO_SIMD_FLAGS=$(AUTO_SIMD_FLAGS)"
 	@echo "LIB_CXXFLAGS=$(LIB_CXXFLAGS)"
 	@echo "LIB_CXXFLAGS origin is makefile-expanded"
-