Snndl re

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/sst/elements/SnnDL"]
+	path = src/sst/elements/SnnDL
+	url = https://github.com/NJUAIXGY/SnnDL.git

config/sst_check_pintool.m4

@@ -53,6 +53,7 @@ dnl pin.sh is present in pin 2.14, but not in 3.0+
   PIN_VERSION=$($PINTOOL_RUNTIME -version | head -1 | sed 's/.*pin-\(.*\)/\1/' | sed 's/-.*//')
   dnl AC_MSG_CHECKING([pintool version])
   dnl AC_MSG_RESULT([$PIN_VERSION])
+  PIN_VERSION_MINOR=$(echo $PIN_VERSION | cut -d '.' -f 2)
 
 dnl pin 3.24+ requires different compile line
   sst_check_pin_324_ge="yes"
@@ -81,4 +82,40 @@ dnl pin 3.25+ needs libdwarf instead of lib3dwarf
 
   AS_IF([test "$sst_check_pintool_happy" = "no" -a ! -z "$with_pin" -a "$with_pin" != "no"], [$3])
   AS_IF([test "$sst_check_pintool_happy" = "yes"], [$1], [$2])
+
+  dnl Common flags
+  PIN_CPPFLAGS="-g \
+  -Wall \
+  -Werror \
+  -Wno-unknown-pragmas \
+  -D__PIN__=1 -DPIN_CRT=1 \
+  -fno-stack-protector \
+  -fno-exceptions \
+  -funwind-tables \
+  -fasynchronous-unwind-tables \
+  -fomit-frame-pointer \
+  -fno-strict-aliasing \
+  -fno-rtti \
+  -faligned-new \
+  -fpic \
+  -DTARGET_IA32E \
+  -DHOST_IA32E \
+  -DTARGET_LINUX \
+  -DPIN_VERSION_MINOR=$PIN_VERSION_MINOR"
+  AC_SUBST([PIN_CPPFLAGS])
+
+  AC_LANG_PUSH([C++])
+  AX_COMPILER_VENDOR
+  AC_LANG_POP([C++])
+  AS_IF([test "$ax_cv_cxx_compiler_vendor" = "clang"],
+        [PIN_CPPFLAGS_COMPILER="-D_LIBCPP_DISABLE_AVAILABILITY \
+         -D_LIBCPP_NO_VCRUNTIME \
+         -D__BIONIC__ \
+         -fno-builtin-bcmp \
+         -Wno-non-c-typedef-for-linkage \
+         -Wno-microsoft-include \
+         -Wno-unicode"],
+        [PIN_CPPFLAGS_COMPILER="-fno-exceptions \
+         -fabi-version=2"])
+  AC_SUBST([PIN_CPPFLAGS_COMPILER])
 ])

configure.ac

@@ -3,7 +3,7 @@
 #
 
 # Set Version of SST Elements Library
-AC_INIT([SST Elements Library],[-dev],[sst@sandia.gov])
+AC_INIT([SST Elements Library],[15.0.0],[sst@sandia.gov])
 
 AC_PREREQ([2.59])
 AC_COPYRIGHT([Copyright National Technology and Engineering Solutions of Sandia (NTESS), 2004-2025])

src/sst/elements/ariel/Makefile.am

@@ -8,32 +8,16 @@ AM_CPPFLAGS += \
 
 if HAVE_SET_PTRACER
 AM_CPPFLAGS += "-DHAVE_SET_PTRACER=1"
-endif
+endif # HAVE_SET_PTRACER
 
 if HAVE_PIN3
 AM_CPPFLAGS += $(PINTOOL_CPPFLAGS)
 AM_CPPFLAGS += "-DHAVE_PINCRT=1 "
 else
 if HAVE_PINTOOL
 AM_CPPFLAGS += $(PINTOOL_CPPFLAGS)
-endif
-endif
-
-# Common flags
-PIN_CPPFLAGS = -g \
-	-Wall \
-	-Werror \
-	-Wno-unknown-pragmas \
-	-D__PIN__=1 -DPIN_CRT=1 \
-	-fno-stack-protector \
-	-fno-exceptions \
-	-funwind-tables \
-	-fasynchronous-unwind-tables \
-	-fno-rtti \
-        -DTARGET_IA32E \
-	-DHOST_IA32E \
-	-fPIC \
-	-DTARGET_LINUX
+endif # HAVE_PINTOOL
+endif # HAVE_PIN3
 
 compdir = $(pkglibdir)
 comp_LTLIBRARIES = libariel.la
@@ -113,14 +97,14 @@ libariel_la_LDFLAGS += $(LIBZ_LDFLAGS)
 libariel_la_LIBADD += $(LIBZ_LIB)
 AM_CPPFLAGS += $(LIBZ_CPPFLAGS)
 libariel_la_SOURCES += arielgzbintracegen.h arielgzbintracegen.cc
-endif
+endif # USE_LIBZ
 
 if HAVE_PINTOOL
 if HAVE_PIN3
 libariel_la_SOURCES += frontend/pin3/pin3frontend.h \
 		       frontend/pin3/pin3frontend.cc
-endif
-endif
+endif # HAVE_PIN3
+endif # HAVE_PINTOOL
 
 libariel_la_CPPFLAGS = \
 	-DARIEL_TRACE_LIB=$(libdir)/sst \
@@ -143,6 +127,10 @@ if !SST_COMPILE_OSX
 
 if HAVE_PINTOOL
 
+TARGET = intel64
+BIONIC_ARCH = x86_64
+XED_ARCH = intel64
+
 if HAVE_PIN3
 
 all-local : fesimple.so
@@ -151,95 +139,95 @@ if HAVE_PIN325
 
 fesimple.so : fesimple.o
 	$(CXX) -shared -Wl,--hash-style=sysv \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtbeginS.o \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtbeginS.o \
 	    -Wl,-Bsymbolic -Wl,--version-script=$(PINTOOL_DIR)/source/include/pin/pintool.ver \
 	    -o fesimple.so fesimple.o \
-	    -L$(PINTOOL_DIR)/intel64/runtime/pincrt \
-	    -L$(PINTOOL_DIR)/intel64/lib \
-	    -L$(PINTOOL_DIR)/intel64/lib-ext \
-	    -L$(PINTOOL_DIR)/extras/xed-intel64/lib -lpin -lxed \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtendS.o \
+	    -L$(PINTOOL_DIR)/$(TARGET)/runtime/pincrt \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib-ext \
+	    -L$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/lib -lpin -lxed \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtendS.o \
 	    -lpindwarf -ldl-dynamic -nostdlib -lc++ -lc++abi -lm-dynamic -lc-dynamic -lunwind-dynamic
 
 fesimple.o : $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 	$(CXX) \
-	    $(PIN_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	    $(PIN_CPPFLAGS) $(PIN_CPPFLAGS_COMPILER) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	    -I$(top_srcdir)/src/sst/elements/ariel \
 	    -I$(PINTOOL_DIR)/source/include/pin \
 	    -I$(PINTOOL_DIR)/source/include/pin/gen \
 	    -isystem $(PINTOOL_DIR)/extras/cxx/include \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include \
-	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-x86_64 \
+	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-$(BIONIC_ARCH) \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi/asm-x86 \
 	    -I$(PINTOOL_DIR)/extras/components/include \
-	    -I$(PINTOOL_DIR)/extras/xed-intel64/include/xed \
+	    -I$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/include/xed \
 	    -I$(PINTOOL_DIR)/source/tools/Utils \
 	    -I$(PINTOOL_DIR)/source/tools/InstLib \
-	    -O3 -fomit-frame-pointer -fno-strict-aliasing -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
+	    -O3 -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 
 else
 
 if HAVE_PIN324
 fesimple.so : fesimple.o
 	$(CXX) -shared -Wl,--hash-style=sysv \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtbeginS.o \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtbeginS.o \
 	    -Wl,-Bsymbolic -Wl,--version-script=$(PINTOOL_DIR)/source/include/pin/pintool.ver \
 	    -o fesimple.so fesimple.o \
-	    -L$(PINTOOL_DIR)/intel64/runtime/pincrt \
-	    -L$(PINTOOL_DIR)/intel64/lib \
-	    -L$(PINTOOL_DIR)/intel64/lib-ext \
-	    -L$(PINTOOL_DIR)/extras/xed-intel64/lib -lpin -lxed \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtendS.o \
+	    -L$(PINTOOL_DIR)/$(TARGET)/runtime/pincrt \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib-ext \
+	    -L$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/lib -lpin -lxed \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtendS.o \
 	    -lpin3dwarf -ldl-dynamic -nostdlib -lc++ -lc++abi -lm-dynamic -lc-dynamic -lunwind-dynamic
 
 fesimple.o : $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 	$(CXX) \
-	    $(PIN_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	    $(PIN_CPPFLAGS) $(PIN_CPPFLAGS_COMPILER) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	    -I$(top_srcdir)/src/sst/elements/ariel \
 	    -I$(PINTOOL_DIR)/source/include/pin \
 	    -I$(PINTOOL_DIR)/source/include/pin/gen \
 	    -isystem $(PINTOOL_DIR)/extras/cxx/include \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include \
-	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-x86_64 \
+	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-$(BIONIC_ARCH) \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi/asm-x86 \
 	    -I$(PINTOOL_DIR)/extras/components/include \
-	    -I$(PINTOOL_DIR)/extras/xed-intel64/include/xed \
+	    -I$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/include/xed \
 	    -I$(PINTOOL_DIR)/source/tools/Utils \
 	    -I$(PINTOOL_DIR)/source/tools/InstLib \
-	    -O3 -fomit-frame-pointer -fno-strict-aliasing -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
+	    -O3 -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 else
 
 fesimple.so : fesimple.o
 	$(CXX) -shared -Wl,--hash-style=sysv \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtbeginS.o \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtbeginS.o \
 	    -Wl,-Bsymbolic -Wl,--version-script=$(PINTOOL_DIR)/source/include/pin/pintool.ver \
 	    -o fesimple.so fesimple.o \
-	    -L$(PINTOOL_DIR)/intel64/runtime/pincrt \
-	    -L$(PINTOOL_DIR)/intel64/lib \
-	    -L$(PINTOOL_DIR)/intel64/lib-ext \
-	    -L$(PINTOOL_DIR)/extras/xed-intel64/lib -lpin -lxed \
-	    $(PINTOOL_DIR)/intel64/runtime/pincrt/crtendS.o \
+	    -L$(PINTOOL_DIR)/$(TARGET)/runtime/pincrt \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib-ext \
+	    -L$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/lib -lpin -lxed \
+	    $(PINTOOL_DIR)/$(TARGET)/runtime/pincrt/crtendS.o \
 	    -lpin3dwarf -ldl-dynamic -nostdlib -lstlport-dynamic -lm-dynamic -lc-dynamic -lunwind-dynamic
 
 fesimple.o : $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 	$(CXX) \
-	    $(PIN_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	    $(PIN_CPPFLAGS) $(PIN_CPPFLAGS_COMPILER) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	    -I$(top_srcdir)/src/sst/elements/ariel \
 	    -I$(PINTOOL_DIR)/source/include/pin \
 	    -I$(PINTOOL_DIR)/source/include/pin/gen \
 	    -isystem $(PINTOOL_DIR)/extras/stlport/include \
 	    -isystem $(PINTOOL_DIR)/extras/libstdc++/include \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include \
-	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-x86_64 \
+	    -isystem $(PINTOOL_DIR)/extras/crt/include/arch-$(BIONIC_ARCH) \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi \
 	    -isystem $(PINTOOL_DIR)/extras/crt/include/kernel/uapi/asm-x86 \
 	    -I$(PINTOOL_DIR)/extras/components/include \
-	    -I$(PINTOOL_DIR)/extras/xed-intel64/include/xed \
+	    -I$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/include/xed \
 	    -I$(PINTOOL_DIR)/source/tools/Utils \
 	    -I$(PINTOOL_DIR)/source/tools/InstLib \
-	    -O3 -fomit-frame-pointer -fno-strict-aliasing -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
+	    -O3 -c $(top_srcdir)/src/sst/elements/ariel/frontend/pin3/fesimple.cc
 endif
 endif
 
@@ -260,10 +248,10 @@ fesimple.so : fesimple.o
 	$(CXX) -shared -Wl,--hash-style=sysv -Wl,-Bsymbolic \
 	    -o fesimple.so fesimple.o \
 	    -Wl,--version-script=$(PINTOOL_DIR)/source/include/pin/pintool.ver \
-	    -L$(PINTOOL_DIR)/intel64/lib \
-	    -L$(PINTOOL_DIR)/intel64/lib-ext \
-	    -L$(PINTOOL_DIR)/intel64/runtime/glibc \
-	    -L$(PINTOOL_DIR)/extras/xed-intel64/lib \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib \
+	    -L$(PINTOOL_DIR)/$(TARGET)/lib-ext \
+	    -L$(PINTOOL_DIR)/$(TARGET)/runtime/glibc \
+	    -L$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/lib \
 	    -ldl -lpin -lxed -lpindwarf -ldl -lpthread -lrt $(LIBZ_LDFLAGS) $(LIBZ_LIB) 
 
 fesimple.o : $(top_srcdir)/src/sst/elements/ariel/frontend/simple/fesimple.cc
@@ -275,7 +263,7 @@ fesimple.o : $(top_srcdir)/src/sst/elements/ariel/frontend/simple/fesimple.cc
 	    -I$(PINTOOL_DIR)/ \
 	    -I$(PINTOOL_DIR)/extras/components/include \
 	    -I$(PINTOOL_DIR)/source/include/pin/gen/ \
-	    -I$(PINTOOL_DIR)/extras/xed-intel64/include \
+	    -I$(PINTOOL_DIR)/extras/xed-$(XED_ARCH)/include \
 	    -I$(top_srcdir)/src/sst \
 	    -I$(top_srcdir)/src/sst/elements/ariel \
 	    -O3 -fomit-frame-pointer -c $(top_srcdir)/src/sst/elements/ariel/frontend/simple/fesimple.cc

src/sst/elements/ariel/frontend/pin3/fesimple.cc

@@ -57,6 +57,23 @@
 
 #undef __STDC_FORMAT_MACROS
 
+// Undo some Clang-specific changes possibly made by the libc++ bundled with
+// PinCRT
+#ifdef __LP64__
+# ifdef __clang__
+#  if defined(PIN_VERSION_MINOR) && PIN_VERSION_MINOR > 29
+// Allow usage of the warnmacros header without modifying it
+#   ifdef UNUSED
+#   undef UNUSED
+#   endif
+#   include <sst/core/warnmacros.h>
+DIAG_DISABLE(macro-redefined)
+#   define __PRI_64_prefix  "l"
+#   define __PRI_PTR_prefix "l"
+REENABLE_WARNING
+#  endif
+# endif
+#endif
 
 using namespace SST::ArielComponent;
 using namespace std;
@@ -193,7 +210,7 @@ VOID ariel_print_stack(UINT32 thr, UINT64 allocSize, UINT64 allocAddr, UINT64 al
 {
 
     unsigned int depth = arielStack[thr].size() - 1;
-    BT_PRINTF("Malloc,0x%" PRIx64 ",%lu,%" PRIu64 "\n", allocAddr, allocSize, allocIndex);
+    BT_PRINTF("Malloc,0x%" PRIx64 ",%" PRIu64 ",%" PRIu64 "\n", allocAddr, allocSize, allocIndex);
 
     vector<ADDRINT> newMappings;
     for (vector<StackRecord>::reverse_iterator rit = arielStack[thr].rbegin(); rit != arielStack[thr].rend(); rit++) {

src/sst/elements/ariel/frontend/simple/fesimple.cc

@@ -185,7 +185,7 @@ VOID ariel_print_stack(UINT32 thr, UINT64 allocSize, UINT64 allocAddr, UINT64 al
 {
 
     unsigned int depth = arielStack[thr].size() - 1;
-    BT_PRINTF("Malloc,0x%" PRIx64 ",%lu,%" PRIu64 "\n", allocAddr, allocSize, allocIndex);
+    BT_PRINTF("Malloc,0x%" PRIx64 ",%" PRIu64 ",%" PRIu64 "\n", allocAddr, allocSize, allocIndex);
 
     vector<ADDRINT> newMappings;
     for (vector<StackRecord>::reverse_iterator rit = arielStack[thr].rbegin(); rit != arielStack[thr].rend(); rit++) {