Update DFT benchmark tool

CMakeLists.txt

@@ -397,6 +397,7 @@ if(SLEEF_SHOW_CONFIG)
   message(STATUS "GMP : " ${LIBGMP})
   message(STATUS "RT : " ${LIBRT})
   message(STATUS "FFTW3 : " ${LIBFFTW3})
+  message(STATUS "FFTW3F : " ${LIBFFTW3F})
   message(STATUS "OPENSSL : " ${OPENSSL_VERSION})
   message(STATUS "SDE : " ${SDE_COMMAND})
   if (SLEEF_BUILD_INLINE_HEADERS)

Configure.cmake

@@ -58,7 +58,15 @@ if(SLEEF_BUILD_WITH_LIBM)
 endif()
 find_library(LIBGMP gmp)
 find_library(LIBRT rt)
+
 find_library(LIBFFTW3 fftw3)
+find_library(LIBFFTW3F fftw3f)
+find_library(LIBFFTW3_OMP fftw3_omp)
+find_library(LIBFFTW3F_OMP fftw3f_omp)
+
+if (LIBFFTW3 AND LIBFFTW3F AND LIBFFTW3_OMP AND LIBFFTW3F_OMP)
+  set(SLEEF_LIBFFTW3_LIBRARIES ${LIBFFTW3} ${LIBFFTW3F} ${LIBFFTW3_OMP} ${LIBFFTW3F_OMP})
+endif()
 
 if (LIB_MPFR)
   find_path(MPFR_INCLUDE_DIR
@@ -70,7 +78,7 @@ if (LIBFFTW3)
   find_path(FFTW3_INCLUDE_DIR
     NAMES fftw3.h
     ONLY_CMAKE_FIND_ROOT_PATH)
-endif(LIBFFTW3)
+endif()
 
 if (NOT LIBM)
   set(LIBM "")

include/sleefdft.h

@@ -6,6 +6,7 @@ extern "C"
 {
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -46,11 +47,15 @@ IMPORT struct SleefDFT *SleefDFT_float_init1d(uint32_t n, const float *in, float
 IMPORT struct SleefDFT *SleefDFT_float_init2d(uint32_t n, uint32_t m, const float *in, float *out, uint64_t mode);
 IMPORT void SleefDFT_float_execute(struct SleefDFT *ptr, const float *in, float *out);
 
+IMPORT void SleefDFT_execute(struct SleefDFT *ptr, const void *in, void *out);
+
 IMPORT void SleefDFT_dispose(struct SleefDFT *ptr);
 
 IMPORT void SleefDFT_setPath(struct SleefDFT *ptr, char *pathStr);
 IMPORT int SleefDFT_getPath(struct SleefDFT *ptr, char *pathStr, int pathStrSize);
 
+IMPORT void SleefDFT_setDefaultVerboseFP(FILE *fp);
+
 //
 
 IMPORT void SleefDFT_setPlanFilePath(const char *path, const char *arch, uint64_t mode);

src/dft-tester/CMakeLists.txt

@@ -83,22 +83,6 @@ if((NOT MSVC) AND NOT SLEEF_CLANG_ON_WINDOWS)
   set_target_properties(${TARGET_MEASUREDFT} PROPERTIES ${COMMON_TARGET_PROPERTIES})
 endif()
 
-# Target executable bench1dst
-set(TARGET_BENCH1DST "bench1dst")
-add_executable(${TARGET_BENCH1DST} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
-add_dependencies(${TARGET_BENCH1DST} ${TARGET_HEADERS} ${TARGET_LIBSLEEF} ${TARGET_LIBDFT})
-target_compile_definitions(${TARGET_BENCH1DST} PRIVATE ${COMMON_TARGET_DEFINITIONS})
-target_link_libraries(${TARGET_BENCH1DST} ${COMMON_LINK_LIBRARIES})
-set_target_properties(${TARGET_BENCH1DST} PROPERTIES ${COMMON_TARGET_PROPERTIES})
-
-# Target executable bench1dmt
-set(TARGET_BENCH1DMT "bench1dmt")
-add_executable(${TARGET_BENCH1DMT} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
-add_dependencies(${TARGET_BENCH1DMT} ${TARGET_HEADERS} ${TARGET_LIBSLEEF} ${TARGET_LIBDFT})
-target_compile_definitions(${TARGET_BENCH1DMT} PRIVATE ${COMMON_TARGET_DEFINITIONS} MULTITHREAD=1)
-target_link_libraries(${TARGET_BENCH1DMT} ${COMMON_LINK_LIBRARIES})
-set_target_properties(${TARGET_BENCH1DMT} PROPERTIES ${COMMON_TARGET_PROPERTIES})
-
 # Target executable test_dftplanner
 set(TARGET_TEST_DFTPLANNER "test_dftplanner")
 add_executable(${TARGET_TEST_DFTPLANNER} test_dftplanner.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
@@ -196,20 +180,22 @@ if (LIBFFTW3 AND NOT SLEEF_DISABLE_FFTW)
   add_test_dft(${TARGET_FFTWTEST2DSP}_10_10 $<TARGET_FILE:${TARGET_FFTWTEST2DSP}> 10 10)
   add_test_dft(${TARGET_FFTWTEST2DSP}_5_15 $<TARGET_FILE:${TARGET_FFTWTEST2DSP}> 5 15)
 
-  # Target executable bench1dfftwst
-  set(TARGET_BENCH1DFFTWST "bench1dfftwst")
-  add_executable(${TARGET_BENCH1DFFTWST} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
-  target_compile_definitions(${TARGET_BENCH1DFFTWST} PRIVATE ${COMMON_TARGET_DEFINITIONS} USEFFTW=1)
-  target_link_libraries(${TARGET_BENCH1DFFTWST} ${COMMON_LINK_LIBRARIES} ${LIBFFTW3})
-  set_target_properties(${TARGET_BENCH1DFFTWST} PROPERTIES ${COMMON_TARGET_PROPERTIES})
-
-  if (FALSE)
-    # Target executable bench1dfftwmt
-    set(TARGET_BENCH1DFFTWMT "bench1dfftwmt")
-    add_executable(${TARGET_BENCH1DFFTWMT} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
-    target_compile_definitions(${TARGET_BENCH1DFFTWMT} PRIVATE ${COMMON_TARGET_DEFINITIONS} USEFFTW=1 MULTITHREAD=1)
-    target_link_libraries(${TARGET_BENCH1DFFTWMT} ${COMMON_LINK_LIBRARIES} ${LIBFFTW3})
-    set_target_properties(${TARGET_BENCH1DFFTWMT} PROPERTIES ${COMMON_TARGET_PROPERTIES})
+  if (SLEEF_LIBFFTW3_LIBRARIES)
+    # Target executable dftbench1ddp
+    set(TARGET_BENCH1DDP "dftbench1ddp")
+    add_executable(${TARGET_BENCH1DDP} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
+    add_dependencies(${TARGET_BENCH1DDP} ${TARGET_HEADERS} ${TARGET_LIBSLEEF} ${TARGET_LIBDFT})
+    target_compile_definitions(${TARGET_BENCH1DDP} PRIVATE ${COMMON_TARGET_DEFINITIONS} BASETYPEID=1)
+    target_link_libraries(${TARGET_BENCH1DDP} ${COMMON_LINK_LIBRARIES} ${SLEEF_LIBFFTW3_LIBRARIES})
+    set_target_properties(${TARGET_BENCH1DDP} PROPERTIES ${COMMON_TARGET_PROPERTIES})
+
+    # Target executable dftbench1dsp
+    set(TARGET_BENCH1DSP "dftbench1dsp")
+    add_executable(${TARGET_BENCH1DSP} bench1d.cpp ${PROJECT_SOURCE_DIR}/include/sleefdft.h)
+    add_dependencies(${TARGET_BENCH1DSP} ${TARGET_HEADERS} ${TARGET_LIBSLEEF} ${TARGET_LIBDFT})
+    target_compile_definitions(${TARGET_BENCH1DSP} PRIVATE ${COMMON_TARGET_DEFINITIONS} BASETYPEID=2)
+    target_link_libraries(${TARGET_BENCH1DSP} ${COMMON_LINK_LIBRARIES} ${SLEEF_LIBFFTW3_LIBRARIES})
+    set_target_properties(${TARGET_BENCH1DSP} PROPERTIES ${COMMON_TARGET_PROPERTIES})
   endif()
 else(LIBFFTW3 AND NOT SLEEF_DISABLE_FFTW)
   if(MSVC OR SLEEF_CLANG_ON_WINDOWS)