Merge pull request #537 from sstsimulator/devel

Automatically Merged using masterautomerge.py

config/sst_check_shm.m4

@@ -0,0 +1,24 @@
+
+AC_DEFUN([SST_CHECK_SHM], [
+
+  sst_check_shm_happy="yes"
+
+  CPPFLAGS_saved="$CPPFLAGS"
+  LDFLAGS_saved="$LDFLAGS"
+  LIBS_saved="$LIBS"
+
+  AC_LANG_PUSH(C)
+  AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIB="$LIBS"], [sst_check_shm_happy="no"])
+  AC_LANG_POP(C)
+
+  CPPFLAGS="$CPPFLAGS_saved"
+  LDFLAGS="$LDFLAGS_saved"
+  LIBS="$LIBS_saved"
+
+  AC_SUBST([SHM_LIB])
+  AM_CONDITIONAL([HAVE_SHM], [test "$sst_check_shm_happy" = "yes"])
+  AS_IF([test "$sst_check_shm_happy" = "yes"],
+        [AC_DEFINE([HAVE_SHM], [1], [Set to 1 if SHM was found])])
+
+  AS_IF([test "$sst_check_shm_happy" = "yes"], [$1], [$2])
+])

src/sst/elements/CramSim/c_DramSimTraceReader.cpp

@@ -19,7 +19,8 @@
 #include <assert.h>
 #include <iostream>
 #include <stdlib.h>
-#include <boost/tokenizer.hpp>
+
+#include <sst/core/stringize.h>
 
 //local includes
 #include "c_DramSimTraceReader.hpp"
@@ -168,16 +169,16 @@ void c_DramSimTraceReader::createTxn() {
 	if (m_txnReqQ.size() < k_txnGenReqQEntries) {
 		std::string l_line;
 		if (std::getline(m_traceFileStream, l_line)) {
-			boost::char_separator<char> sep(" ");
-			boost::tokenizer<boost::char_separator<char>> l_tok(l_line, sep);
+			char_delimiter sep(" ");
+			Tokenizer<> l_tok(l_line, sep);
 			unsigned l_numTokens = std::distance(l_tok.begin(), l_tok.end());
 			unsigned l_tokNum = 0;
 			unsigned l_txnInterval = 0;
 			std::string l_txnType;
 			unsigned l_txnAddress = 0;
 			unsigned l_txnDataWidth = 0;
 
-			for (boost::tokenizer<boost::char_separator<char>>::iterator l_iter =
+			for (Tokenizer<>::iterator l_iter =
 					l_tok.begin(); l_iter != l_tok.end(); ++l_iter) {
 				switch (l_tokNum) {
 				case 0:

src/sst/elements/CramSim/c_DramSimTraceReader.hpp

@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <queue>
 #include <iostream>
-#include <boost/tokenizer.hpp>
 #include <string>
 #include <fstream>
 

src/sst/elements/CramSim/c_TracefileReader.cpp

@@ -20,6 +20,7 @@
 #include <iostream>
 #include <stdlib.h>
 
+#include <sst/core/stringize.h>
 
 
 //local includes
@@ -160,7 +161,7 @@ void c_TracefileReader::createTxn() {
 	if (m_txnReqQ.size() < k_txnGenReqQEntries) {
     std::string l_line;
     if (std::getline(m_traceFileStream, l_line)) {
-      boost::tokenizer<> l_tok(l_line);
+      Tokenizer<> l_tok(l_line);
       unsigned l_numTokens = std::distance(l_tok.begin(), l_tok.end());
       assert((3==l_numTokens) || (4==l_numTokens));
       unsigned l_tokNum = 0;
@@ -169,7 +170,7 @@ void c_TracefileReader::createTxn() {
       unsigned l_txnAddress = 0;
       unsigned l_txnDataWidth = 0;
 
-      for (boost::tokenizer<>::iterator l_iter = l_tok.begin();
+      for (Tokenizer<>::iterator l_iter = l_tok.begin();
         l_iter != l_tok.end(); ++l_iter){
             switch (l_tokNum) {
               case 0:

src/sst/elements/CramSim/c_USimmTraceReader.cpp

@@ -20,8 +20,8 @@
 #include <assert.h>
 #include <iostream>
 #include <stdlib.h>
-#include <boost/tokenizer.hpp>
 
+#include <sst/core/stringize.h>
 
 //local includes
 #include "c_USimmTraceReader.hpp"
@@ -177,16 +177,16 @@ void c_USimmTraceReader::createTxn() {
 	if (m_txnReqQ.size() < k_txnGenReqQEntries) {
     std::string l_line;
     if (std::getline(m_traceFileStream, l_line)) {
-      boost::char_separator<char> sep(" ");
-      boost::tokenizer<boost::char_separator<char>> l_tok(l_line, sep);
+      char_delimiter sep(" ");
+      Tokenizer<> l_tok(l_line, sep);
       unsigned l_numTokens = std::distance(l_tok.begin(), l_tok.end());
       unsigned l_tokNum = 0;
       unsigned l_txnInterval = 0;
       std::string l_txnType;
       unsigned l_txnAddress = 0;
       unsigned l_txnDataWidth = 0;
 
-      for (boost::tokenizer<boost::char_separator<char>>::iterator l_iter = l_tok.begin();
+      for (Tokenizer<>::iterator l_iter = l_tok.begin();
         l_iter != l_tok.end(); ++l_iter){
             switch (l_tokNum) {
               case 0:

src/sst/elements/CramSim/c_USimmTraceReader.hpp

@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <queue>
 #include <iostream>
-#include <boost/tokenizer.hpp>
 #include <string>
 #include <fstream>
 #include <unordered_map>

src/sst/elements/ariel/Makefile.am

@@ -51,6 +51,7 @@ EXTRA_DIST = \
 	frontend/simple/examples/stream/stream.c
 
 libariel_la_LDFLAGS = -module -avoid-version
+libariel_la_LIBADD = $(SHM_LIB)
 libariel_la_CPPFLAGS = \
 	-DARIEL_TRACE_LIB=$(libdir)/sst \
         -DARIEL_TOOL_DIR="$(libexecdir)" \

src/sst/elements/ariel/configure.m4

@@ -5,6 +5,7 @@ AC_DEFUN([SST_ariel_CONFIG], [
 
   SST_CHECK_PINTOOL([have_pin=1],[have_pin=0],[AC_MSG_ERROR([PIN was requested but not found])])
   SST_CHECK_PTRACE_SET_TRACER()
+  SST_CHECK_SHM()
 
   AS_IF( [test "$have_pin" = 1], [sst_check_ariel="yes"], [sst_check_ariel="no"] )
   AS_IF([test "$sst_check_ariel" = "yes"], [$1], [$2])

src/sst/elements/firefly/loopBack.h

@@ -27,15 +27,6 @@ class LoopBackEvent : public Event {
     LoopBackEvent( int _core ) : Event(), core( _core ) {}
     int core;
 
-//  private:
-//        friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(core);
-//    }
     NotSerializable(LoopBackEvent)
 };
 

src/sst/elements/firefly/mem.h

@@ -44,19 +44,6 @@ class MemCpyReqEvent : public Event {
     Addr from;
     size_t length;
 
-//  private:
-//        friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(callback);
-//        ar & BOOST_SERIALIZATION_NVP(core);
-//        ar & BOOST_SERIALIZATION_NVP(to);
-//        ar & BOOST_SERIALIZATION_NVP(from);
-//        ar & BOOST_SERIALIZATION_NVP(length);
-//    }
     NotSerializable(MemCpyReqEvent)
 };
 
@@ -78,18 +65,6 @@ class MemReadReqEvent : public Event {
     Addr addr;
     size_t length;
 
-//  private:
-//        friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(callback);
-//        ar & BOOST_SERIALIZATION_NVP(core);
-//        ar & BOOST_SERIALIZATION_NVP(addr);
-//        ar & BOOST_SERIALIZATION_NVP(length);
-//    }
     NotSerializable(MemReadReqEvent)
 };
 
@@ -111,18 +86,6 @@ class MemWriteReqEvent : public Event {
     Addr addr;
     size_t length;
 
-//  private:
-//        friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(callback);
-//        ar & BOOST_SERIALIZATION_NVP(core);
-//        ar & BOOST_SERIALIZATION_NVP(addr);
-//        ar & BOOST_SERIALIZATION_NVP(length);
-//    }
     NotSerializable(MemWriteReqEvent)
 };
 
@@ -136,15 +99,6 @@ class MemRespEvent : public Event {
 
     Callback callback;
 
-//  private:
-//        friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(callback);
-//    }
     NotSerializable(MemRespEvent)
 };
 

src/sst/elements/firefly/merlinEvent.h

@@ -104,18 +104,6 @@ class FireflyNetworkEvent : public Event {
     size_t          offset;
     size_t          bufLen;
 
-//    friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(seq);
-//        ar & BOOST_SERIALIZATION_NVP(bufLen);
-//        ar & BOOST_SERIALIZATION_NVP(buf);
-//        ar & BOOST_SERIALIZATION_NVP(src);
-//    }
-
   public:	
     void serialize_order(SST::Core::Serialization::serializer &ser) {
         Event::serialize_order(ser);

src/sst/elements/firefly/nic.h

@@ -55,18 +55,6 @@ class NicInitEvent : public Event {
     {
     }
 
-//  private:
-//
-//    friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(node);
-//        ar & BOOST_SERIALIZATION_NVP(vNic);
-//        ar & BOOST_SERIALIZATION_NVP(num_vNics);
-//    }
 public:	
     void serialize_order(SST::Core::Serialization::serializer &ser) {
         Event::serialize_order(ser);
@@ -100,21 +88,6 @@ class NicCmdEvent : public Event {
     {
     }
 
-//  private:
-//
-//    friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(type);
-//        ar & BOOST_SERIALIZATION_NVP(node);
-//        ar & BOOST_SERIALIZATION_NVP(dst_vNic);
-//        ar & BOOST_SERIALIZATION_NVP(tag);
-//        ar & BOOST_SERIALIZATION_NVP(iovec);
-//        ar & BOOST_SERIALIZATION_NVP(key);
-//    }
     NotSerializable(NicCmdEvent)
 };
 
@@ -158,21 +131,6 @@ class NicRespEvent : public Event {
     {
     }
 
-//  private:
-//
-//    friend class boost::serialization::access;
-//    template<class Archive>
-//    void
-//    serialize(Archive & ar, const unsigned int version )
-//    {
-//        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Event);
-//        ar & BOOST_SERIALIZATION_NVP(type);
-//        ar & BOOST_SERIALIZATION_NVP(src_vNic);
-//        ar & BOOST_SERIALIZATION_NVP(node);
-//        ar & BOOST_SERIALIZATION_NVP(tag);
-//        ar & BOOST_SERIALIZATION_NVP(len);
-//        ar & BOOST_SERIALIZATION_NVP(key);
-//    }
     NotSerializable(NicRespEvent)
 };
 

src/sst/elements/memHierarchy/MESICoherenceController.cc

@@ -693,7 +693,7 @@ CacheAction MESIController::handleFlushLineInvRequest(MemEvent * event, CacheLin
                         cacheLine->setState(IM);
                         return DONE;
                     }
-                } else if (reqEvent->getCmd() == GetXResp) {
+                } else if (reqEvent->getCmd() == GetX) {
                     cacheLine->setState(SM);
                     return STALL; // Waiting for GetXResp
                 }

src/sst/elements/memHierarchy/bus.cc

@@ -27,7 +27,6 @@
 #include "bus.h"
 
 #include <csignal>
-#include <boost/variant.hpp>
 
 #include <sst/core/params.h>
 #include <sst/core/simulation.h>

src/sst/elements/memHierarchy/cacheController.cc

@@ -26,7 +26,6 @@
 #include <sst/core/interfaces/stringEvent.h>
 
 #include <csignal>
-#include <boost/variant.hpp>
 
 #include "cacheController.h"
 #include "memEvent.h"

src/sst/elements/memHierarchy/cacheEventProcessing.cc

@@ -23,7 +23,6 @@
 #include "cacheController.h"
 #include "coherenceControllers.h"
 #include "hash.h"
-#include <boost/lexical_cast.hpp>
 #include <csignal>
 
 #include "memEvent.h"