Miranda: Add Spatter request generator

config/sst_check_spatter.m4

@@ -0,0 +1,57 @@
+AC_DEFUN([SST_CHECK_SPATTER],
+[
+  sst_check_spatter_happy="yes"
+
+  AC_ARG_WITH([spatter],
+    [AS_HELP_STRING([--with-spatter@<:@=DIR@:>@],
+      [Specify the root directory for Spatter])])
+
+  CXXFLAGS_saved="$CXXFLAGS"
+  CPPFLAGS_saved="$CPPFLAGS"
+  LDFLAGS_saved="$LDFLAGS"
+  LIBS_saved="$LIBS"
+
+  AS_IF([test "$sst_check_spatter_happy" = "yes"], [
+    AS_IF([test ! -z "$with_spatter" -a "$with_spatter" != "yes"],
+      [SPATTER_CPPFLAGS="-I$with_spatter/../src/ -I$with_spatter/../src/Spatter -I$with_spatter/_deps/nlohmann_json-src/include"
+       CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
+       CPPFLAGS="$SPATTER_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
+       SPATTER_LDFLAGS="-L$with_spatter/src/Spatter -L$with_spatter/src/"
+       LDFLAGS="$SPATTER_LDFLAGS $AM_LDFLAGS $LDFLAGS"
+       SPATTER_LIB="-lSpatter"
+       SPATTER_LIBDIR="$with_spatter/src/Spatter/"],
+      [SPATTER_CXXFLAGS=
+       SPATTER_CPPFLAGS=
+       SPATTER_LDFLAGS=
+       SPATTER_LIB=
+       SPATTER_LIBDIR=])])
+
+  AC_LANG_PUSH([C++])
+  AC_CHECK_HEADERS([nlohmann/json.hpp \
+                    Configuration.hh \
+                    Input.hh \
+                    JSONParser.hh \
+                    PatternParser.hh \
+                    SpatterTypes.hh \
+                    AlignedAllocator.hh \
+                    Timer.hh], [], [sst_check_spatter_happy="no"])
+  AC_LANG_POP([C++])
+
+  CXXFLAGS="$CXXFLAGS_saved"
+  CPPFLAGS="$CPPFLAGS_saved"
+  LDFLAGS="$LDFLAGS_saved"
+  LIBS="$LIBS_saved"
+
+  AC_SUBST([SPATTER_CPPFLAGS])
+  AC_SUBST([SPATTER_LDFLAGS])
+  AC_SUBST([SPATTER_LIB])
+  AC_SUBST([SPATTER_LIBDIR])
+  AS_IF([test "x$sst_check_spatter_happy" = "xyes"], [AC_DEFINE([HAVE_SPATTER],[1],[Defines whether we have Spatter])])
+  AM_CONDITIONAL([USE_SPATTER], [test "x$sst_check_spatter_happy" = "xyes"])
+  AC_DEFINE_UNQUOTED([SPATTER_LIBDIR], ["$SPATTER_LIBDIR"], [Path to Spatter library])
+
+  AC_MSG_CHECKING([for Spatter])
+  AC_MSG_RESULT([$sst_check_spatter_happy])
+  AS_IF([test "$sst_check_spatter_happy" = "no" -a ! -z "$with_spatter"], [$3])
+  AS_IF([test "$sst_check_spatter_happy" = "yes"], [$1], [$2])
+])

src/sst/elements/memHierarchy/tests/genRefsOther.sh

@@ -17,6 +17,11 @@ sst ../../miranda/tests/inorderstream.py > ../../miranda/tests/refFiles/test_mir
 sst ../../miranda/tests/randomgen.py > ../../miranda/tests/refFiles/test_miranda_randomgen.out &
 sst ../../miranda/tests/revsinglestream.py > ../../miranda/tests/refFiles/test_miranda_revsinglestream.out &
 sst ../../miranda/tests/singlestream.py > ../../miranda/tests/refFiles/test_miranda_singlestream.out &
+sst ../../miranda/tests/spatterbench.py -- -pUNIFORM:8:1 -kgather -l$((2**16)) > ../../miranda/tests/refFiles/test_miranda_spatterbench_gather.out &
+sst ../../miranda/tests/spatterbench.py -- -pUNIFORM:8:1 -kscatter -l$((2**16)) > ../../miranda/tests/refFiles/test_miranda_spatterbench_scatter.out &
+sst ../../miranda/tests/spatterbench.py -- -gUNIFORM:8:1 -uUNIFORM:8:1 -ksg -l$((2**16)) > ../../miranda/tests/refFiles/test_miranda_spatterbench_sg.out &
+sst ../../miranda/tests/spatterbench.py -- -pUNIFORM:8:1 -uUNIFORM:8:1 -kmultiscatter -l$((2**16)) > ../../miranda/tests/refFiles/test_miranda_spatterbench_multiscatter.out &
+sst ../../miranda/tests/spatterbench.py -- -pUNIFORM:8:1 -gUNIFORM:8:1 -kmultigather -l$((2**16)) > ../../miranda/tests/refFiles/test_miranda_spatterbench_multigather.out &
 sst ../../miranda/tests/stencil3dbench.py > ../../miranda/tests/refFiles/test_miranda_stencil3dbench.out &
 wait
 

src/sst/elements/miranda/Makefile.am

@@ -66,6 +66,17 @@ libmiranda_la_LDFLAGS += $(STAKE_LDFLAGS) $(STAKE_LIB)
 AM_CPPFLAGS += $(STAKE_CPPFLAGS) -DHAVE_STAKE
 endif
 
+if USE_SPATTER
+libmiranda_la_SOURCES += \
+	generators/spatterbench.h \
+	generators/spatterbench.cc
+EXTRA_DIST += \
+	tests/spatterbench.py \
+	tests/refFiles/test_miranda_spatterbench.out
+libmiranda_la_LDFLAGS += $(SPATTER_LDFLAGS) $(SPATTER_LIB) -Wl,-R$(SPATTER_LIBDIR)
+AM_CPPFLAGS += $(SPATTER_CPPFLAGS) -DHAVE_SPATTER
+endif
+
 install-exec-hook:
 	$(SST_REGISTER_TOOL) SST_ELEMENT_SOURCE     miranda=$(abs_srcdir)
 	$(SST_REGISTER_TOOL) SST_ELEMENT_TESTS      miranda=$(abs_srcdir)/tests

src/sst/elements/miranda/configure.m4

@@ -8,5 +8,7 @@ AC_DEFUN([SST_miranda_CONFIG], [
   # Use global Stake check
   SST_CHECK_STAKE([],[],[AC_MSG_ERROR([Stake requests but could not be found])])
 
+  SST_CHECK_SPATTER([have_spatter=1],[have_spatter=0],[AC_MSG_ERROR([Spatter was requested but was not found])])
+
   AS_IF([test "$miranda_happy" = "yes"], [$1], [$2])
 ])