Merge pull request sstsimulator#1048 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger
hassan-yamin · May 25, 2018 · 47ff24a · 47ff24a
2 parents 4d118f7 + 573c34a
commit 47ff24a
Show file tree

Hide file tree

Showing 1,027 changed files with 3,217 additions and 3,157 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,16 +1,18 @@
-Copyright 2009-2018 Sandia Corporation. Under the terms
-of Contract DE-NA0003525 with Sandia Corporation, the U.S.
-Government retains certain rights in this software.
+Copyright 2009-2018 National Technology and Engineering Solutions of Sandia, 
+LLC (NTESS).  Under the terms of Contract DE-NA-0003525, the U.S. Government 
+retains certain rights in this software.
 
-All rights reserved.
+Sandia National Laboratories is a multimission laboratory managed and operated
+by National Technology and Engineering Solutions of Sandia, LLC., a wholly 
+owned subsidiary of Honeywell International, Inc., for the U.S. Department of 
+Energy's National Nuclear Security Administration under contract DE-NA0003525.
+
+Copyright (c) 2009-2018, NTESS
 
-Portions are copyright of other developers:
-See the file CONTRIBUTITORS.TXT in the top level directory
-of this repository for more information.
+All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
@@ -20,7 +22,7 @@ met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Sandia Corporation nor the names of its
+    * Neither the name of the copyright holder nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
@@ -35,4 +37,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Structural Simulation Toolkit (SST)
 
-#### Copyright (c) 2009-2018, Sandia Corporation
+#### Copyright (c) 2009-2018, National Technology and Engineering Solutions of Sandia, LLC (NTESS)
 Portions are copyright of other developers:
 See the file CONTRIBUTORS.TXT in the top level directory
 of this repository for more information.

diff --git a/config/sst_check_stake.m4 b/config/sst_check_stake.m4
@@ -29,7 +29,7 @@ AC_DEFUN([SST_CHECK_STAKE],
   AC_LANG_POP([C++])
 
   AC_CHECK_LIB([riscv], [_ZN5sim_t3runEv],
-    [STAKE_LIB="-lriscv -lfesvr"], [sst_check_stake_happy="no"])
+      [STAKE_LIB="-lriscv -lfesvr -lsoftfloat"], [sst_check_stake_happy="no"], [-lfesvr -lsoftfloat])
 
   CPPFLAGS="$CPPFLAGS_saved"
   LDFLAGS="$LDFLAGS_saved"

diff --git a/src/sst/elements/CramSim/CramSim.cpp b/src/sst/elements/CramSim/CramSim.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/TxnDispatcher.cpp b/src/sst/elements/CramSim/TxnDispatcher.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/TxnDispatcher.hpp b/src/sst/elements/CramSim/TxnDispatcher.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_AddressHasher.cpp b/src/sst/elements/CramSim/c_AddressHasher.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_AddressHasher.hpp b/src/sst/elements/CramSim/c_AddressHasher.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_Bank.cpp b/src/sst/elements/CramSim/c_Bank.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_Bank.hpp b/src/sst/elements/CramSim/c_Bank.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankCommand.cpp b/src/sst/elements/CramSim/c_BankCommand.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankCommand.hpp b/src/sst/elements/CramSim/c_BankCommand.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankGroup.cpp b/src/sst/elements/CramSim/c_BankGroup.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankGroup.hpp b/src/sst/elements/CramSim/c_BankGroup.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankInfo.cpp b/src/sst/elements/CramSim/c_BankInfo.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankInfo.hpp b/src/sst/elements/CramSim/c_BankInfo.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankState.hpp b/src/sst/elements/CramSim/c_BankState.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateActivating.cpp b/src/sst/elements/CramSim/c_BankStateActivating.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateActivating.hpp b/src/sst/elements/CramSim/c_BankStateActivating.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateActive.cpp b/src/sst/elements/CramSim/c_BankStateActive.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateActive.hpp b/src/sst/elements/CramSim/c_BankStateActive.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateIdle.cpp b/src/sst/elements/CramSim/c_BankStateIdle.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateIdle.hpp b/src/sst/elements/CramSim/c_BankStateIdle.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStatePrecharge.cpp b/src/sst/elements/CramSim/c_BankStatePrecharge.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStatePrecharge.hpp b/src/sst/elements/CramSim/c_BankStatePrecharge.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateRead.cpp b/src/sst/elements/CramSim/c_BankStateRead.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateRead.hpp b/src/sst/elements/CramSim/c_BankStateRead.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateReadA.cpp b/src/sst/elements/CramSim/c_BankStateReadA.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateReadA.hpp b/src/sst/elements/CramSim/c_BankStateReadA.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateRefresh.cpp b/src/sst/elements/CramSim/c_BankStateRefresh.cpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

diff --git a/src/sst/elements/CramSim/c_BankStateRefresh.hpp b/src/sst/elements/CramSim/c_BankStateRefresh.hpp
@@ -1,8 +1,8 @@
-// Copyright 2009-2018 Sandia Corporation. Under the terms
-// of Contract DE-NA0003525 with Sandia Corporation, the U.S.
+// Copyright 2009-2018 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2009-2018, Sandia Corporation
+// Copyright (c) 2009-2018, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers: