initial support for hpx

CMakeLists.txt

@@ -14,6 +14,7 @@ option (BUILD_SHARED_LIBS "Build shared libraries" ON)
 option (BUILD_TESTS "Build tests" ON)
 
 option (ENABLE_OPENMP "Use OpenMP for multithreading" OFF)
+option (ENABLE_HPX "Use HPX for multithreading" OFF)
 option (ENABLE_THREADS "Use pthread for multithreading" OFF)
 option (WITH_COMBINED_THREADS "Merge thread library" OFF)
 
@@ -122,13 +123,24 @@ if (Threads_FOUND)
   set (HAVE_THREADS TRUE)
 endif ()
 
+if(ENABLE_OPENMP AND ENABLE_HPX)
+  message(FATAL "OpenMP and HPX cannot be enabled at the same time")
+endif ()
+
 if (ENABLE_OPENMP)
   find_package (OpenMP)
 endif ()
 if (OPENMP_FOUND)
   set (HAVE_OPENMP TRUE)
 endif ()
 
+if (ENABLE_HPX)
+  find_package (HPX)
+endif ()
+if (HPX_FOUND)
+  set (HAVE_HPX TRUE)
+endif ()
+
 include (CheckCCompilerFlag)
 
 if (ENABLE_SSE)
@@ -257,6 +269,7 @@ set(fftw_par_SOURCE
 
 set (fftw_threads_SOURCE ${fftw_par_SOURCE} threads/threads.c)
 set (fftw_omp_SOURCE ${fftw_par_SOURCE} threads/openmp.c)
+set (fftw_hpx_SOURCE ${fftw_par_SOURCE} threads/hpx.cpp)
 
 
 include_directories (.)
@@ -365,6 +378,16 @@ if (OPENMP_FOUND)
   target_compile_options (${fftw3_lib}_omp PRIVATE ${OpenMP_C_FLAGS})
 endif ()
 
+if (HPX_FOUND)
+  add_library (${fftw3_lib}_hpx SHARED ${fftw_hpx_SOURCE})
+  target_include_directories (${fftw3_lib}_hpx INTERFACE $<INSTALL_INTERFACE:include>)
+  target_link_libraries (${fftw3_lib}_hpx PUBLIC HPX::hpx)
+  target_link_libraries (${fftw3_lib}_hpx ${fftw3_lib})
+  target_link_libraries (${fftw3_lib}_hpx ${CMAKE_THREAD_LIBS_INIT})
+  list (APPEND subtargets ${fftw3_lib}_hpx)
+  target_compile_options (${fftw3_lib}_hpx PRIVATE HPX::hpx)
+endif ()
+
 foreach(subtarget ${subtargets})
   set_target_properties (${subtarget} PROPERTIES SOVERSION 3.6.9 VERSION 3)
   install (TARGETS ${subtarget}

configure.ac

@@ -296,6 +296,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_PROG_RANLIB
 AC_PROG_CPP
+AC_PROG_CXX
 
 AC_CHECK_PROG(OCAMLBUILD, ocamlbuild, ocamlbuild)
 
@@ -677,6 +678,56 @@ if test "$enable_openmp" = "yes"; then
    AX_OPENMP([], [AC_MSG_ERROR([don't know how to enable OpenMP])])
 fi
 
+AC_ARG_ENABLE(hpx, [AC_HELP_STRING([--enable-hpx],[use HPX for parallelism])], enable_hpx=$enableval, enable_hpx=no)
+
+if test "$enable_hpx" = "yes"; then
+   AC_SUBST(HPX_LIBS)
+   AC_SUBST(HPX_CFLAGS)
+
+   AC_CHECK_PROG(HAS_PKGCONFIG, pkg-config, yes, no, [], [])
+
+   if test "$HAS_PKGCONFIG" = "yes"; then
+      AC_SUBST(hpxcompfound)
+
+      PKG_CHECK_EXISTS([hpx_component],[hpxcompfound=yes],[hpxcompfound=no])
+
+      if test "$hpxcompfound" = "no"; then
+         PKG_CHECK_EXISTS([hpx_component_relwithdebinfo],[],[
+            AC_MSG_ERROR([required library HPX not found, check PKG_CONFIG_PATH]) 
+         ])
+         PKG_CHECK_MODULES([HPX], [hpx_component_relwithdebinfo])
+      else
+         PKG_CHECK_MODULES([HPX], [hpx_component])
+      fi
+
+      AC_SUBST(HPX_CXXFLAGS, ["$HPX_CFLAGS"])
+      AC_DEFINE(HAVE_HPX,1,[Define to enable HPX])
+   else
+      AC_LANG_PUSH([C++])
+
+      AC_SUBST(HAVE_HPX_HPP)
+      AC_CHECK_HEADER(hpx/hpx.hpp,[HAVE_HPX_HPP=1],[HAVE_HPX_HPP=0])
+      if test "$HAVE_HPX_HPP" = "0"; then
+         AC_MSG_ERROR([required HPX not found, check CXXFLAGS])
+      fi
+
+      AC_SUBST(HAVE_HPX)
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([#include <hpx/hpx.hpp>],
+           [hpx::init(); hpx::finalize();])],
+        [HAVE_HPX=1],
+        [HAVE_HPX=0])
+
+      if test "$HAVE_HPX" = "0"; then
+         AC_MSG_ERROR([required library HPX not found, check LD_LIBRARY_PATH]) 
+      fi
+
+      HPX_LIBS="-lhpx -lhpx_core"
+      AC_LANG_POP([C++])
+   fi
+
+fi
+
 AC_ARG_ENABLE(threads, [AC_HELP_STRING([--enable-threads],[compile FFTW SMP threads library])], enable_threads=$enableval, enable_threads=no)
 
 if test "$enable_threads" = "yes"; then
@@ -721,6 +772,7 @@ fi
 AC_SUBST(THREADLIBS)
 AM_CONDITIONAL(THREADS, test "$enable_threads" = "yes")
 AM_CONDITIONAL(OPENMP, test "$enable_openmp" = "yes")
+AM_CONDITIONAL(HPX, test "$enable_hpx" = "yes")
 AM_CONDITIONAL(SMP, test "$enable_threads" = "yes" -o "$enable_openmp" = "yes")
 AM_CONDITIONAL(COMBINED_THREADS, test x"$with_combined_threads" = xyes)
 

kernel/cycle.h

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2003, 2007-14 Matteo Frigo
  * Copyright (c) 2003, 2007-14 Massachusetts Institute of Technology
+ * Copyright (c) 2024 Christopher Taylor, Tactical Computing Labs, LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -562,3 +563,26 @@ static inline ticks getticks(void)
 INLINE_ELAPSED(inline)
 #define HAVE_TICK_COUNTER
 #endif
+
+/*----------------------------------------------------------------*/
+/*
+ * RISC_V 64-bit cycle counter (RV64G)
+ */
+#if defined(__riscv) && (__riscv_xlen == 64) && !defined(HAVE_TICK_COUNTER)
+
+typedef unsigned long ticks;
+
+static __inline__ ticks getticks(void)
+{
+     unsigned long cycles;
+
+     __asm__ __volatile__ ("rdcycle %0" : "=r" (cycles));
+
+     /* no input, nothing else clobbered */
+     return cycles;
+}
+
+INLINE_ELAPSED(inline)
+#define HAVE_TICK_COUNTER
+
+#endif

mpi/Makefile.am

@@ -32,11 +32,14 @@ mpi_bench_CFLAGS = $(PTHREAD_CFLAGS)
 if !COMBINED_THREADS
 LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
 endif
-else
+endif
 if OPENMP
 mpi_bench_CFLAGS = $(OPENMP_CFLAGS)
 LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_omp.la
 endif
+if HPX
+mpi_bench_CFLAGS = $(HPX_CXXFLAGS)
+LIBFFTWTHREADS = $(HPX_LIBS) $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_hpx.la
 endif
 
 mpi_bench_SOURCES = mpi-bench.c $(top_srcdir)/tests/fftw-bench.c $(top_srcdir)/tests/hook.c

threads/Makefile.am

@@ -7,14 +7,22 @@ else
 FFTWOMPLIB = 
 endif
 
+if HPX
+FFTWHPXLIB = libfftw3@PREC_SUFFIX@_hpx.la
+else
+FFTWHPXLIB =
+endif
+
 if THREADS
 if COMBINED_THREADS
 noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
-else
+endif
+if OPENMP
 lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la $(FFTWOMPLIB)
 endif
-else
-lib_LTLIBRARIES = $(FFTWOMPLIB)
+if HPX
+lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la $(FFTWHPXLIB)
+endif
 endif
 
 libfftw3@PREC_SUFFIX@_threads_la_SOURCES = api.c conf.c threads.c	\
@@ -26,6 +34,7 @@ if !COMBINED_THREADS
 libfftw3@PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3@[email protected]
 endif
 
+if OPENMP
 libfftw3@PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c	\
 threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
 vrank-geq1-rdft2.c f77api.c f77funcs.h
@@ -34,3 +43,16 @@ libfftw3@PREC_SUFFIX@_omp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
 if !COMBINED_THREADS
 libfftw3@PREC_SUFFIX@_omp_la_LIBADD = ../libfftw3@[email protected]
 endif
+endif
+
+if HPX
+libfftw3@PREC_SUFFIX@_hpx_la_SOURCES = api.c conf.c hpx.cpp \
+threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c  \
+vrank-geq1-rdft2.c f77api.c f77funcs.h
+libfftw3@PREC_SUFFIX@_hpx_la_CXXFLAGS = $(HPX_CXXFLAGS)
+libfftw3@PREC_SUFFIX@_hpx_la_CFLAGS = $(AM_CFLAGS)
+libfftw3@PREC_SUFFIX@_hpx_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+if !COMBINED_THREADS
+libfftw3@PREC_SUFFIX@_hpx_la_LIBADD = ../libfftw3@[email protected] 
+endif
+endif