diff --git a/projects/rocshmem/AUTHORS b/projects/rocshmem/AUTHORS
deleted file mode 100644
index bfe107948f..0000000000
--- a/projects/rocshmem/AUTHORS
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is the list of rocSHMEM's significant contributors.
-#
-# This does not necessarily list everyone who has contributed code,
-# especially since many employees of one corporation may be contributing.
-# To see the full list of contributors, see the revision history in
-# source control.
-Khaled Hamidouche
-Brandon Potter
-Michael LeBeane
-Rohit Zambre
-Kishore Punniyamurthy
-Ruchi Shah
-Muhammad A. Awad
-Edgar Gabriel
-Avinash Kethineedi
-Yiltan Temucin
diff --git a/projects/rocshmem/AUTHORS.md b/projects/rocshmem/AUTHORS.md
new file mode 100644
index 0000000000..dd6b48c017
--- /dev/null
+++ b/projects/rocshmem/AUTHORS.md
@@ -0,0 +1,15 @@
+## This is the list of rocSHMEM's significant contributors.
+
+#### This does not necessarily list everyone who has contributed code, especially since many employees of one corporation may be contributing. To see the full list of contributors, see the revision history in source control.
+
+- Khaled Hamidouche
+- Brandon Potter
+- Michael LeBeane
+- Rohit Zambre
+- Kishore Punniyamurthy
+- Ruchi Shah
+- Muhammad A. Awad
+- Edgar Gabriel
+- Avinash Kethineedi
+- Yiltan Temucin
+- Aurelien Bouteiller
\ No newline at end of file
diff --git a/projects/rocshmem/CHANGES b/projects/rocshmem/CHANGES
deleted file mode 100644
index 5b84a44187..0000000000
--- a/projects/rocshmem/CHANGES
+++ /dev/null
@@ -1,12 +0,0 @@
-Version 1.6.0 (20 June 2023)
-
-  * Support for Frontier and Crusher systems
-  * Multithread support with Reverse Offload backend
-  * Support for all AMO operations and types with Reverse Offload backend
-  * Support for private context on global memory
-  * Reduce LDS usage to improve occupancy
-  * Code refactoring to reduce register file usage
-  * Fix and enhance default context support
-  * Fix and enhance IPC support
-  * Fix race condition with multi-thread support
-  * Add fine-grain locking schemes
diff --git a/projects/rocshmem/CMakeLists.txt b/projects/rocshmem/CMakeLists.txt
index 9d29220c5f..954d952dcc 100644
--- a/projects/rocshmem/CMakeLists.txt
+++ b/projects/rocshmem/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/projects/rocshmem/LICENSE.md b/projects/rocshmem/LICENSE.md
index b34761bcbd..4ae4bb09d7 100644
--- a/projects/rocshmem/LICENSE.md
+++ b/projects/rocshmem/LICENSE.md
@@ -1,6 +1,8 @@
 MIT License
 
-Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+
+SPDX-License-Identifier: MIT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/rocshmem/cmake/rocm_local_targets.cmake b/projects/rocshmem/cmake/rocm_local_targets.cmake
index 055b95f0ee..ccad77351f 100644
--- a/projects/rocshmem/cmake/rocm_local_targets.cmake
+++ b/projects/rocshmem/cmake/rocm_local_targets.cmake
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/cmake/rocshmem_config.h.in b/projects/rocshmem/cmake/rocshmem_config.h.in
index d3964ef722..9ed6f4c46f 100644
--- a/projects/rocshmem/cmake/rocshmem_config.h.in
+++ b/projects/rocshmem/cmake/rocshmem_config.h.in
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 #cmakedefine DEBUG
 #cmakedefine PROFILE
 #cmakedefine USE_RO
diff --git a/projects/rocshmem/examples/CMakeLists.txt b/projects/rocshmem/examples/CMakeLists.txt
index 74acd45ce0..0a8eed03ec 100644
--- a/projects/rocshmem/examples/CMakeLists.txt
+++ b/projects/rocshmem/examples/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/examples/rocshmem_allreduce_test.cc b/projects/rocshmem/examples/rocshmem_allreduce_test.cc
index 1e6f73d69e..cc31cf8560 100644
--- a/projects/rocshmem/examples/rocshmem_allreduce_test.cc
+++ b/projects/rocshmem/examples/rocshmem_allreduce_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_allreduce_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/examples/rocshmem_alltoall_test.cc b/projects/rocshmem/examples/rocshmem_alltoall_test.cc
index 6b9d2325bc..1a5a9e3056 100644
--- a/projects/rocshmem/examples/rocshmem_alltoall_test.cc
+++ b/projects/rocshmem/examples/rocshmem_alltoall_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_alltoall_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/examples/rocshmem_broadcast_test.cc b/projects/rocshmem/examples/rocshmem_broadcast_test.cc
index 9bb204720e..a02ddcf995 100644
--- a/projects/rocshmem/examples/rocshmem_broadcast_test.cc
+++ b/projects/rocshmem/examples/rocshmem_broadcast_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_broadcast_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/examples/rocshmem_getmem_test.cc b/projects/rocshmem/examples/rocshmem_getmem_test.cc
index 942b43068d..71bd780ab0 100644
--- a/projects/rocshmem/examples/rocshmem_getmem_test.cc
+++ b/projects/rocshmem/examples/rocshmem_getmem_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_getmem_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/examples/rocshmem_init_attr_test.cc b/projects/rocshmem/examples/rocshmem_init_attr_test.cc
index 44c73704c7..dee1092927 100644
--- a/projects/rocshmem/examples/rocshmem_init_attr_test.cc
+++ b/projects/rocshmem/examples/rocshmem_init_attr_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_init_attr_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/examples/rocshmem_put_signal_test.cc b/projects/rocshmem/examples/rocshmem_put_signal_test.cc
index 9e41bc4529..78ee837325 100644
--- a/projects/rocshmem/examples/rocshmem_put_signal_test.cc
+++ b/projects/rocshmem/examples/rocshmem_put_signal_test.cc
@@ -1,3 +1,27 @@
+/******************************************************************************
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
+
 /*
 hipcc -c -fgpu-rdc -x hip rocshmem_put_signal_test.cc \
   -I/opt/rocm/include \
diff --git a/projects/rocshmem/include/rocshmem/rocshmem.hpp b/projects/rocshmem/include/rocshmem/rocshmem.hpp
index 1fa1d21e65..24acacde95 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_AMO.hpp b/projects/rocshmem/include/rocshmem/rocshmem_AMO.hpp
index 76fc47d52b..e373eb1c6d 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_AMO.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_AMO.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_COLL.hpp b/projects/rocshmem/include/rocshmem/rocshmem_COLL.hpp
index 191cec25a1..5777f17cdc 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_COLL.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_COLL.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_P2P_SYNC.hpp b/projects/rocshmem/include/rocshmem/rocshmem_P2P_SYNC.hpp
index 8ebe9b0390..6ec7277397 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_P2P_SYNC.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_P2P_SYNC.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_RMA.hpp b/projects/rocshmem/include/rocshmem/rocshmem_RMA.hpp
index ccd71f061b..2be0148cb9 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_RMA.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_RMA.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_RMA_X.hpp b/projects/rocshmem/include/rocshmem/rocshmem_RMA_X.hpp
index 34b9185e9d..7be101adf3 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_RMA_X.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_RMA_X.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_SIG_OP.hpp b/projects/rocshmem/include/rocshmem/rocshmem_SIG_OP.hpp
index 00ad57a10b..3182fd1e9e 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_SIG_OP.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_SIG_OP.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_common.hpp b/projects/rocshmem/include/rocshmem/rocshmem_common.hpp
index a624c947e0..60cfd18b07 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_common.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_common.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/include/rocshmem/rocshmem_debug.hpp b/projects/rocshmem/include/rocshmem/rocshmem_debug.hpp
index bcc468cbb6..c0dfb7268f 100644
--- a/projects/rocshmem/include/rocshmem/rocshmem_debug.hpp
+++ b/projects/rocshmem/include/rocshmem/rocshmem_debug.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/scripts/build_configs/ipc_single b/projects/rocshmem/scripts/build_configs/ipc_single
index 7e4ab63b98..c45bfc1f5a 100755
--- a/projects/rocshmem/scripts/build_configs/ipc_single
+++ b/projects/rocshmem/scripts/build_configs/ipc_single
@@ -1,5 +1,29 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+
 set -e
 
 if [ -z $1 ]
diff --git a/projects/rocshmem/scripts/build_configs/ipc_tests_only b/projects/rocshmem/scripts/build_configs/ipc_tests_only
index f111cf1349..c78fa78692 100755
--- a/projects/rocshmem/scripts/build_configs/ipc_tests_only
+++ b/projects/rocshmem/scripts/build_configs/ipc_tests_only
@@ -1,5 +1,29 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+
 set -e
 
 if [ -z $1 ]
diff --git a/projects/rocshmem/scripts/build_configs/ro_ipc b/projects/rocshmem/scripts/build_configs/ro_ipc
index 04a7981357..ff4d7d3eb5 100755
--- a/projects/rocshmem/scripts/build_configs/ro_ipc
+++ b/projects/rocshmem/scripts/build_configs/ro_ipc
@@ -1,5 +1,29 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+
 set -e
 
 if [ -z $1 ]
diff --git a/projects/rocshmem/scripts/build_configs/ro_net b/projects/rocshmem/scripts/build_configs/ro_net
index 89f5103450..9676b66203 100755
--- a/projects/rocshmem/scripts/build_configs/ro_net
+++ b/projects/rocshmem/scripts/build_configs/ro_net
@@ -1,5 +1,29 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+
 set -e
 
 if [ -z $1 ]
diff --git a/projects/rocshmem/scripts/build_configs/ro_net_debug b/projects/rocshmem/scripts/build_configs/ro_net_debug
index b9f1766629..351cb85184 100755
--- a/projects/rocshmem/scripts/build_configs/ro_net_debug
+++ b/projects/rocshmem/scripts/build_configs/ro_net_debug
@@ -1,5 +1,29 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+
 set -e
 
 if [ -z $1 ]
diff --git a/projects/rocshmem/scripts/functional_tests/driver.py b/projects/rocshmem/scripts/functional_tests/driver.py
index b6de00ff2a..b6ed1f6d6b 100755
--- a/projects/rocshmem/scripts/functional_tests/driver.py
+++ b/projects/rocshmem/scripts/functional_tests/driver.py
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/usr/bin/python3
 
 import argparse
diff --git a/projects/rocshmem/scripts/functional_tests/driver.sh b/projects/rocshmem/scripts/functional_tests/driver.sh
index c28d0795d7..80d249ef14 100755
--- a/projects/rocshmem/scripts/functional_tests/driver.sh
+++ b/projects/rocshmem/scripts/functional_tests/driver.sh
@@ -1,10 +1,13 @@
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
@@ -14,9 +17,10 @@
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 #!/bin/bash
 
diff --git a/projects/rocshmem/scripts/functional_tests/gdbrun b/projects/rocshmem/scripts/functional_tests/gdbrun
index 079b905441..5272eb36ac 100755
--- a/projects/rocshmem/scripts/functional_tests/gdbrun
+++ b/projects/rocshmem/scripts/functional_tests/gdbrun
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 # argument1 - operation to run
 # argument2 - loop count
 # e.g ./gdbrun 14 10 (launches pingpong for 10 times)
diff --git a/projects/rocshmem/scripts/functional_tests/gdbscript b/projects/rocshmem/scripts/functional_tests/gdbscript
index 5682ca6b13..775bebd79f 100644
--- a/projects/rocshmem/scripts/functional_tests/gdbscript
+++ b/projects/rocshmem/scripts/functional_tests/gdbscript
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 set pagination off
 set print frame-arguments all
 set logging file log.dat
diff --git a/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh b/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh
index e9c3c2ce01..dcc564928d 100755
--- a/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh
+++ b/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
 ###############################################
 # Script : shmem_allLib_build_and_test.sh
diff --git a/projects/rocshmem/scripts/install_dependencies.sh b/projects/rocshmem/scripts/install_dependencies.sh
index 5cdfd9c747..f31ef584a8 100755
--- a/projects/rocshmem/scripts/install_dependencies.sh
+++ b/projects/rocshmem/scripts/install_dependencies.sh
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
 
 set -e
diff --git a/projects/rocshmem/scripts/sos_tests/driver.sh b/projects/rocshmem/scripts/sos_tests/driver.sh
index bd5ae88b03..96bb124461 100755
--- a/projects/rocshmem/scripts/sos_tests/driver.sh
+++ b/projects/rocshmem/scripts/sos_tests/driver.sh
@@ -1,10 +1,13 @@
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
@@ -14,9 +17,10 @@
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 #!/bin/bash
 
diff --git a/projects/rocshmem/scripts/unit_tests/driver.sh b/projects/rocshmem/scripts/unit_tests/driver.sh
index 30541d36ad..038170cf52 100755
--- a/projects/rocshmem/scripts/unit_tests/driver.sh
+++ b/projects/rocshmem/scripts/unit_tests/driver.sh
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 #!/bin/bash
 
 # Function to display help information
diff --git a/projects/rocshmem/src/CMakeLists.txt b/projects/rocshmem/src/CMakeLists.txt
index 7c49759cb8..f2dabd4876 100644
--- a/projects/rocshmem/src/CMakeLists.txt
+++ b/projects/rocshmem/src/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/assembly.hpp b/projects/rocshmem/src/assembly.hpp
index fa27e24c36..791a8e93d9 100644
--- a/projects/rocshmem/src/assembly.hpp
+++ b/projects/rocshmem/src/assembly.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/atomic.hpp b/projects/rocshmem/src/atomic.hpp
index f0828e4145..a48f15b183 100644
--- a/projects/rocshmem/src/atomic.hpp
+++ b/projects/rocshmem/src/atomic.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/atomic_return.cpp b/projects/rocshmem/src/atomic_return.cpp
index 6f9720d3db..ee7c5de424 100644
--- a/projects/rocshmem/src/atomic_return.cpp
+++ b/projects/rocshmem/src/atomic_return.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/atomic_return.hpp b/projects/rocshmem/src/atomic_return.hpp
index 63ce5ac8be..e6d886c6b9 100644
--- a/projects/rocshmem/src/atomic_return.hpp
+++ b/projects/rocshmem/src/atomic_return.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/backend_bc.cpp b/projects/rocshmem/src/backend_bc.cpp
index 9df442474a..5da24dbb1a 100644
--- a/projects/rocshmem/src/backend_bc.cpp
+++ b/projects/rocshmem/src/backend_bc.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/backend_bc.hpp b/projects/rocshmem/src/backend_bc.hpp
index f0b5615823..e52cd1cbda 100644
--- a/projects/rocshmem/src/backend_bc.hpp
+++ b/projects/rocshmem/src/backend_bc.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/backend_type.hpp b/projects/rocshmem/src/backend_type.hpp
index 6b75d60cb7..a9b5170afe 100644
--- a/projects/rocshmem/src/backend_type.hpp
+++ b/projects/rocshmem/src/backend_type.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/bootstrap/CMakeLists.txt b/projects/rocshmem/src/bootstrap/CMakeLists.txt
index 8bde7f6392..9c6cab4c2a 100644
--- a/projects/rocshmem/src/bootstrap/CMakeLists.txt
+++ b/projects/rocshmem/src/bootstrap/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/bootstrap/bootstrap.cpp b/projects/rocshmem/src/bootstrap/bootstrap.cpp
index f43001c6ec..58d01e39fb 100644
--- a/projects/rocshmem/src/bootstrap/bootstrap.cpp
+++ b/projects/rocshmem/src/bootstrap/bootstrap.cpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #include <sys/resource.h>
 
diff --git a/projects/rocshmem/src/bootstrap/bootstrap.hpp b/projects/rocshmem/src/bootstrap/bootstrap.hpp
index 273ae058a5..16e4e9db77 100644
--- a/projects/rocshmem/src/bootstrap/bootstrap.hpp
+++ b/projects/rocshmem/src/bootstrap/bootstrap.hpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #ifndef ROCSHMEM_BOOTSTRAP_HPP_
 #define ROCSHMEM_BOOTSTRAP_HPP_
diff --git a/projects/rocshmem/src/bootstrap/env.cpp b/projects/rocshmem/src/bootstrap/env.cpp
index 58452f633c..f38db72523 100644
--- a/projects/rocshmem/src/bootstrap/env.cpp
+++ b/projects/rocshmem/src/bootstrap/env.cpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc, 
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #include <cstdlib>
 #include <type_traits>
diff --git a/projects/rocshmem/src/bootstrap/env.hpp b/projects/rocshmem/src/bootstrap/env.hpp
index ca14c9b357..f5eda05730 100644
--- a/projects/rocshmem/src/bootstrap/env.hpp
+++ b/projects/rocshmem/src/bootstrap/env.hpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc,
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #ifndef ROCSHMEM_ENV_HPP_
 #define ROCSHMEM_ENV_HPP_
diff --git a/projects/rocshmem/src/bootstrap/socket.cpp b/projects/rocshmem/src/bootstrap/socket.cpp
index f333999d90..745b1d3bcd 100644
--- a/projects/rocshmem/src/bootstrap/socket.cpp
+++ b/projects/rocshmem/src/bootstrap/socket.cpp
@@ -1,7 +1,28 @@
-// Copyright (c) 2016-2022, NVIDIA CORPORATION. All rights reserved.
-// Modifications Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT License.
+/******************************************************************************
+ * Copyright (c) 2016-2022, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #include <errno.h>
 #include <ifaddrs.h>
diff --git a/projects/rocshmem/src/bootstrap/socket.hpp b/projects/rocshmem/src/bootstrap/socket.hpp
index 253a1d30cf..5117409e8d 100644
--- a/projects/rocshmem/src/bootstrap/socket.hpp
+++ b/projects/rocshmem/src/bootstrap/socket.hpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #ifndef ROCSHMEM_SOCKET_H_
 #define ROCSHMEM_SOCKET_H_
diff --git a/projects/rocshmem/src/bootstrap/utils.cpp b/projects/rocshmem/src/bootstrap/utils.cpp
index 38c8e4a3b5..22eb712e6d 100644
--- a/projects/rocshmem/src/bootstrap/utils.cpp
+++ b/projects/rocshmem/src/bootstrap/utils.cpp
@@ -1,6 +1,27 @@
-// Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT license.
+/******************************************************************************
+ * Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #include <unistd.h>
 #include <signal.h>
diff --git a/projects/rocshmem/src/bootstrap/utils.hpp b/projects/rocshmem/src/bootstrap/utils.hpp
index 08350763e3..056499b900 100644
--- a/projects/rocshmem/src/bootstrap/utils.hpp
+++ b/projects/rocshmem/src/bootstrap/utils.hpp
@@ -1,7 +1,28 @@
-// Copyright (c) 2016-2022, NVIDIA CORPORATION. All rights reserved.
-// Modifications Copyright (c) Microsoft Corporation.
-// Modifications Copyright (c) 2025 Advanced Micro Devices, Inc.
-// Licensed under the MIT License.
+/******************************************************************************
+ * Copyright (c) 2016-2022, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) Microsoft Corporation.
+ * Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *****************************************************************************/
 
 #ifndef ROCSHMEM_UTILS_HPP_
 #define ROCSHMEM_UTILS_HPP_
diff --git a/projects/rocshmem/src/constants.hpp b/projects/rocshmem/src/constants.hpp
index d7990550e8..e3c796c4a7 100644
--- a/projects/rocshmem/src/constants.hpp
+++ b/projects/rocshmem/src/constants.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/CMakeLists.txt b/projects/rocshmem/src/containers/CMakeLists.txt
index 5dcd15e02e..ba5357a24e 100644
--- a/projects/rocshmem/src/containers/CMakeLists.txt
+++ b/projects/rocshmem/src/containers/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/array.hpp b/projects/rocshmem/src/containers/array.hpp
index 0e00d6f5d5..fbbdcc6583 100644
--- a/projects/rocshmem/src/containers/array.hpp
+++ b/projects/rocshmem/src/containers/array.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/array_impl.hpp b/projects/rocshmem/src/containers/array_impl.hpp
index 73a660e6c3..1e606c61ca 100644
--- a/projects/rocshmem/src/containers/array_impl.hpp
+++ b/projects/rocshmem/src/containers/array_impl.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/atomic_wf_queue.hpp b/projects/rocshmem/src/containers/atomic_wf_queue.hpp
index aa5f0cf1f1..02e0f1d82c 100644
--- a/projects/rocshmem/src/containers/atomic_wf_queue.hpp
+++ b/projects/rocshmem/src/containers/atomic_wf_queue.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/atomic_wf_queue_impl.hpp b/projects/rocshmem/src/containers/atomic_wf_queue_impl.hpp
index 2280580622..eb53db9e29 100644
--- a/projects/rocshmem/src/containers/atomic_wf_queue_impl.hpp
+++ b/projects/rocshmem/src/containers/atomic_wf_queue_impl.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/free_list.hpp b/projects/rocshmem/src/containers/free_list.hpp
index bf4f1fc7a3..9c238b4687 100644
--- a/projects/rocshmem/src/containers/free_list.hpp
+++ b/projects/rocshmem/src/containers/free_list.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/free_list_impl.hpp b/projects/rocshmem/src/containers/free_list_impl.hpp
index 92868e35b9..f98fb1abaf 100644
--- a/projects/rocshmem/src/containers/free_list_impl.hpp
+++ b/projects/rocshmem/src/containers/free_list_impl.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/helper_macros.hpp b/projects/rocshmem/src/containers/helper_macros.hpp
index 28a0ddbfeb..d8c38e6c01 100644
--- a/projects/rocshmem/src/containers/helper_macros.hpp
+++ b/projects/rocshmem/src/containers/helper_macros.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/index_strategy.hpp b/projects/rocshmem/src/containers/index_strategy.hpp
index b435039a6c..7609fff216 100644
--- a/projects/rocshmem/src/containers/index_strategy.hpp
+++ b/projects/rocshmem/src/containers/index_strategy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/matrix.hpp b/projects/rocshmem/src/containers/matrix.hpp
index aca23936c3..944a172d85 100644
--- a/projects/rocshmem/src/containers/matrix.hpp
+++ b/projects/rocshmem/src/containers/matrix.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/matrix_impl.hpp b/projects/rocshmem/src/containers/matrix_impl.hpp
index bbf46d1be2..745f6d98b6 100644
--- a/projects/rocshmem/src/containers/matrix_impl.hpp
+++ b/projects/rocshmem/src/containers/matrix_impl.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/share_strategy.cpp b/projects/rocshmem/src/containers/share_strategy.cpp
index 85d07ebd16..00cf4b7f6e 100644
--- a/projects/rocshmem/src/containers/share_strategy.cpp
+++ b/projects/rocshmem/src/containers/share_strategy.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/share_strategy.hpp b/projects/rocshmem/src/containers/share_strategy.hpp
index 46c5ba5446..7cdb75f72b 100644
--- a/projects/rocshmem/src/containers/share_strategy.hpp
+++ b/projects/rocshmem/src/containers/share_strategy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/strategies.cpp b/projects/rocshmem/src/containers/strategies.cpp
index b168b3855c..5f43eae7df 100644
--- a/projects/rocshmem/src/containers/strategies.cpp
+++ b/projects/rocshmem/src/containers/strategies.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/containers/strategies.hpp b/projects/rocshmem/src/containers/strategies.hpp
index 0daa7d74c1..3c87c111e0 100644
--- a/projects/rocshmem/src/containers/strategies.hpp
+++ b/projects/rocshmem/src/containers/strategies.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context.hpp b/projects/rocshmem/src/context.hpp
index 2badbd2ba9..8268dc6a59 100644
--- a/projects/rocshmem/src/context.hpp
+++ b/projects/rocshmem/src/context.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context_device.cpp b/projects/rocshmem/src/context_device.cpp
index 8682192bd2..097f8397eb 100644
--- a/projects/rocshmem/src/context_device.cpp
+++ b/projects/rocshmem/src/context_device.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context_host.cpp b/projects/rocshmem/src/context_host.cpp
index 4dce6de3f6..86de93dfb1 100644
--- a/projects/rocshmem/src/context_host.cpp
+++ b/projects/rocshmem/src/context_host.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context_incl.hpp b/projects/rocshmem/src/context_incl.hpp
index 0794397670..b95bbf94f3 100644
--- a/projects/rocshmem/src/context_incl.hpp
+++ b/projects/rocshmem/src/context_incl.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context_tmpl_device.hpp b/projects/rocshmem/src/context_tmpl_device.hpp
index e57884d602..da262c8192 100644
--- a/projects/rocshmem/src/context_tmpl_device.hpp
+++ b/projects/rocshmem/src/context_tmpl_device.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/context_tmpl_host.hpp b/projects/rocshmem/src/context_tmpl_host.hpp
index e24f34c19d..65173e9cbc 100644
--- a/projects/rocshmem/src/context_tmpl_host.hpp
+++ b/projects/rocshmem/src/context_tmpl_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/device_proxy.hpp b/projects/rocshmem/src/device_proxy.hpp
index 667ae3615b..554f09a781 100644
--- a/projects/rocshmem/src/device_proxy.hpp
+++ b/projects/rocshmem/src/device_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/fence_policy.hpp b/projects/rocshmem/src/fence_policy.hpp
index 56725837c3..1e630c4716 100644
--- a/projects/rocshmem/src/fence_policy.hpp
+++ b/projects/rocshmem/src/fence_policy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/hdp_policy.hpp b/projects/rocshmem/src/hdp_policy.hpp
index c6517e7d32..7491dbf18a 100644
--- a/projects/rocshmem/src/hdp_policy.hpp
+++ b/projects/rocshmem/src/hdp_policy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/hdp_proxy.hpp b/projects/rocshmem/src/hdp_proxy.hpp
index 607a5db0f8..d52276ec35 100644
--- a/projects/rocshmem/src/hdp_proxy.hpp
+++ b/projects/rocshmem/src/hdp_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/host/CMakeLists.txt b/projects/rocshmem/src/host/CMakeLists.txt
index b7acba098f..612edfde83 100644
--- a/projects/rocshmem/src/host/CMakeLists.txt
+++ b/projects/rocshmem/src/host/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/host/host.cpp b/projects/rocshmem/src/host/host.cpp
index 12608a589f..45a15c1de4 100644
--- a/projects/rocshmem/src/host/host.cpp
+++ b/projects/rocshmem/src/host/host.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/host/host.hpp b/projects/rocshmem/src/host/host.hpp
index 83cc1ceb59..0255eddfd1 100644
--- a/projects/rocshmem/src/host/host.hpp
+++ b/projects/rocshmem/src/host/host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/host/host_helpers.hpp b/projects/rocshmem/src/host/host_helpers.hpp
index 2ddecd60cf..2a20d3f363 100644
--- a/projects/rocshmem/src/host/host_helpers.hpp
+++ b/projects/rocshmem/src/host/host_helpers.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/host/host_templates.hpp b/projects/rocshmem/src/host/host_templates.hpp
index b02d4903c0..bb08cd7838 100644
--- a/projects/rocshmem/src/host/host_templates.hpp
+++ b/projects/rocshmem/src/host/host_templates.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,12 +15,13 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *****************************************************************************/
+
 #ifndef LIBRARY_SRC_HOST_HOST_TEMPLATES_HPP_
 #define LIBRARY_SRC_HOST_HOST_TEMPLATES_HPP_
 
diff --git a/projects/rocshmem/src/ipc/CMakeLists.txt b/projects/rocshmem/src/ipc/CMakeLists.txt
index 07a40538a5..93ef2a2175 100644
--- a/projects/rocshmem/src/ipc/CMakeLists.txt
+++ b/projects/rocshmem/src/ipc/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/backend_ipc.cpp b/projects/rocshmem/src/ipc/backend_ipc.cpp
index 4784447920..ac1378fc6d 100644
--- a/projects/rocshmem/src/ipc/backend_ipc.cpp
+++ b/projects/rocshmem/src/ipc/backend_ipc.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/backend_ipc.hpp b/projects/rocshmem/src/ipc/backend_ipc.hpp
index bcb4723539..7d1a8f3242 100644
--- a/projects/rocshmem/src/ipc/backend_ipc.hpp
+++ b/projects/rocshmem/src/ipc/backend_ipc.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_device.cpp b/projects/rocshmem/src/ipc/context_ipc_device.cpp
index 7abc72c4d3..5425d066f5 100644
--- a/projects/rocshmem/src/ipc/context_ipc_device.cpp
+++ b/projects/rocshmem/src/ipc/context_ipc_device.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_device.hpp b/projects/rocshmem/src/ipc/context_ipc_device.hpp
index 5e8acd5a53..03450a4924 100644
--- a/projects/rocshmem/src/ipc/context_ipc_device.hpp
+++ b/projects/rocshmem/src/ipc/context_ipc_device.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_device_coll.cpp b/projects/rocshmem/src/ipc/context_ipc_device_coll.cpp
index ab92f64007..72223aa0d5 100644
--- a/projects/rocshmem/src/ipc/context_ipc_device_coll.cpp
+++ b/projects/rocshmem/src/ipc/context_ipc_device_coll.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_host.cpp b/projects/rocshmem/src/ipc/context_ipc_host.cpp
index 051789b99a..b31943a80e 100644
--- a/projects/rocshmem/src/ipc/context_ipc_host.cpp
+++ b/projects/rocshmem/src/ipc/context_ipc_host.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_host.hpp b/projects/rocshmem/src/ipc/context_ipc_host.hpp
index a5b1993c55..4665e12f30 100644
--- a/projects/rocshmem/src/ipc/context_ipc_host.hpp
+++ b/projects/rocshmem/src/ipc/context_ipc_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_tmpl_device.hpp b/projects/rocshmem/src/ipc/context_ipc_tmpl_device.hpp
index 0140e490e3..563bab9d7e 100644
--- a/projects/rocshmem/src/ipc/context_ipc_tmpl_device.hpp
+++ b/projects/rocshmem/src/ipc/context_ipc_tmpl_device.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/context_ipc_tmpl_host.hpp b/projects/rocshmem/src/ipc/context_ipc_tmpl_host.hpp
index e1ff45f228..9849fe93db 100644
--- a/projects/rocshmem/src/ipc/context_ipc_tmpl_host.hpp
+++ b/projects/rocshmem/src/ipc/context_ipc_tmpl_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/ipc_context_proxy.hpp b/projects/rocshmem/src/ipc/ipc_context_proxy.hpp
index 1222f799a8..6b9d22204f 100644
--- a/projects/rocshmem/src/ipc/ipc_context_proxy.hpp
+++ b/projects/rocshmem/src/ipc/ipc_context_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/ipc_team.cpp b/projects/rocshmem/src/ipc/ipc_team.cpp
index 04bae3578e..bdb8d75209 100644
--- a/projects/rocshmem/src/ipc/ipc_team.cpp
+++ b/projects/rocshmem/src/ipc/ipc_team.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc/ipc_team.hpp b/projects/rocshmem/src/ipc/ipc_team.hpp
index e931adcfe4..74039692dd 100644
--- a/projects/rocshmem/src/ipc/ipc_team.hpp
+++ b/projects/rocshmem/src/ipc/ipc_team.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc_policy.cpp b/projects/rocshmem/src/ipc_policy.cpp
index cadd5435ba..eee40e728c 100644
--- a/projects/rocshmem/src/ipc_policy.cpp
+++ b/projects/rocshmem/src/ipc_policy.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/ipc_policy.hpp b/projects/rocshmem/src/ipc_policy.hpp
index e2f1590e20..ed13aa1631 100644
--- a/projects/rocshmem/src/ipc_policy.hpp
+++ b/projects/rocshmem/src/ipc_policy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/CMakeLists.txt b/projects/rocshmem/src/memory/CMakeLists.txt
index a481e99372..e928208751 100644
--- a/projects/rocshmem/src/memory/CMakeLists.txt
+++ b/projects/rocshmem/src/memory/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/address_record.hpp b/projects/rocshmem/src/memory/address_record.hpp
index f0fd1f0fc1..d2114e847d 100644
--- a/projects/rocshmem/src/memory/address_record.hpp
+++ b/projects/rocshmem/src/memory/address_record.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/bin.hpp b/projects/rocshmem/src/memory/bin.hpp
index 513b98262c..eae195ff0f 100644
--- a/projects/rocshmem/src/memory/bin.hpp
+++ b/projects/rocshmem/src/memory/bin.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/binner.hpp b/projects/rocshmem/src/memory/binner.hpp
index f7f3f62c41..d62be5bd6b 100644
--- a/projects/rocshmem/src/memory/binner.hpp
+++ b/projects/rocshmem/src/memory/binner.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/heap_memory.hpp b/projects/rocshmem/src/memory/heap_memory.hpp
index 73d1153a3b..e06738613d 100644
--- a/projects/rocshmem/src/memory/heap_memory.hpp
+++ b/projects/rocshmem/src/memory/heap_memory.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/heap_type.hpp b/projects/rocshmem/src/memory/heap_type.hpp
index 058f781b86..325922205f 100644
--- a/projects/rocshmem/src/memory/heap_type.hpp
+++ b/projects/rocshmem/src/memory/heap_type.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/hip_allocator.hpp b/projects/rocshmem/src/memory/hip_allocator.hpp
index be4039b167..7d62729b2b 100644
--- a/projects/rocshmem/src/memory/hip_allocator.hpp
+++ b/projects/rocshmem/src/memory/hip_allocator.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/memory_allocator.cpp b/projects/rocshmem/src/memory/memory_allocator.cpp
index 3e37974fa0..b9eaa96fe4 100644
--- a/projects/rocshmem/src/memory/memory_allocator.cpp
+++ b/projects/rocshmem/src/memory/memory_allocator.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/memory_allocator.hpp b/projects/rocshmem/src/memory/memory_allocator.hpp
index fccb1f4224..176442b6de 100644
--- a/projects/rocshmem/src/memory/memory_allocator.hpp
+++ b/projects/rocshmem/src/memory/memory_allocator.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/notifier.hpp b/projects/rocshmem/src/memory/notifier.hpp
index 84003265a6..a78d304af5 100644
--- a/projects/rocshmem/src/memory/notifier.hpp
+++ b/projects/rocshmem/src/memory/notifier.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/pow2_bins.hpp b/projects/rocshmem/src/memory/pow2_bins.hpp
index 3f2a40c1d7..df2a1fffda 100644
--- a/projects/rocshmem/src/memory/pow2_bins.hpp
+++ b/projects/rocshmem/src/memory/pow2_bins.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/remote_heap_info.hpp b/projects/rocshmem/src/memory/remote_heap_info.hpp
index b89e20096f..71f0483c99 100644
--- a/projects/rocshmem/src/memory/remote_heap_info.hpp
+++ b/projects/rocshmem/src/memory/remote_heap_info.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/shmem_allocator_strategy.hpp b/projects/rocshmem/src/memory/shmem_allocator_strategy.hpp
index e185b099ee..ffbb0aca48 100644
--- a/projects/rocshmem/src/memory/shmem_allocator_strategy.hpp
+++ b/projects/rocshmem/src/memory/shmem_allocator_strategy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/single_heap.cpp b/projects/rocshmem/src/memory/single_heap.cpp
index eeea75db02..b59a5b6398 100644
--- a/projects/rocshmem/src/memory/single_heap.cpp
+++ b/projects/rocshmem/src/memory/single_heap.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/single_heap.hpp b/projects/rocshmem/src/memory/single_heap.hpp
index 9f427f4ba6..98ed2f2f43 100644
--- a/projects/rocshmem/src/memory/single_heap.hpp
+++ b/projects/rocshmem/src/memory/single_heap.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/symmetric_heap.hpp b/projects/rocshmem/src/memory/symmetric_heap.hpp
index 77d6e33fdd..f7f30daa6b 100644
--- a/projects/rocshmem/src/memory/symmetric_heap.hpp
+++ b/projects/rocshmem/src/memory/symmetric_heap.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/memory/window_info.hpp b/projects/rocshmem/src/memory/window_info.hpp
index 75dd7f0463..0e0a53a241 100644
--- a/projects/rocshmem/src/memory/window_info.hpp
+++ b/projects/rocshmem/src/memory/window_info.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/mpi_init_singleton.cpp b/projects/rocshmem/src/mpi_init_singleton.cpp
index 76957f7d25..efb4039869 100644
--- a/projects/rocshmem/src/mpi_init_singleton.cpp
+++ b/projects/rocshmem/src/mpi_init_singleton.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/mpi_init_singleton.hpp b/projects/rocshmem/src/mpi_init_singleton.hpp
index b7cc26c8fd..bcf5bb552c 100644
--- a/projects/rocshmem/src/mpi_init_singleton.hpp
+++ b/projects/rocshmem/src/mpi_init_singleton.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/CMakeLists.txt b/projects/rocshmem/src/reverse_offload/CMakeLists.txt
index 17a7ebd490..2225a45674 100644
--- a/projects/rocshmem/src/reverse_offload/CMakeLists.txt
+++ b/projects/rocshmem/src/reverse_offload/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/backend_proxy.hpp b/projects/rocshmem/src/reverse_offload/backend_proxy.hpp
index 247bf92e3e..ecb1d54bba 100644
--- a/projects/rocshmem/src/reverse_offload/backend_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/backend_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/backend_ro.cpp b/projects/rocshmem/src/reverse_offload/backend_ro.cpp
index ff20908531..d0a9a07909 100644
--- a/projects/rocshmem/src/reverse_offload/backend_ro.cpp
+++ b/projects/rocshmem/src/reverse_offload/backend_ro.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/backend_ro.hpp b/projects/rocshmem/src/reverse_offload/backend_ro.hpp
index 62c6b1c8f0..80b5993740 100644
--- a/projects/rocshmem/src/reverse_offload/backend_ro.hpp
+++ b/projects/rocshmem/src/reverse_offload/backend_ro.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/block_handle.hpp b/projects/rocshmem/src/reverse_offload/block_handle.hpp
index ad9301094d..06ba09b8ed 100644
--- a/projects/rocshmem/src/reverse_offload/block_handle.hpp
+++ b/projects/rocshmem/src/reverse_offload/block_handle.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/commands_types.hpp b/projects/rocshmem/src/reverse_offload/commands_types.hpp
index 481e1275e1..c298f21851 100644
--- a/projects/rocshmem/src/reverse_offload/commands_types.hpp
+++ b/projects/rocshmem/src/reverse_offload/commands_types.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_proxy.hpp b/projects/rocshmem/src/reverse_offload/context_proxy.hpp
index 2d77c8a125..91bbbdd3bf 100644
--- a/projects/rocshmem/src/reverse_offload/context_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_device.cpp b/projects/rocshmem/src/reverse_offload/context_ro_device.cpp
index 36d389da7e..6d652795be 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_device.cpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_device.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_device.hpp b/projects/rocshmem/src/reverse_offload/context_ro_device.hpp
index ba285662cd..8f013634e3 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_device.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_device.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_host.cpp b/projects/rocshmem/src/reverse_offload/context_ro_host.cpp
index 62360a5224..346ed5d0ab 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_host.cpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_host.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_host.hpp b/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
index 51fb224eaa..0291c525ef 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_device.hpp b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_device.hpp
index d37e2d7b2d..d6ce0f2828 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_device.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_device.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
index e989f2c5a9..9be2073eec 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,12 +15,13 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *****************************************************************************/
+
 #ifndef LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_HOST_TEMPLATES_HPP_
 #define LIBRARY_SRC_REVERSE_OFFLOAD_RO_NET_HOST_TEMPLATES_HPP_
 
diff --git a/projects/rocshmem/src/reverse_offload/mpi_transport.cpp b/projects/rocshmem/src/reverse_offload/mpi_transport.cpp
index f6cee2aae6..a520a176ea 100644
--- a/projects/rocshmem/src/reverse_offload/mpi_transport.cpp
+++ b/projects/rocshmem/src/reverse_offload/mpi_transport.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/mpi_transport.hpp b/projects/rocshmem/src/reverse_offload/mpi_transport.hpp
index 6db776932a..cc1b2c3c0e 100644
--- a/projects/rocshmem/src/reverse_offload/mpi_transport.hpp
+++ b/projects/rocshmem/src/reverse_offload/mpi_transport.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/profiler.hpp b/projects/rocshmem/src/reverse_offload/profiler.hpp
index 9dddf95c3d..9f46a8e48c 100644
--- a/projects/rocshmem/src/reverse_offload/profiler.hpp
+++ b/projects/rocshmem/src/reverse_offload/profiler.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/queue.cpp b/projects/rocshmem/src/reverse_offload/queue.cpp
index 76e4cea2e1..5ff4fa1211 100644
--- a/projects/rocshmem/src/reverse_offload/queue.cpp
+++ b/projects/rocshmem/src/reverse_offload/queue.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/queue.hpp b/projects/rocshmem/src/reverse_offload/queue.hpp
index eb110c761b..89807cc7d5 100644
--- a/projects/rocshmem/src/reverse_offload/queue.hpp
+++ b/projects/rocshmem/src/reverse_offload/queue.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/queue_desc_proxy.hpp b/projects/rocshmem/src/reverse_offload/queue_desc_proxy.hpp
index 3b301ed88c..a5ca2a207a 100644
--- a/projects/rocshmem/src/reverse_offload/queue_desc_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/queue_desc_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/queue_proxy.hpp b/projects/rocshmem/src/reverse_offload/queue_proxy.hpp
index c5780560bf..5898b93d00 100644
--- a/projects/rocshmem/src/reverse_offload/queue_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/queue_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/ro_net_team.cpp b/projects/rocshmem/src/reverse_offload/ro_net_team.cpp
index b0c8aa99f0..cae0f5d92d 100644
--- a/projects/rocshmem/src/reverse_offload/ro_net_team.cpp
+++ b/projects/rocshmem/src/reverse_offload/ro_net_team.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/ro_net_team.hpp b/projects/rocshmem/src/reverse_offload/ro_net_team.hpp
index 5d9ab1a24b..5ffcf8e5f3 100644
--- a/projects/rocshmem/src/reverse_offload/ro_net_team.hpp
+++ b/projects/rocshmem/src/reverse_offload/ro_net_team.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/ro_team_proxy.hpp b/projects/rocshmem/src/reverse_offload/ro_team_proxy.hpp
index e3b1afd280..06bb43d663 100644
--- a/projects/rocshmem/src/reverse_offload/ro_team_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/ro_team_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/team_info_proxy.hpp b/projects/rocshmem/src/reverse_offload/team_info_proxy.hpp
index 3844a05946..1ad25c0679 100644
--- a/projects/rocshmem/src/reverse_offload/team_info_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/team_info_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/transport.hpp b/projects/rocshmem/src/reverse_offload/transport.hpp
index b2bc7fc78a..01b72b8bd9 100644
--- a/projects/rocshmem/src/reverse_offload/transport.hpp
+++ b/projects/rocshmem/src/reverse_offload/transport.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/reverse_offload/window_proxy.hpp b/projects/rocshmem/src/reverse_offload/window_proxy.hpp
index d7f7ec782e..0afa532913 100644
--- a/projects/rocshmem/src/reverse_offload/window_proxy.hpp
+++ b/projects/rocshmem/src/reverse_offload/window_proxy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/rocshmem.cpp b/projects/rocshmem/src/rocshmem.cpp
index e491646884..4b5b5765ba 100644
--- a/projects/rocshmem/src/rocshmem.cpp
+++ b/projects/rocshmem/src/rocshmem.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/rocshmem_calc.hpp b/projects/rocshmem/src/rocshmem_calc.hpp
index d8d99a3e06..f7c16e1902 100644
--- a/projects/rocshmem/src/rocshmem_calc.hpp
+++ b/projects/rocshmem/src/rocshmem_calc.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/rocshmem_gpu.cpp b/projects/rocshmem/src/rocshmem_gpu.cpp
index b73173abc1..8d7aeb29ac 100644
--- a/projects/rocshmem/src/rocshmem_gpu.cpp
+++ b/projects/rocshmem/src/rocshmem_gpu.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/stats.hpp b/projects/rocshmem/src/stats.hpp
index 62a4fbf933..8c4370d62f 100644
--- a/projects/rocshmem/src/stats.hpp
+++ b/projects/rocshmem/src/stats.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/sync/CMakeLists.txt b/projects/rocshmem/src/sync/CMakeLists.txt
index 22e48cf510..96b53ec5e8 100644
--- a/projects/rocshmem/src/sync/CMakeLists.txt
+++ b/projects/rocshmem/src/sync/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/sync/abql_block_mutex.cpp b/projects/rocshmem/src/sync/abql_block_mutex.cpp
index 32579d6d50..cb23925d44 100644
--- a/projects/rocshmem/src/sync/abql_block_mutex.cpp
+++ b/projects/rocshmem/src/sync/abql_block_mutex.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/sync/abql_block_mutex.hpp b/projects/rocshmem/src/sync/abql_block_mutex.hpp
index ea16b2ede9..6e2d97ed4e 100644
--- a/projects/rocshmem/src/sync/abql_block_mutex.hpp
+++ b/projects/rocshmem/src/sync/abql_block_mutex.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/team.cpp b/projects/rocshmem/src/team.cpp
index 2980337794..0036b95366 100644
--- a/projects/rocshmem/src/team.cpp
+++ b/projects/rocshmem/src/team.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/team.hpp b/projects/rocshmem/src/team.hpp
index 77aa63750d..bf9bc764ac 100644
--- a/projects/rocshmem/src/team.hpp
+++ b/projects/rocshmem/src/team.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/team_tracker.cpp b/projects/rocshmem/src/team_tracker.cpp
index 0f7c94c01a..119e2635dc 100644
--- a/projects/rocshmem/src/team_tracker.cpp
+++ b/projects/rocshmem/src/team_tracker.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/team_tracker.hpp b/projects/rocshmem/src/team_tracker.hpp
index dc9ba8b97f..8900735305 100644
--- a/projects/rocshmem/src/team_tracker.hpp
+++ b/projects/rocshmem/src/team_tracker.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/templates.hpp b/projects/rocshmem/src/templates.hpp
index af2b581aa2..8c21a83b20 100644
--- a/projects/rocshmem/src/templates.hpp
+++ b/projects/rocshmem/src/templates.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/templates_host.hpp b/projects/rocshmem/src/templates_host.hpp
index 0c09b0c1b9..3b94887b19 100644
--- a/projects/rocshmem/src/templates_host.hpp
+++ b/projects/rocshmem/src/templates_host.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/util.cpp b/projects/rocshmem/src/util.cpp
index 71890a0748..c1845a3b0c 100644
--- a/projects/rocshmem/src/util.cpp
+++ b/projects/rocshmem/src/util.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/util.hpp b/projects/rocshmem/src/util.hpp
index 497730d6b3..3c2e48ec41 100644
--- a/projects/rocshmem/src/util.hpp
+++ b/projects/rocshmem/src/util.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/wf_coal_policy.cpp b/projects/rocshmem/src/wf_coal_policy.cpp
index 58644b39eb..b589d69129 100644
--- a/projects/rocshmem/src/wf_coal_policy.cpp
+++ b/projects/rocshmem/src/wf_coal_policy.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/src/wf_coal_policy.hpp b/projects/rocshmem/src/wf_coal_policy.hpp
index 2d70f8fc61..a392fda7dd 100644
--- a/projects/rocshmem/src/wf_coal_policy.hpp
+++ b/projects/rocshmem/src/wf_coal_policy.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/CMakeLists.txt b/projects/rocshmem/tests/CMakeLists.txt
index 2f1a2336a8..d94d20abca 100644
--- a/projects/rocshmem/tests/CMakeLists.txt
+++ b/projects/rocshmem/tests/CMakeLists.txt
@@ -1,3 +1,27 @@
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
+
 IF (BUILD_FUNCTIONAL_TESTS)
     add_subdirectory(functional_tests)
 ENDIF()
diff --git a/projects/rocshmem/tests/functional_tests/CMakeLists.txt b/projects/rocshmem/tests/functional_tests/CMakeLists.txt
index 2070e8fcb5..6417e9d192 100644
--- a/projects/rocshmem/tests/functional_tests/CMakeLists.txt
+++ b/projects/rocshmem/tests/functional_tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.cpp b/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.cpp
index 971ad2a484..692085b4af 100644
--- a/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.hpp b/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.hpp
index 6a58f38d18..f9818e4d03 100644
--- a/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/amo_bitwise_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_extended_tester.cpp b/projects/rocshmem/tests/functional_tests/amo_extended_tester.cpp
index 83da81d6c9..8e0c696175 100644
--- a/projects/rocshmem/tests/functional_tests/amo_extended_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/amo_extended_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_extended_tester.hpp b/projects/rocshmem/tests/functional_tests/amo_extended_tester.hpp
index 20ea489946..5b593abbc0 100644
--- a/projects/rocshmem/tests/functional_tests/amo_extended_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/amo_extended_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_standard_tester.cpp b/projects/rocshmem/tests/functional_tests/amo_standard_tester.cpp
index 3eabdf5fe6..2f8c221337 100644
--- a/projects/rocshmem/tests/functional_tests/amo_standard_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/amo_standard_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/amo_standard_tester.hpp b/projects/rocshmem/tests/functional_tests/amo_standard_tester.hpp
index 61c3da828b..b1dfe8316e 100644
--- a/projects/rocshmem/tests/functional_tests/amo_standard_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/amo_standard_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/barrier_all_tester.cpp b/projects/rocshmem/tests/functional_tests/barrier_all_tester.cpp
index 4f8325125a..a6c104d4dd 100644
--- a/projects/rocshmem/tests/functional_tests/barrier_all_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/barrier_all_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/barrier_all_tester.hpp b/projects/rocshmem/tests/functional_tests/barrier_all_tester.hpp
index da864b7863..bd515686f4 100644
--- a/projects/rocshmem/tests/functional_tests/barrier_all_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/barrier_all_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.cpp b/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.cpp
index 3ea5e81966..7e1424bfdd 100644
--- a/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.hpp b/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.hpp
index 8a7ff3d615..ae4de9b1c4 100644
--- a/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/default_ctx_primitive_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/empty_tester.cpp b/projects/rocshmem/tests/functional_tests/empty_tester.cpp
index 119e75952d..76376c578c 100644
--- a/projects/rocshmem/tests/functional_tests/empty_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/empty_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/empty_tester.hpp b/projects/rocshmem/tests/functional_tests/empty_tester.hpp
index 200cacf57e..894963dec8 100644
--- a/projects/rocshmem/tests/functional_tests/empty_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/empty_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/ping_all_tester.cpp b/projects/rocshmem/tests/functional_tests/ping_all_tester.cpp
index 01111779b9..c35bb13676 100644
--- a/projects/rocshmem/tests/functional_tests/ping_all_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/ping_all_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/ping_all_tester.hpp b/projects/rocshmem/tests/functional_tests/ping_all_tester.hpp
index ce4dcd900b..64d2494517 100644
--- a/projects/rocshmem/tests/functional_tests/ping_all_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/ping_all_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/ping_pong_tester.cpp b/projects/rocshmem/tests/functional_tests/ping_pong_tester.cpp
index 05e32dfa2e..370133c3ae 100644
--- a/projects/rocshmem/tests/functional_tests/ping_pong_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/ping_pong_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/ping_pong_tester.hpp b/projects/rocshmem/tests/functional_tests/ping_pong_tester.hpp
index 2b784773a3..f00cc0ec81 100644
--- a/projects/rocshmem/tests/functional_tests/ping_pong_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/ping_pong_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/primitive_mr_tester.cpp b/projects/rocshmem/tests/functional_tests/primitive_mr_tester.cpp
index d40656a76b..dadc0a70ce 100644
--- a/projects/rocshmem/tests/functional_tests/primitive_mr_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/primitive_mr_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/primitive_mr_tester.hpp b/projects/rocshmem/tests/functional_tests/primitive_mr_tester.hpp
index c5d1431f6a..d341bc1ece 100644
--- a/projects/rocshmem/tests/functional_tests/primitive_mr_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/primitive_mr_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/primitive_tester.cpp b/projects/rocshmem/tests/functional_tests/primitive_tester.cpp
index d98011bd39..f5e3fcf550 100644
--- a/projects/rocshmem/tests/functional_tests/primitive_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/primitive_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/primitive_tester.hpp b/projects/rocshmem/tests/functional_tests/primitive_tester.hpp
index ea0df7440f..f7d7b0a7af 100644
--- a/projects/rocshmem/tests/functional_tests/primitive_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/primitive_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/random_access_tester.cpp b/projects/rocshmem/tests/functional_tests/random_access_tester.cpp
index 233cf11c73..8c7d61b253 100644
--- a/projects/rocshmem/tests/functional_tests/random_access_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/random_access_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,12 +15,13 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *****************************************************************************/
+
 #include "random_access_tester.hpp"
 
 #include <rocshmem/rocshmem.hpp>
diff --git a/projects/rocshmem/tests/functional_tests/random_access_tester.hpp b/projects/rocshmem/tests/functional_tests/random_access_tester.hpp
index 6cbcfed602..1d011eef3d 100644
--- a/projects/rocshmem/tests/functional_tests/random_access_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/random_access_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.cpp b/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.cpp
index 564354825e..4dde64c094 100644
--- a/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,12 +15,13 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *****************************************************************************/
+
 #include "shmem_ptr_tester.hpp"
 
 #include <rocshmem/rocshmem.hpp>
diff --git a/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.hpp b/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.hpp
index bd1d34c3bb..8a1f44c228 100644
--- a/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/shmem_ptr_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/signaling_operations_tester.cpp b/projects/rocshmem/tests/functional_tests/signaling_operations_tester.cpp
index cd08cc201a..1028f54f6b 100644
--- a/projects/rocshmem/tests/functional_tests/signaling_operations_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/signaling_operations_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/signaling_operations_tester.hpp b/projects/rocshmem/tests/functional_tests/signaling_operations_tester.hpp
index df47fa054a..6412c45c7d 100644
--- a/projects/rocshmem/tests/functional_tests/signaling_operations_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/signaling_operations_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/sync_all_tester.cpp b/projects/rocshmem/tests/functional_tests/sync_all_tester.cpp
index 16dc738c41..6661bf4abb 100644
--- a/projects/rocshmem/tests/functional_tests/sync_all_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/sync_all_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/sync_all_tester.hpp b/projects/rocshmem/tests/functional_tests/sync_all_tester.hpp
index 8062b37cda..d42ca4cd43 100644
--- a/projects/rocshmem/tests/functional_tests/sync_all_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/sync_all_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/sync_tester.cpp b/projects/rocshmem/tests/functional_tests/sync_tester.cpp
index 8ffa4c91ff..ca021784e5 100644
--- a/projects/rocshmem/tests/functional_tests/sync_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/sync_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/sync_tester.hpp b/projects/rocshmem/tests/functional_tests/sync_tester.hpp
index fdd7d6f6ca..853d2769b7 100644
--- a/projects/rocshmem/tests/functional_tests/sync_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/sync_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_alltoall_tester.cpp b/projects/rocshmem/tests/functional_tests/team_alltoall_tester.cpp
index 10f8f5b60f..6c89d672af 100644
--- a/projects/rocshmem/tests/functional_tests/team_alltoall_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_alltoall_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_alltoall_tester.hpp b/projects/rocshmem/tests/functional_tests/team_alltoall_tester.hpp
index 262b04efb0..c30f41deea 100644
--- a/projects/rocshmem/tests/functional_tests/team_alltoall_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_alltoall_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_barrier_tester.cpp b/projects/rocshmem/tests/functional_tests/team_barrier_tester.cpp
index 73e1db00f1..7a1d16e58f 100644
--- a/projects/rocshmem/tests/functional_tests/team_barrier_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_barrier_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,14 +15,13 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *****************************************************************************/
 
-
 rocshmem_team_t team_barrier_world_dup;
 
 /******************************************************************************
diff --git a/projects/rocshmem/tests/functional_tests/team_barrier_tester.hpp b/projects/rocshmem/tests/functional_tests/team_barrier_tester.hpp
index 067895f974..3fe95ee4d1 100644
--- a/projects/rocshmem/tests/functional_tests/team_barrier_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_barrier_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_broadcast_tester.cpp b/projects/rocshmem/tests/functional_tests/team_broadcast_tester.cpp
index 11326542fa..a155afb74d 100644
--- a/projects/rocshmem/tests/functional_tests/team_broadcast_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_broadcast_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_broadcast_tester.hpp b/projects/rocshmem/tests/functional_tests/team_broadcast_tester.hpp
index cebb09a61d..c4224891b2 100644
--- a/projects/rocshmem/tests/functional_tests/team_broadcast_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_broadcast_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.cpp b/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.cpp
index 7920adeb6c..3c05b1ba15 100644
--- a/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.hpp b/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.hpp
index b59d1baf90..b1e3f5760e 100644
--- a/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_ctx_infra_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.cpp b/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.cpp
index 5633fb22ba..e5caeb9135 100644
--- a/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.hpp b/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.hpp
index 59d917f0da..8d1a9681f6 100644
--- a/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_ctx_primitive_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_fcollect_tester.cpp b/projects/rocshmem/tests/functional_tests/team_fcollect_tester.cpp
index 5f1fc46264..353d8f3142 100644
--- a/projects/rocshmem/tests/functional_tests/team_fcollect_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_fcollect_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_fcollect_tester.hpp b/projects/rocshmem/tests/functional_tests/team_fcollect_tester.hpp
index c695069c7a..2d51d9b24f 100644
--- a/projects/rocshmem/tests/functional_tests/team_fcollect_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_fcollect_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_reduction_tester.cpp b/projects/rocshmem/tests/functional_tests/team_reduction_tester.cpp
index 4229888bfc..70e6c57801 100644
--- a/projects/rocshmem/tests/functional_tests/team_reduction_tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/team_reduction_tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/team_reduction_tester.hpp b/projects/rocshmem/tests/functional_tests/team_reduction_tester.hpp
index 9b7f9460ba..6cbb1ea414 100644
--- a/projects/rocshmem/tests/functional_tests/team_reduction_tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/team_reduction_tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/test_driver.cpp b/projects/rocshmem/tests/functional_tests/test_driver.cpp
index 6d4129a32e..5ab79f59f7 100644
--- a/projects/rocshmem/tests/functional_tests/test_driver.cpp
+++ b/projects/rocshmem/tests/functional_tests/test_driver.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/tester.cpp b/projects/rocshmem/tests/functional_tests/tester.cpp
index a348b33a30..b698714168 100644
--- a/projects/rocshmem/tests/functional_tests/tester.cpp
+++ b/projects/rocshmem/tests/functional_tests/tester.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/tester.hpp b/projects/rocshmem/tests/functional_tests/tester.hpp
index 022e81004d..ebb0913a07 100644
--- a/projects/rocshmem/tests/functional_tests/tester.hpp
+++ b/projects/rocshmem/tests/functional_tests/tester.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/tester_arguments.cpp b/projects/rocshmem/tests/functional_tests/tester_arguments.cpp
index 533b9d4093..9f842b2f4a 100644
--- a/projects/rocshmem/tests/functional_tests/tester_arguments.cpp
+++ b/projects/rocshmem/tests/functional_tests/tester_arguments.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/tester_arguments.hpp b/projects/rocshmem/tests/functional_tests/tester_arguments.hpp
index 4a6d82e728..dc66663f73 100644
--- a/projects/rocshmem/tests/functional_tests/tester_arguments.hpp
+++ b/projects/rocshmem/tests/functional_tests/tester_arguments.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/wavefront_primitives.cpp b/projects/rocshmem/tests/functional_tests/wavefront_primitives.cpp
index a0a95f0b10..e2744b263c 100644
--- a/projects/rocshmem/tests/functional_tests/wavefront_primitives.cpp
+++ b/projects/rocshmem/tests/functional_tests/wavefront_primitives.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/wavefront_primitives.hpp b/projects/rocshmem/tests/functional_tests/wavefront_primitives.hpp
index e1c2923087..2c19beb0e2 100644
--- a/projects/rocshmem/tests/functional_tests/wavefront_primitives.hpp
+++ b/projects/rocshmem/tests/functional_tests/wavefront_primitives.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/workgroup_primitives.cpp b/projects/rocshmem/tests/functional_tests/workgroup_primitives.cpp
index 8d455e1001..a19954f45c 100644
--- a/projects/rocshmem/tests/functional_tests/workgroup_primitives.cpp
+++ b/projects/rocshmem/tests/functional_tests/workgroup_primitives.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/functional_tests/workgroup_primitives.hpp b/projects/rocshmem/tests/functional_tests/workgroup_primitives.hpp
index b3a68d66fe..f293dabcf2 100644
--- a/projects/rocshmem/tests/functional_tests/workgroup_primitives.hpp
+++ b/projects/rocshmem/tests/functional_tests/workgroup_primitives.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/sos_tests/CMakeLists.txt b/projects/rocshmem/tests/sos_tests/CMakeLists.txt
deleted file mode 100644
index 32464c5fee..0000000000
--- a/projects/rocshmem/tests/sos_tests/CMakeLists.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-###############################################################################
-
-set(TESTS_NAME host_facing_sos_tests)
-
-###############################################################################
-# SOURCES
-###############################################################################
-
-set(TEST_SOURCES
-      hello.cpp
-      barrier.cpp
-      global_exit.cpp
-      asym_alloc.cpp
-      shmalloc.cpp
-      bcast.cpp
-      broadcast_active_set.cpp
-      bcast_flood.cpp
-      to_all.cpp
-      reduce_in_place.cpp
-      reduce_active_set.cpp
-      max_reduction.cpp
-      big_reduction.cpp
-      cxx_test_shmem_p.cpp
-      cxx_test_shmem_g.cpp
-      put1.cpp
-      get1.cpp
-      put_nbi.cpp
-      get_nbi.cpp
-      bigput.cpp
-      bigget.cpp
-      waituntil.cpp
-      cxx_test_shmem_wait_until.cpp
-      shmem_test.cpp
-      cxx_test_shmem_test.cpp
-      atomic_inc.cpp
-      cxx_test_shmem_atomic_add.cpp
-      cxx_test_shmem_atomic_fetch.cpp
-      cxx_test_shmem_atomic_cswap.cpp
-      cxx_test_shmem_atomic_inc.cpp
-      lfinc.cpp
-      query_thread.cpp
-      threading.cpp
-      thread_wait.cpp
-      mt_contention.cpp
-      mt_a2a.cpp
-      micro_unit_shmem.cpp
-      circular_shift.cpp
-      pi.cpp
-      ping.cpp
-      sping.cpp
-      shmem_team_translate.cpp
-      shmem_team_reuse_teams.cpp
-      shmem_team_reduce.cpp
-      shmem_team_b2b_collectives.cpp
-      many-ctx.cpp
-)
-
-set (TEST_SOURCES_WITH_OMP
-      put_ctx_mbw_mr.cpp
-)
-# Automatic alternative (not reocommended 'cause cmake won't detect new files):
-# file( GLOB TEST_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp )
-
-foreach( testsourcefile ${TEST_SOURCES} )
-    string( REPLACE ".cpp" "" testname ${testsourcefile} )
-    add_executable( ${testname} ${testsourcefile} )
-    target_include_directories(
-        ${testname}
-        PRIVATE rocshmem::rocshmem
-    )
-    target_link_libraries(
-        ${testname}
-        PRIVATE
-          rocshmem::rocshmem
-          -fgpu-rdc
-    )
-endforeach( testsourcefile ${APP_SOURCES} )
-
-find_package(OpenMP REQUIRED)
-if(OPENMP_FOUND)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-if(NOT OPENMP_FOUND)
-    message(FATAL ERROR "Unable to find OpenMP library.")
-endif()
-
-foreach( testsourcefile ${TEST_SOURCES_WITH_OMP} )
-    string( REPLACE ".cpp" "" testname ${testsourcefile} )
-    add_executable( ${testname} ${testsourcefile} )
-    target_include_directories(
-        ${testname}
-        PRIVATE rocshmem::rocshmem
-    )
-    target_link_libraries(
-        ${testname}
-        PUBLIC
-          rocshmem::rocshmem
-          -fgpu-rdc
-    )
-endforeach( testsourcefile ${APP_SOURCES} )
diff --git a/projects/rocshmem/tests/sos_tests/asym_alloc.cpp b/projects/rocshmem/tests/sos_tests/asym_alloc.cpp
deleted file mode 100644
index f6c7917132..0000000000
--- a/projects/rocshmem/tests/sos_tests/asym_alloc.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Synopsis: Test that a single asymmetric allocation works correctly.
- *
- * This semantic is provided in OpenSHMEM 1.1 and some versions of Cray SHMEM.
- * It was removed from OpenSHMEM in 1.2, but we maintain it for backward
- * compatibility.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-long bufsize;
-
-int main(int argc, char **argv) {
-  int *buf, *buf_in;
-  int me, npes, i, target;
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  /* Each PE allocates space for "me + 1" integers */
-  bufsize = me + 1;
-  buf = (int *)rocshmem_malloc(sizeof(int) * bufsize);
-
-  if (NULL == buf) rocshmem_global_exit(1);
-
-  for (i = 0; i < bufsize; i++) buf[i] = -1;
-
-  rocshmem_barrier_all();
-
-  /* Write to neighbor's buffer */
-  target = (me + 1) % npes;
-  buf_in = (int *)malloc(sizeof(int) * (target + 1));
-  if (!buf_in) {
-    fprintf(stderr, "ERR - null buf_in pointer\n");
-    rocshmem_global_exit(1);
-  }
-
-  for (i = 0; i < target + 1; i++) buf_in[i] = target;
-
-  rocshmem_int_put(buf, buf_in, target + 1, target);
-
-  rocshmem_barrier_all();
-
-  /* Validate data was written correctly */
-  for (i = 0; i < me + 1; i++) {
-    if (buf[i] != me) {
-      printf("Error [%3d]: buf[%d] == %d, expected %d\n", me, i, buf[i], me);
-      rocshmem_global_exit(2);
-    }
-  }
-
-  free(buf_in);
-  rocshmem_free(buf);
-  rocshmem_finalize();
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/atomic_inc.cpp b/projects/rocshmem/tests/sos_tests/atomic_inc.cpp
deleted file mode 100644
index 10d53948da..0000000000
--- a/projects/rocshmem/tests/sos_tests/atomic_inc.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * test rocshmem_int_atomic_inc() atomic_inc {-v|q}
- * {loop-cnt(default=10)(default=10)} where: -q == quiet, -v == verbose/debug
- *  Loop for loop-cnt
- *   all PEs call rocshmem_int_atomic_inc(), PE-0 totals
- *
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define Rfprintf \
-  if (rocshmem_my_pe() == 0) fprintf
-#define Rprintf \
-  if (rocshmem_my_pe() == 0) printf
-#define RDfprintf \
-  if (Verbose && rocshmem_my_pe() == 0) fprintf
-#define RDprintf \
-  if (Verbose && rocshmem_my_pe() == 0) printf
-#define Vprintf \
-  if (Verbose) printf
-#define Vfprintf \
-  if (Verbose) fprintf
-
-int Verbose;
-
-int main(int argc, char *argv[]) {
-  int c, cloop, loops;
-  int my_rank, num_ranks;
-  int Announce = (NULL == getenv("MAKELEVEL")) ? 1 : 0;
-  int *lock_cnt;
-
-  rocshmem_init();
-  my_rank = rocshmem_my_pe();
-  num_ranks = rocshmem_n_pes();
-  if (num_ranks == 1) {
-    fprintf(stderr, "ERR - Requires > 1 PEs\n");
-    rocshmem_finalize();
-    return 0;
-  }
-
-  while ((c = getopt(argc, argv, "vq")) != -1) {
-    switch (c) {
-      case 'v':
-        Verbose++;
-        break;
-      case 'q':
-        Announce = 0;
-        break;
-      default:
-        Rfprintf(stderr, "ERR - unknown -%c ?\n", c);
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  if (optind == argc)
-    loops = 10;
-  else {
-    loops = atoi(argv[optind++]);
-    if (loops <= 0 || loops > 1000000) {
-      Rfprintf(stderr, "ERR - loops arg out of bounds '%d'?\n", loops);
-      rocshmem_finalize();
-      return 1;
-    }
-  }
-
-  lock_cnt = (int *)rocshmem_malloc(sizeof(int));
-
-  for (cloop = 1; cloop <= loops; cloop++) {
-    *lock_cnt = 0;
-    rocshmem_barrier_all(); /* sync all ranks */
-
-    for (c = 0; c < num_ranks; c++)
-      rocshmem_int64_atomic_inc((int64_t *)lock_cnt, c);
-
-    Vprintf("[%d] locked: lock_cnt(%d)\n", my_rank, *lock_cnt);
-
-    rocshmem_int_wait_until(lock_cnt, ROCSHMEM_CMP_GE, num_ranks);
-
-    rocshmem_barrier_all(); /* sync all ranks */
-
-    if ((*lock_cnt) != num_ranks) {
-      printf("[%d] loop %d: bad lock_cnt %d, expected %d?\n", my_rank, cloop,
-             *lock_cnt, num_ranks);
-      rocshmem_global_exit(1);
-    }
-
-    if ((cloop % 10) == 0) {
-      if (my_rank == 0 && Announce)
-        printf("%d ranks completed %d loops\n", num_ranks, cloop);
-    }
-  }
-
-  Vprintf("[%d] of %d, Exit: lock_cnt %d\n", my_rank, num_ranks, *lock_cnt);
-
-  rocshmem_free(lock_cnt);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/barrier.cpp b/projects/rocshmem/tests/sos_tests/barrier.cpp
deleted file mode 100644
index b6c401ce79..0000000000
--- a/projects/rocshmem/tests/sos_tests/barrier.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * rocshmem_barrier() test  barrier {-V} {loop-cnt}
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define Rfprintf \
-  if (rocshmem_my_pe() == 0) fprintf
-#define Rprintf \
-  if (rocshmem_my_pe() == 0) printf
-#define RDfprintf \
-  if (Verbose && rocshmem_my_pe() == 0) fprintf
-#define RDprintf \
-  if (Verbose && rocshmem_my_pe() == 0) printf
-
-int Verbose;
-
-int main(int argc, char* argv[]) {
-  int c, j, loops;
-  int rank, num_ranks;
-  char* prog_name;
-
-  rocshmem_init();
-  rank = rocshmem_my_pe();
-  num_ranks = rocshmem_n_pes();
-  if (num_ranks == 1) {
-    Rfprintf(stderr, "ERR - Requires > 1 PEs\n");
-    rocshmem_finalize();
-    return 0;
-  }
-  prog_name = strrchr(argv[0], '/');
-  if (prog_name)
-    prog_name++;
-  else
-    prog_name = argv[0];
-
-  while ((c = getopt(argc, argv, "v")) != -1) {
-    switch (c) {
-      case 'V':
-        Verbose++;
-        break;
-      default:
-        Rfprintf(stderr, "ERR - unknown -%c ?\n", c);
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  if (optind == argc)
-    loops = 30;
-  else {
-    loops = atoi(argv[optind++]);
-    if (loops <= 0 || loops > 1000000) {
-      Rfprintf(stderr, "ERR - loops arg out of bounds '%d'?\n", loops);
-      rocshmem_finalize();
-      return 1;
-    }
-  }
-
-  for (j = 0; j < loops; j++) {
-    // if ( j==0 || (j % 10) == 0 )
-    RDfprintf(stderr, "[%d] pre-barrier(%d)\n", rank, j);
-
-    rocshmem_barrier_all(); /* sync sender and receiver */
-
-    // if ( j==0 || (j % 10) == 0 )
-    RDfprintf(stderr, "[%d] post barrier(%d)\n", rank, j);
-  }
-
-  RDprintf("%d(%d) Exit\n", rank, num_ranks);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/bcast.cpp b/projects/rocshmem/tests/sos_tests/bcast.cpp
deleted file mode 100644
index 6b178dcf44..0000000000
--- a/projects/rocshmem/tests/sos_tests/bcast.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * broadcast [0...num_pes]
- *
- * usage: bcast {-v|h}
- *
- * Loop - rocshmem_broadcast_all() with increasing data amount.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define START_BCAST_SIZE 16
-#define BCAST_INCR 1024
-
-int main(int argc, char *argv[]) {
-  int i, Verbose = 0;
-  int mpe, num_pes, loops = 10, cloop;
-  char *pgm;
-  long *dst, *src;
-  int nBytes = START_BCAST_SIZE;
-  int nLongs = 0;
-  long *pSync;
-
-  rocshmem_init();
-  mpe = rocshmem_my_pe();
-  num_pes = rocshmem_n_pes();
-
-  if (num_pes == 1) {
-    printf("%s: Requires number of PEs > 1\n", argv[0]);
-    rocshmem_finalize();
-    return 0;
-  }
-
-  if (sizeof(long) != 8) {
-    printf("Test assumes 64-bit long (%zd)\n", sizeof(long));
-    rocshmem_global_exit(1);
-    return 0;
-  }
-
-  if ((pgm = strrchr(argv[0], '/'))) {
-    pgm++;
-  } else {
-    pgm = argv[0];
-  }
-
-  if (argc > 1) {
-    if (strncmp(argv[1], "-v", 3) == 0) {
-      Verbose = 1;
-    } else if (strncmp(argv[1], "-h", 3) == 0) {
-      fprintf(stderr, "usage: %s {-v(verbose)|h(help)}\n", pgm);
-      rocshmem_finalize();
-      exit(1);
-    }
-  }
-
-  pSync = (long *)rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE);
-
-  for (i = 0; i < ROCSHMEM_BCAST_SYNC_SIZE; i += 1) {
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  if (mpe == 0 && Verbose) {
-    fprintf(stderr, "%d loops\n", loops);
-  }
-
-  for (cloop = 1; cloop <= loops; cloop++) {
-    nLongs = nBytes / sizeof(long);
-    dst = (long *)rocshmem_malloc(nBytes * 2);
-    if (!dst) {
-      fprintf(stderr, "[%d] rocshmem_malloc(%d) failed %s\n", mpe, nBytes,
-              strerror(errno));
-      return 0;
-    }
-    memset((void *)dst, 0, nBytes);
-    src = &dst[nLongs];
-    for (i = 1; i < nLongs; i++) {
-      src[i] = i + 1;
-    }
-
-    rocshmem_barrier_all();
-
-    rocshmem_ctx_long_broadcast(ROCSHMEM_CTX_DEFAULT, dst, src, nLongs, 1, 0,
-                                 0, num_pes, pSync);
-
-    for (i = 0; i < nLongs; i++) {
-      /* the root node shouldn't have the result into dst (cf specification).*/
-      if (1 != mpe && dst[i] != src[i]) {
-        fprintf(stderr, "[%d] dst[%d] %ld != expected %ld\n", mpe, i, dst[i],
-                src[i]);
-        rocshmem_global_exit(1);
-      } else if (1 == mpe && dst[i] != 0) {
-        fprintf(stderr, "[%d] dst[%d] %ld != expected 0\n", mpe, i, dst[i]);
-        rocshmem_global_exit(1);
-      }
-    }
-    rocshmem_barrier_all();
-
-    rocshmem_free(dst);
-    if (Verbose && mpe == 0)
-      fprintf(stderr, "loop %2d Bcast %d, Done.\n", cloop, nBytes);
-    nBytes += BCAST_INCR;
-  }
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/bcast_flood.cpp b/projects/rocshmem/tests/sos_tests/bcast_flood.cpp
deleted file mode 100644
index 4976457d42..0000000000
--- a/projects/rocshmem/tests/sos_tests/bcast_flood.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Broadcast flood - bcast 100KB to all, default to using 2 pSync vars */
-
-#include <assert.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-static int atoi_scaled(char *s);
-static void usage(char *pgm);
-
-static double shmem_wtime(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
-}
-
-int Verbose = 0;
-int Serialize;
-
-long *pSync;
-
-#define DFLT_LOOPS 600  // downsized for 'make check'
-//#define DFLT_LOOPS 10000
-#define N_ELEMENTS 25600 /*100 KB as ints */
-
-int main(int argc, char **argv) {
-  int i, ps, ps_cnt = 2;
-  int *target;
-  int *source;
-  int me, npes, elements = N_ELEMENTS, loops = DFLT_LOOPS;
-  char *pgm;
-  double start_time, time_taken;
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if ((pgm = strrchr(argv[0], '/'))) {
-    pgm++;
-  } else {
-    pgm = argv[0];
-  }
-
-  while ((i = getopt(argc, argv, "hve:l:p:s")) != EOF) {
-    switch (i) {
-      case 'v':
-        Verbose++;
-        break;
-      case 'e':
-        if ((elements = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad elements count %d\n", elements);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 'l':
-        if ((loops = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad loop count %d\n", loops);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 'p':
-        if ((ps_cnt = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad pSync[] elements %d\n", loops);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 's':
-        Serialize++;
-        break;
-      case 'h':
-        if (me == 0) usage(pgm);
-        return 0;
-      default:
-        if (me == 0) {
-          fprintf(stderr, "%s: unknown switch '-%c'?\n", pgm, i);
-          usage(pgm);
-        }
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  ps_cnt *= ROCSHMEM_BCAST_SYNC_SIZE;
-  pSync = (long *)rocshmem_malloc(ps_cnt * sizeof(long));
-  if (!pSync) {
-    fprintf(stderr, "ERR - null pSync pointer\n");
-    rocshmem_global_exit(1);
-  }
-
-  for (i = 0; i < ps_cnt; i++) {
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  source = (int *)rocshmem_malloc(elements * sizeof(*source));
-  if (!source) {
-    fprintf(stderr, "ERR - null source pointer\n");
-    rocshmem_global_exit(1);
-  }
-
-  target = (int *)rocshmem_malloc(elements * sizeof(*target));
-  if (!target) {
-    fprintf(stderr, "ERR - null target pointer\n");
-    rocshmem_global_exit(1);
-  }
-  for (i = 0; i < elements; i += 1) {
-    source[i] = i + 1;
-    target[i] = -90;
-  }
-
-  if (me == 0 && Verbose) {
-    fprintf(stderr, "ps_cnt %d loops %d nElems %d\n", ps_cnt, loops, elements);
-  }
-
-  rocshmem_barrier_all();
-
-  for (time_taken = 0.0, ps = i = 0; i < loops; i++) {
-    start_time = shmem_wtime();
-
-    rocshmem_ctx_int_broadcast(ROCSHMEM_CTX_DEFAULT, target, source, elements,
-                                0, 0, 0, npes, &pSync[ps]);
-
-    if (Serialize) rocshmem_barrier_all();
-
-    time_taken += (shmem_wtime() - start_time);
-
-    if (ps_cnt > 1) {
-      ps += ROCSHMEM_BCAST_SYNC_SIZE;
-      if (ps >= ps_cnt) ps = 0;
-    }
-  }
-
-  if (me == 0 && Verbose) {
-    printf("%d loops of int_broadcast(%ld bytes) over %d PEs: %7.3f secs\n",
-           loops, (elements * sizeof(*source)), npes, time_taken);
-    elements = (elements * loops * sizeof(*source)) / (1024 * 1024);
-    printf("  %7.5f secs per broadcast() @ %7.4f MB/sec\n",
-           (time_taken / (double)loops), ((double)elements / time_taken));
-  }
-
-  if (Verbose > 1) fprintf(stderr, "[%d] pre B1\n", me);
-
-  rocshmem_barrier_all();
-
-  if (Verbose > 1) fprintf(stderr, "[%d] post B1\n", me);
-
-  rocshmem_free(pSync);
-  rocshmem_free(target);
-  rocshmem_free(source);
-
-  rocshmem_finalize();
-
-  return 0;
-}
-
-static int atoi_scaled(char *s) {
-  long val;
-  char *e;
-
-  val = strtol(s, &e, 0);
-  if (e == NULL || *e == '\0') return (int)val;
-
-  if (*e == 'k' || *e == 'K')
-    val *= 1024;
-  else if (*e == 'm' || *e == 'M')
-    val *= 1024 * 1024;
-  else if (*e == 'g' || *e == 'G')
-    val *= 1024 * 1024 * 1024;
-
-  return (int)val;
-}
-
-static void usage(char *pgm) {
-  fprintf(stderr,
-          "usage: %s -{lhv}\n"
-          "  where:\n"
-          "    -l loops (%d)  loop count.\n"
-          "    -e ints        # of integers to broadcast\n"
-          "    -p cnt         # of pSync[] elements\n"
-          "    -v             be verbose, multiple 'v' more verbose\n"
-          "    -h             this text.\n",
-          pgm, DFLT_LOOPS);
-}
diff --git a/projects/rocshmem/tests/sos_tests/big_reduction.cpp b/projects/rocshmem/tests/sos_tests/big_reduction.cpp
deleted file mode 100644
index 27665a010c..0000000000
--- a/projects/rocshmem/tests/sos_tests/big_reduction.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * reduce across PEs with rocshmem_max_to_all()
- *
- * usage: big_reduction {-v|h}
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define N 128
-
-#define MAX(a, b) ((a) > (b)) ? (a) : (b)
-#define WRK_SIZE MAX(N / 2 + 1, ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE)
-
-int main(int argc, char *argv[]) {
-  int i, Verbose = 0;
-  char *pgm;
-  long *pSync, *pWrk;
-  long *src, *dst;
-
-  if ((pgm = strrchr(argv[0], '/'))) {
-    pgm++;
-  } else {
-    pgm = argv[0];
-  }
-
-  if (argc > 1) {
-    if (strncmp(argv[1], "-v", 3) == 0) {
-      Verbose = 1;
-    } else if (strncmp(argv[1], "-h", 3) == 0) {
-      fprintf(stderr, "usage: %s {-v(verbose)|h(help)}\n", pgm);
-      rocshmem_finalize();
-      exit(1);
-    }
-  }
-
-  rocshmem_init();
-
-  src = (long *)rocshmem_malloc(N * sizeof(long));
-  for (i = 0; i < N; i += 1) {
-    src[i] = rocshmem_my_pe() + i;
-  }
-  dst = (long *)rocshmem_malloc(N * sizeof(long));
-
-  pSync = (long *)rocshmem_malloc(ROCSHMEM_REDUCE_SYNC_SIZE * sizeof(long));
-  for (i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i += 1) {
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  pWrk = (long *)rocshmem_malloc(WRK_SIZE * sizeof(long));
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_long_max_to_all(ROCSHMEM_CTX_DEFAULT, dst, src, N, 0, 0,
-                                rocshmem_n_pes(), pWrk, pSync);
-
-  if (Verbose) {
-    printf("%d/%d\tdst =", rocshmem_my_pe(), rocshmem_n_pes());
-    for (i = 0; i < N; i += 1) {
-      printf(" %ld", dst[i]);
-    }
-    printf("\n");
-  }
-
-  for (i = 0; i < N; i += 1) {
-    if (dst[i] != rocshmem_n_pes() - 1 + i) {
-      printf("[%3d] Error: dst[%d] == %ld, expected %ld\n", rocshmem_my_pe(),
-             i, dst[i], rocshmem_n_pes() - 1 + (long)i);
-      rocshmem_global_exit(1);
-    }
-  }
-
-  rocshmem_free(dst);
-  rocshmem_free(src);
-  rocshmem_free(pSync);
-  rocshmem_free(pWrk);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/bigget.cpp b/projects/rocshmem/tests/sos_tests/bigget.cpp
deleted file mode 100644
index 85c7f827f9..0000000000
--- a/projects/rocshmem/tests/sos_tests/bigget.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * (big get) each PE gets N elements (1 MB) from (my_pe()+1 mod num_pes()).
- */
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NUM_ELEMENTS 4194304  // 32 MB by longs
-//#define DFLT_LOOPS 10000
-#define DFLT_LOOPS 1000
-
-int Verbose;
-int Sync;
-int Track;
-int elements = NUM_ELEMENTS;
-double *total_time;
-
-static int atoi_scaled(char *s) {
-  long val;
-  char *e;
-
-  val = strtol(s, &e, 0);
-  if (e == NULL || *e == '\0') return (int)val;
-
-  if (*e == 'k' || *e == 'K')
-    val *= 1024;
-  else if (*e == 'm' || *e == 'M')
-    val *= 1024 * 1024;
-  else if (*e == 'g' || *e == 'G')
-    val *= 1024 * 1024 * 1024;
-
-  return (int)val;
-}
-
-static void usage(char *pgm) {
-  fprintf(
-      stderr,
-      "usage: %s -{hvclst}\n"
-      "  where: (big gets)\n"
-      "    -v              be verbose, multiple 'v' more verbose\n"
-      "    -e element-cnt (%d)  # of int sized elements to get\n"
-      "    -l loops (%d)  loop count.\n"
-      "    -s             synchronize: barrier after each rocshmem_get()\n"
-      "    -t             track: output '.' for every 200 rocshmem_get()s\n",
-      pgm, NUM_ELEMENTS, DFLT_LOOPS);
-}
-
-static inline double shmem_wtime(void) {
-  struct timeval tv;
-  gettimeofday(&tv, 0);
-  return (double)((tv.tv_usec / 1000000.0) + tv.tv_sec);
-}
-
-int main(int argc, char **argv) {
-  int loops = DFLT_LOOPS;
-  char *pgm;
-  int *Target;
-  int *Source;
-  int i, me, npes;
-  int target_pe;
-  long bytes;
-  double time_taken = 0.0, start_time;
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if ((pgm = strrchr(argv[0], '/')))
-    pgm++;
-  else
-    pgm = argv[0];
-
-  while ((i = getopt(argc, argv, "hve:l:st")) != EOF) {
-    switch (i) {
-      case 'v':
-        Verbose++;
-        break;
-      case 'e':
-        if ((elements = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad elements count %d\n", elements);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 'l':
-        if ((loops = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad loop count %d\n", loops);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 's':
-        Sync++;
-        break;
-      case 't':
-        Track++;
-        break;
-      case 'h':
-        if (me == 0) usage(pgm);
-        return 0;
-      default:
-        if (me == 0) {
-          fprintf(stderr, "%s: unknown switch '-%c'?\n", pgm, i);
-          usage(pgm);
-        }
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  target_pe = (me + 1) % npes;
-
-  total_time = (double *)rocshmem_malloc(npes * sizeof(double));
-  if (!total_time) {
-    fprintf(stderr, "ERR: bad total_time rocshmem_malloc(%ld)\n",
-            (elements * sizeof(double)));
-    rocshmem_global_exit(1);
-  }
-
-  Source = (int *)rocshmem_malloc(elements * sizeof(*Source));
-  if (!Source) {
-    fprintf(stderr, "ERR: bad Source rocshmem_malloc(%ld)\n",
-            (elements * sizeof(*Target)));
-    rocshmem_free(total_time);
-    rocshmem_global_exit(1);
-  }
-
-  Target = (int *)rocshmem_malloc(elements * sizeof(*Target));
-  if (!Target) {
-    fprintf(stderr, "ERR: bad Target rocshmem_malloc(%ld)\n",
-            (elements * sizeof(*Target)));
-    rocshmem_free(Source);
-    rocshmem_free(total_time);
-    rocshmem_global_exit(1);
-  }
-
-  for (i = 0; i < elements; i++) {
-    Target[i] = -90;
-    Source[i] = i + 1;
-  }
-
-  bytes = loops * sizeof(int) * elements;
-
-  if (Verbose && me == 0)
-    fprintf(stderr, "%s: INFO - %d loops, get %d (int) elements from PE+1\n",
-            pgm, loops, elements);
-
-  rocshmem_barrier_all();
-
-  for (i = 0; i < loops; i++) {
-    start_time = shmem_wtime();
-
-    rocshmem_int_get(Target, Source, elements, target_pe);
-
-    time_taken += shmem_wtime() - start_time;
-
-    if (me == 0) {
-      if (Track && i > 0 && ((i % 200) == 0)) fprintf(stderr, ".%d", i);
-    }
-    if (Sync) rocshmem_barrier_all();
-  }
-
-  // collect time per node elapsed time.
-  rocshmem_double_put(&total_time[me], &time_taken, 1, 0);
-
-  rocshmem_barrier_all();
-
-  for (i = 0; i < elements; i++) {
-    if (Target[i] != i + 1) {
-      printf("%d: Error Target[%d] = %d, expected %d\n", me, i, Target[i],
-             i + 1);
-      rocshmem_global_exit(1);
-    }
-  }
-
-  if (Track && me == 0) fprintf(stderr, "\n");
-
-  if (Verbose && me == 0) {
-    double rate, secs;
-
-    // average time
-    for (i = 0, secs = 0.0; i < npes; i++) secs += total_time[i];
-    secs /= (double)npes;
-    rate = ((double)bytes / (1024.0 * 1024.0)) / secs;
-    printf("%s: ave %5.3f MB/sec (bytes %ld secs %5.3f)\n", pgm, rate, bytes,
-           secs);
-  }
-
-  rocshmem_free(total_time);
-  rocshmem_free(Target);
-  rocshmem_free(Source);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/bigput.cpp b/projects/rocshmem/tests/sos_tests/bigput.cpp
deleted file mode 100644
index 8f3fda7851..0000000000
--- a/projects/rocshmem/tests/sos_tests/bigput.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * (big puts) each PE puts N elements (1MB) to ((my_pe()+1) mod num_pes()).
- */
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NUM_ELEMENTS 4194304  // 32 MB by longs
-//#define DFLT_LOOPS 10000  // reset when Portals4 can achieve this.
-#define DFLT_LOOPS 100
-
-int Verbose;
-int Sync;
-int Track;
-int elements = NUM_ELEMENTS;
-double sum_time, time_taken;
-
-static int atoi_scaled(char *s) {
-  long val;
-  char *e;
-
-  val = strtol(s, &e, 0);
-  if (e == NULL || *e == '\0') return (int)val;
-
-  if (*e == 'k' || *e == 'K')
-    val *= 1024;
-  else if (*e == 'm' || *e == 'M')
-    val *= 1024 * 1024;
-  else if (*e == 'g' || *e == 'G')
-    val *= 1024 * 1024 * 1024;
-
-  return (int)val;
-}
-
-static void usage(char *pgm) {
-  fprintf(
-      stderr,
-      "usage: %s -{hvclst}\n"
-      "  where: (big puts)\n"
-      "    -v              be verbose, multiple 'v' more verbose\n"
-      "    -e element-cnt (%d)  # of int sized elements to put\n"
-      "    -l loops (%d)  loop count.\n"
-      "    -s             synchronize: barrier after each rocshmem_put()\n"
-      "    -t             track: output '.' for every 200 rocshmem_put()s\n",
-      pgm, NUM_ELEMENTS, DFLT_LOOPS);
-}
-
-static inline double shmem_wtime(void) {
-  struct timeval tv;
-  gettimeofday(&tv, 0);
-  return (double)((tv.tv_usec / 1000000.0) + tv.tv_sec);
-}
-
-int main(int argc, char **argv) {
-  int loops = DFLT_LOOPS;
-  char *pgm;
-  int *Target;
-  int *Source;
-  int i, me, npes;
-  int target_PE;
-  long bytes;
-  double start_time, *total_time;
-  long *pSync;
-  double *pWrk;
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if ((pgm = strrchr(argv[0], '/')))
-    pgm++;
-  else
-    pgm = argv[0];
-
-  while ((i = getopt(argc, argv, "hve:l:st")) != EOF) {
-    switch (i) {
-      case 'v':
-        Verbose++;
-        break;
-      case 'e':
-        if ((elements = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad elements count %d\n", elements);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 'l':
-        if ((loops = atoi_scaled(optarg)) <= 0) {
-          fprintf(stderr, "ERR: Bad loop count %d\n", loops);
-          rocshmem_finalize();
-          return 1;
-        }
-        break;
-      case 's':
-        Sync++;
-        break;
-      case 't':
-        Track++;
-        break;
-      case 'h':
-        if (me == 0) usage(pgm);
-        return 0;
-      default:
-        if (me == 0) {
-          fprintf(stderr, "%s: unknown switch '-%c'?\n", pgm, i);
-          usage(pgm);
-        }
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  pSync = (long *)rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE);
-  if (!pSync) {
-    fprintf(stderr, "ERR: bad pSync rocshmem_malloc(%ld)\n",
-            ROCSHMEM_BCAST_SYNC_SIZE);
-    rocshmem_global_exit(1);
-  }
-
-  for (i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i++)
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-
-  pWrk = (double *)rocshmem_malloc(ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE);
-  if (!pWrk) {
-    fprintf(stderr, "ERR: bad pWrk rocshmem_malloc(%ld)\n",
-            ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE);
-    rocshmem_free(pSync);
-    rocshmem_global_exit(1);
-  }
-
-  target_PE = (me + 1) % npes;
-
-  total_time = (double *)rocshmem_malloc(npes * sizeof(double));
-  if (!total_time) {
-    fprintf(stderr, "ERR: bad total_time rocshmem_malloc(%ld)\n",
-            (elements * sizeof(double)));
-    rocshmem_free(pSync);
-    rocshmem_free(pWrk);
-    rocshmem_global_exit(1);
-  }
-  for (i = 0; i < npes; i++) total_time[i] = -1.0;
-
-  Source = (int *)rocshmem_malloc(elements * sizeof(*Source));
-  if (!Source) {
-    fprintf(stderr, "ERR: bad Source rocshmem_malloc(%ld)\n",
-            (elements * sizeof(*Target)));
-    rocshmem_free(pSync);
-    rocshmem_free(pWrk);
-    rocshmem_free(total_time);
-    rocshmem_global_exit(1);
-  }
-
-  Target = (int *)rocshmem_malloc(elements * sizeof(*Target));
-  if (!Target) {
-    fprintf(stderr, "ERR: bad Target rocshmem_malloc(%ld)\n",
-            (elements * sizeof(*Target)));
-    rocshmem_free(pSync);
-    rocshmem_free(pWrk);
-    rocshmem_free(Source);
-    rocshmem_free(total_time);
-    rocshmem_global_exit(1);
-  }
-
-  for (i = 0; i < elements; i++) {
-    Target[i] = -90;
-    Source[i] = i + 1;
-  }
-
-  bytes = loops * sizeof(int) * elements;
-
-  if (Verbose && me == 0) {
-    fprintf(stderr,
-            "%s: INFO - %d loops, put %d (int) elements to PE+1 Max put ??\n",
-            pgm, loops, elements);
-  }
-  rocshmem_barrier_all();
-
-  for (i = 0; i < loops; i++) {
-    start_time = shmem_wtime();
-
-    rocshmem_int_put(Target, Source, elements, target_PE);
-
-    time_taken += (shmem_wtime() - start_time);
-
-    if (me == 0) {
-      if (Track && i > 0 && ((i % 200) == 0)) fprintf(stderr, ".%d", i);
-    }
-    if (Sync) rocshmem_barrier_all();
-  }
-
-  // collect time per node.
-  rocshmem_double_put(&total_time[me], &time_taken, 1, 0);
-  rocshmem_ctx_double_sum_to_all(ROCSHMEM_CTX_DEFAULT, &sum_time, &time_taken,
-                                  1, 0, 0, npes, pWrk, pSync);
-
-  rocshmem_barrier_all();
-
-  for (i = 0; i < elements; i++) {
-    if (Target[i] != i + 1) {
-      printf("%d: Error Target[%d] = %d, expected %d\n", me, i, Target[i],
-             i + 1);
-      rocshmem_global_exit(1);
-    }
-  }
-
-  if (Track && me == 0) fprintf(stderr, "\n");
-
-  if (Verbose && me == 0) {
-    double rate, comp_time;
-
-    if (Verbose > 1) fprintf(stdout, "Individule PE times: (seconds)\n");
-    for (i = 0, comp_time = 0.0; i < npes; i++) {
-      comp_time += total_time[i];
-      if (Verbose > 1) fprintf(stdout, "  PE[%d] %8.6f\n", i, total_time[i]);
-    }
-
-    sum_time /= (double)npes;
-    comp_time /= (double)npes;
-    if (sum_time != comp_time)
-      printf("%s: computed_time %7.5f != sum_to_all_time %7.5f)\n", pgm,
-             comp_time, sum_time);
-
-    rate = ((double)bytes / (1024.0 * 1024.0)) / comp_time;
-    printf("%s: rocshmem_int_put() %7.4f MB/sec (bytes %ld secs %7.4f)\n", pgm,
-           rate, bytes, sum_time);
-  }
-
-  rocshmem_free(pSync);
-  rocshmem_free(pWrk);
-  rocshmem_free(total_time);
-  rocshmem_free(Target);
-  rocshmem_free(Source);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/broadcast_active_set.cpp b/projects/rocshmem/tests/sos_tests/broadcast_active_set.cpp
deleted file mode 100644
index 102aa426f1..0000000000
--- a/projects/rocshmem/tests/sos_tests/broadcast_active_set.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NELEM 10
-
-/* Note: Need to alternate psync arrays because the active set changes */
-
-int main(void) {
-  int i, me, npes;
-  int errors = 0;
-  long *bcast_psync;
-  // long *barrier_psync0, *barrier_psync1;
-  long long *src, *dst;
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  src = (long long *)rocshmem_malloc(NELEM * sizeof(long long));
-  dst = (long long *)rocshmem_malloc(NELEM * sizeof(long long));
-  for (i = 0; i < NELEM; i++) {
-    src[i] = me;
-    dst[i] = -1;
-  }
-
-  bcast_psync =
-      (long *)rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE * sizeof(long));
-  for (i = 0; i < ROCSHMEM_BCAST_SYNC_SIZE; i++)
-    bcast_psync[i] = ROCSHMEM_SYNC_VALUE;
-
-  /*
-  barrier_psync0 = (long *) rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE *
-  sizeof(long)); barrier_psync1 = (long *)
-  rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE * sizeof(long)); for (i = 0; i <
-  ROCSHMEM_BARRIER_SYNC_SIZE; i++) { barrier_psync0[i] = ROCSHMEM_SYNC_VALUE;
-      barrier_psync1[i] = ROCSHMEM_SYNC_VALUE;
-  }
-  */
-
-  if (me == 0) printf("Shrinking active set test\n");
-
-  rocshmem_barrier_all();
-
-  /* A total of npes tests are performed, where the active set in each test
-   * includes PEs i..npes-1 */
-  for (i = 0; i <= me; i++) {
-    int j;
-
-    if (me == i) printf(" + active set size %d\n", npes - i);
-
-    rocshmem_ctx_longlong_broadcast(ROCSHMEM_CTX_DEFAULT, dst, src, NELEM, 0,
-                                     i, 0, npes - i, bcast_psync);
-
-    /* Validate broadcasted data */
-    for (j = 0; j < NELEM; j++) {
-      long long expected = (me == i) ? i - 1 : i;
-      if (dst[j] != expected) {
-        printf(
-            "%d: Expected dst[%d] = %lld, got dst[%d] = %lld, iteration %d\n",
-            me, j, expected, j, dst[j], i);
-        errors++;
-      }
-    }
-
-    // rocshmem_barrier(i, 0, npes-i, (i % 2) ? barrier_psync0 :
-    // barrier_psync1);
-  }
-
-  rocshmem_barrier_all();
-
-  for (i = 0; i < NELEM; i++) dst[i] = -1;
-
-  if (me == 0) printf("Changing root test\n");
-
-  rocshmem_barrier_all();
-
-  /* A total of npes tests are performed, where the root changes each time */
-  for (i = 0; i < npes; i++) {
-    int j;
-
-    if (me == i) printf(" + root %d\n", i);
-
-    rocshmem_ctx_longlong_broadcast(ROCSHMEM_CTX_DEFAULT, dst, src, NELEM, i,
-                                     0, 0, npes, bcast_psync);
-
-    /* Validate broadcasted data */
-    for (j = 0; j < NELEM; j++) {
-      long long expected = (me == i) ? i - 1 : i;
-      if (dst[j] != expected) {
-        printf(
-            "%d: Expected dst[%d] = %lld, got dst[%d] = %lld, iteration %d\n",
-            me, j, expected, j, dst[j], i);
-        errors++;
-      }
-    }
-
-    // rocshmem_barrier(0, 0, npes, barrier_psync0);
-  }
-
-  rocshmem_free(src);
-  rocshmem_free(dst);
-
-  rocshmem_free(bcast_psync);
-
-  rocshmem_finalize();
-
-  return errors != 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/circular_shift.cpp b/projects/rocshmem/tests/sos_tests/circular_shift.cpp
deleted file mode 100644
index 50c518b636..0000000000
--- a/projects/rocshmem/tests/sos_tests/circular_shift.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* circular shift bbb into aaa */
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char* argv[]) {
-  int me, neighbor;
-  int ret = 0;
-  int aaa, *bbb;
-
-  rocshmem_init();
-
-  bbb = (int*)rocshmem_malloc(sizeof(int));
-
-  *bbb = me = rocshmem_my_pe();
-  neighbor = (me + 1) % rocshmem_n_pes();
-
-  rocshmem_barrier_all();
-
-  rocshmem_int_get(&aaa, bbb, 1, neighbor);
-
-  rocshmem_barrier_all();
-
-  if (aaa != neighbor) ret = 1;
-
-  rocshmem_free(bbb);
-
-  rocshmem_finalize();
-
-  return ret;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_add.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_add.cpp
deleted file mode 100644
index 8e0df62500..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_add.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-enum op {
-  ADD = 0,
-  ATOMIC_ADD,
-  CTX_ATOMIC_ADD,
-  FADD,
-  ATOMIC_FETCH_ADD,
-  CTX_ATOMIC_FETCH_ADD,
-  ATOMIC_FETCH_ADD_NBI,
-  CTX_ATOMIC_FETCH_ADD_NBI
-};
-
-#ifdef ENABLE_DEPRECATED_TESTS
-#define DEPRECATED_ADD(TYPENAME, ...) rocshmem_##TYPENAME##_add(__VA_ARGS__)
-#define DEPRECATED_FADD(TYPENAME, ...) rocshmem_##TYPENAME##_fadd(__VA_ARGS__)
-#else
-#define DEPRECATED_ADD(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_add(__VA_ARGS__)
-#define DEPRECATED_FADD(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_fetch_add(__VA_ARGS__)
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-#define SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)                               \
-  case ATOMIC_FETCH_ADD_NBI:                                                  \
-    rocshmem_##TYPENAME##_atomic_fetch_add_nbi(&old, remote,                  \
-                                                (TYPE)(mype + 1), i);         \
-    rocshmem_quiet();                                                         \
-    if (old > (TYPE)(npes * (npes + 1) / 2)) {                                \
-      printf("PE %i error inconsistent value of old (%s, %s)\n", mype, #OP,   \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    break;                                                                    \
-  case CTX_ATOMIC_FETCH_ADD_NBI:                                              \
-    rocshmem_ctx_##TYPENAME##_atomic_fetch_add_nbi(                           \
-        ROCSHMEM_CTX_DEFAULT, &old, remote, (TYPE)(mype + 1), i);             \
-    rocshmem_quiet();                                                         \
-    if (old > (TYPE)(npes * (npes + 1) / 2)) {                                \
-      printf("PE %i error inconsistent value of old (%s, %s)\n", mype, #OP,   \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    break;
-
-#define TEST_SHMEM_ADD(OP, TYPE, TYPENAME)                                    \
-  do {                                                                        \
-    TYPE *remote;                                                             \
-    TYPE old;                                                                 \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = (TYPE)0;                                                        \
-    rocshmem_barrier_all();                                                   \
-    for (int i = 0; i < npes; i++) switch (OP) {                              \
-        case ADD:                                                             \
-          DEPRECATED_ADD(TYPENAME, remote, (TYPE)(mype + 1), i);              \
-          break;                                                              \
-        case ATOMIC_ADD:                                                      \
-          rocshmem_##TYPENAME##_atomic_add(remote, (TYPE)(mype + 1), i);      \
-          break;                                                              \
-        case CTX_ATOMIC_ADD:                                                  \
-          rocshmem_ctx_##TYPENAME##_atomic_add(ROCSHMEM_CTX_DEFAULT, remote,  \
-                                                (TYPE)(mype + 1), i);         \
-          break;                                                              \
-        case FADD:                                                            \
-          old = DEPRECATED_FADD(TYPENAME, remote, (TYPE)(mype + 1), i);       \
-          if (old > (TYPE)(npes * (npes + 1) / 2)) {                          \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        case ATOMIC_FETCH_ADD:                                                \
-          old = rocshmem_##TYPENAME##_atomic_fetch_add(remote,                \
-                                                        (TYPE)(mype + 1), i); \
-          if (old > (TYPE)(npes * (npes + 1) / 2)) {                          \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        case CTX_ATOMIC_FETCH_ADD:                                            \
-          old = rocshmem_ctx_##TYPENAME##_atomic_fetch_add(                   \
-              ROCSHMEM_CTX_DEFAULT, remote, (TYPE)(mype + 1), i);             \
-          if (old > (TYPE)(npes * (npes + 1) / 2)) {                          \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        /*SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)*/                           \
-        default:                                                              \
-          printf("Invalid operation (%d)\n", OP);                             \
-          rocshmem_global_exit(1);                                            \
-      }                                                                       \
-    rocshmem_barrier_all();                                                   \
-    if ((*remote) != (TYPE)(npes * (npes + 1) / 2)) {                         \
-      printf("PE %i observed error with TEST_SHMEM_ADD(%s, %s)\n", mype, #OP, \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-    if (rc == EXIT_FAILURE) rocshmem_global_exit(1);                          \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-
-#ifdef ENABLE_DEPRECATED_TESTS
-  TEST_SHMEM_ADD(ADD, int, int);
-  TEST_SHMEM_ADD(ADD, long, long);
-  TEST_SHMEM_ADD(ADD, long long, longlong);
-  TEST_SHMEM_ADD(ADD, unsigned int, uint);
-  TEST_SHMEM_ADD(ADD, unsigned long, ulong);
-  TEST_SHMEM_ADD(ADD, unsigned long long, ulonglong);
-  TEST_SHMEM_ADD(ADD, int32_t, int32);
-  TEST_SHMEM_ADD(ADD, int64_t, int64);
-  TEST_SHMEM_ADD(ADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(ADD, uint64_t, uint64);
-  TEST_SHMEM_ADD(ADD, size_t, size);
-  TEST_SHMEM_ADD(ADD, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_ADD(FADD, int, int);
-  TEST_SHMEM_ADD(FADD, long, long);
-  TEST_SHMEM_ADD(FADD, long long, longlong);
-  TEST_SHMEM_ADD(FADD, unsigned int, uint);
-  TEST_SHMEM_ADD(FADD, unsigned long, ulong);
-  TEST_SHMEM_ADD(FADD, unsigned long long, ulonglong);
-  TEST_SHMEM_ADD(FADD, int32_t, int32);
-  TEST_SHMEM_ADD(FADD, int64_t, int64);
-  TEST_SHMEM_ADD(FADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(FADD, uint64_t, uint64);
-  TEST_SHMEM_ADD(FADD, size_t, size);
-  TEST_SHMEM_ADD(FADD, ptrdiff_t, ptrdiff);
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-  // TEST_SHMEM_ADD(ATOMIC_ADD, int, int);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, long, long);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, long long, longlong);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, unsigned int, uint);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, unsigned long, ulong);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, unsigned long long, ulonglong);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, int32_t, int32);
-  TEST_SHMEM_ADD(ATOMIC_ADD, int64_t, int64);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(ATOMIC_ADD, uint64_t, uint64);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, size_t, size);
-  // TEST_SHMEM_ADD(ATOMIC_ADD, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, int, int);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, long, long);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, long long, longlong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, unsigned int, uint);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, unsigned long, ulong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, unsigned long long, ulonglong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, int32_t, int32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_ADD, int64_t, int64);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_ADD, uint64_t, uint64);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, size_t, size);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_ADD, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, int, int);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, long, long);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, long long, longlong);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, unsigned int, uint);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, unsigned long, ulong);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, unsigned long long, ulonglong);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, int32_t, int32);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, int64_t, int64);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, uint64_t, uint64);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, size_t, size);
-  // TEST_SHMEM_ADD(ATOMIC_FETCH_ADD, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, int, int);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, long, long);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, long long, longlong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, unsigned int, uint);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, unsigned long, ulong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, unsigned long long, ulonglong);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, int32_t, int32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, int64_t, int64);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, uint32_t, uint32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, uint64_t, uint64);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, size_t, size);
-  // TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD, ptrdiff_t, ptrdiff);
-
-  /*
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, int, int);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, long, long);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, long long, longlong);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, unsigned int, uint);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, unsigned long, ulong);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, int32_t, int32);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, int64_t, int64);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, uint32_t, uint32);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, uint64_t, uint64);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, size_t, size);
-  TEST_SHMEM_ADD(ATOMIC_FETCH_ADD_NBI, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, int, int);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, long, long);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, long long, longlong);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, unsigned int, uint);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, unsigned long, ulong);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, int32_t, int32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, int64_t, int64);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, uint32_t, uint32);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, uint64_t, uint64);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, size_t, size);
-  TEST_SHMEM_ADD(CTX_ATOMIC_FETCH_ADD_NBI, ptrdiff_t, ptrdiff);
-  */
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_cswap.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_cswap.cpp
deleted file mode 100644
index c649e13b5f..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_cswap.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-enum op {
-  CSWAP = 0,
-  ATOMIC_COMPARE_SWAP,
-  CTX_ATOMIC_COMPARE_SWAP,
-  ATOMIC_COMPARE_SWAP_NBI,
-  CTX_ATOMIC_COMPARE_SWAP_NBI
-};
-
-#ifdef ENABLE_DEPRECATED_TESTS
-#define DEPRECATED_CSWAP(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_cswap(__VA_ARGS__)
-#else
-#define DEPRECATED_CSWAP(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_compare_swap(__VA_ARGS__)
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-#define SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)                               \
-  case ATOMIC_COMPARE_SWAP_NBI:                                               \
-    rocshmem_##TYPENAME##_atomic_compare_swap_nbi(                            \
-        &old, remote, (TYPE)npes, (TYPE)mype, (mype + 1) % npes);             \
-    break;                                                                    \
-  case CTX_ATOMIC_COMPARE_SWAP_NBI:                                           \
-    rocshmem_ctx_##TYPENAME##_atomic_compare_swap_nbi(                        \
-        ROCSHMEM_CTX_DEFAULT, &old, remote, (TYPE)npes, (TYPE)mype,           \
-        (mype + 1) % npes);                                                   \
-    break;
-
-#define TEST_SHMEM_CSWAP(OP, TYPE, TYPENAME)                                  \
-  do {                                                                        \
-    TYPE *remote;                                                             \
-    TYPE old;                                                                 \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = npes;                                                           \
-    rocshmem_barrier_all();                                                   \
-    switch (OP) {                                                             \
-      case CSWAP:                                                             \
-        old = DEPRECATED_CSWAP(TYPENAME, remote, (TYPE)npes, (TYPE)mype,      \
-                               (mype + 1) % npes);                            \
-        break;                                                                \
-      case ATOMIC_COMPARE_SWAP:                                               \
-        old = rocshmem_##TYPENAME##_atomic_compare_swap(                      \
-            remote, (TYPE)npes, (TYPE)mype, (mype + 1) % npes);               \
-        break;                                                                \
-      case CTX_ATOMIC_COMPARE_SWAP:                                           \
-        old = rocshmem_ctx_##TYPENAME##_atomic_compare_swap(                  \
-            ROCSHMEM_CTX_DEFAULT, remote, (TYPE)npes, (TYPE)mype,             \
-            (mype + 1) % npes);                                               \
-        break;                                                                \
-      /* SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)  */                          \
-      default:                                                                \
-        printf("invalid operation (%d)\n", OP);                               \
-        rocshmem_global_exit(1);                                              \
-    }                                                                         \
-    rocshmem_barrier_all();                                                   \
-    if ((*remote) != (TYPE)((mype + npes - 1) % npes)) {                      \
-      printf("PE %i observed error with TEST_SHMEM_CSWAP(%s, %s)\n", mype,    \
-             #OP, #TYPE);                                                     \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    if (old != (TYPE)npes) {                                                  \
-      printf("PE %i error inconsistent value of old (%s, %s)\n", mype, #OP,   \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-    if (rc == EXIT_FAILURE) rocshmem_global_exit(1);                          \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-
-#ifdef ENABLE_DEPRECATED_TESTS
-  TEST_SHMEM_CSWAP(CSWAP, int, int);
-  TEST_SHMEM_CSWAP(CSWAP, long, long);
-  TEST_SHMEM_CSWAP(CSWAP, long long, longlong);
-  TEST_SHMEM_CSWAP(CSWAP, unsigned int, uint);
-  TEST_SHMEM_CSWAP(CSWAP, unsigned long, ulong);
-  TEST_SHMEM_CSWAP(CSWAP, unsigned long long, ulonglong);
-  TEST_SHMEM_CSWAP(CSWAP, int32_t, int32);
-  TEST_SHMEM_CSWAP(CSWAP, int64_t, int64);
-  TEST_SHMEM_CSWAP(CSWAP, uint32_t, uint32);
-  TEST_SHMEM_CSWAP(CSWAP, uint64_t, uint64);
-  TEST_SHMEM_CSWAP(CSWAP, size_t, size);
-  TEST_SHMEM_CSWAP(CSWAP, ptrdiff_t, ptrdiff);
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, int, int);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, long, long);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, long long, longlong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, unsigned int, uint);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, unsigned long, ulong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, unsigned long long, ulonglong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, int32_t, int32);
-  TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, int64_t, int64);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, uint32_t, uint32);
-  TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, uint64_t, uint64);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, size_t, size);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, int, int);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, long, long);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, long long, longlong);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, unsigned int, uint);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, unsigned long, ulong);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, unsigned long long, ulonglong);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, int32_t, int32);
-  TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, int64_t, int64);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, uint32_t, uint32);
-  TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, uint64_t, uint64);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, size_t, size);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, int, int);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, long, long);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, long long, longlong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, unsigned int, uint);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, unsigned long, ulong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, unsigned long long, ulonglong);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, int32_t, int32);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, int64_t, int64);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, uint32_t, uint32);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, uint64_t, uint64);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, size_t, size);
-  // TEST_SHMEM_CSWAP(ATOMIC_COMPARE_SWAP_NBI, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, int, int);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, long, long);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, long long, longlong);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, unsigned int, uint);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, unsigned long, ulong);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, unsigned long long,
-  // ulonglong); TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, int32_t, int32);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, int64_t, int64);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, uint32_t, uint32);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, uint64_t, uint64);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, size_t, size);
-  // TEST_SHMEM_CSWAP(CTX_ATOMIC_COMPARE_SWAP_NBI, ptrdiff_t, ptrdiff);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_fetch.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_fetch.cpp
deleted file mode 100644
index 77082761dc..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_fetch.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-enum op {
-  FETCH = 0,
-  ATOMIC_FETCH,
-  CTX_ATOMIC_FETCH,
-  ATOMIC_FETCH_NBI,
-  CTX_ATOMIC_FETCH_NBI
-};
-
-#ifdef ENABLE_DEPRECATED_TESTS
-#define DEPRECATED_FETCH(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_fetch(__VA_ARGS__)
-#else
-#define DEPRECATED_FETCH(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_fetch(__VA_ARGS__)
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-#define SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)                               \
-  case ATOMIC_FETCH_NBI:                                                      \
-    rocshmem_##TYPENAME##_atomic_fetch_nbi(&val, remote, (mype + 1) % npes);  \
-    rocshmem_quiet();                                                         \
-    break;                                                                    \
-  case CTX_ATOMIC_FETCH_NBI:                                                  \
-    rocshmem_ctx_##TYPENAME##_atomic_fetch_nbi(ROCSHMEM_CTX_DEFAULT, &val,    \
-                                                remote, (mype + 1) % npes);   \
-    rocshmem_quiet();                                                         \
-    break;
-
-#define TEST_SHMEM_FETCH(OP, TYPE, TYPENAME)                                  \
-  do {                                                                        \
-    TYPE *remote;                                                             \
-    TYPE val;                                                                 \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = (TYPE)mype;                                                     \
-    rocshmem_barrier_all();                                                   \
-    switch (OP) {                                                             \
-      case FETCH:                                                             \
-        val = DEPRECATED_FETCH(TYPENAME, remote, (mype + 1) % npes);          \
-        break;                                                                \
-      case ATOMIC_FETCH:                                                      \
-        val = rocshmem_##TYPENAME##_atomic_fetch(remote, (mype + 1) % npes);  \
-        break;                                                                \
-      case CTX_ATOMIC_FETCH:                                                  \
-        val = rocshmem_ctx_##TYPENAME##_atomic_fetch(                         \
-            ROCSHMEM_CTX_DEFAULT, remote, (mype + 1) % npes);                 \
-        break;                                                                \
-      /* SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME) */                           \
-      default:                                                                \
-        printf("Invalid operation (%d)\n", OP);                               \
-        rocshmem_global_exit(1);                                              \
-    }                                                                         \
-    if (val != (TYPE)((mype + 1) % npes)) {                                   \
-      printf(                                                                 \
-          "PE %i received incorrect value with "                              \
-          "TEST_SHMEM_FETCH(%s, %s)\n",                                       \
-          mype, #OP, #TYPE);                                                  \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-    if (rc == EXIT_FAILURE) rocshmem_global_exit(1);                          \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-
-#ifdef ENABLE_DEPRECATED_TESTS
-  TEST_SHMEM_FETCH(FETCH, float, float);
-  TEST_SHMEM_FETCH(FETCH, double, double);
-  TEST_SHMEM_FETCH(FETCH, int, int);
-  TEST_SHMEM_FETCH(FETCH, long, long);
-  TEST_SHMEM_FETCH(FETCH, long long, longlong);
-  TEST_SHMEM_FETCH(FETCH, unsigned int, uint);
-  TEST_SHMEM_FETCH(FETCH, unsigned long, ulong);
-  TEST_SHMEM_FETCH(FETCH, unsigned long long, ulonglong);
-  TEST_SHMEM_FETCH(FETCH, int32_t, int32);
-  TEST_SHMEM_FETCH(FETCH, int64_t, int64);
-  TEST_SHMEM_FETCH(FETCH, uint32_t, uint32);
-  TEST_SHMEM_FETCH(FETCH, uint64_t, uint64);
-  TEST_SHMEM_FETCH(FETCH, size_t, size);
-  TEST_SHMEM_FETCH(FETCH, ptrdiff_t, ptrdiff);
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, float, float);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, double, double);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, int, int);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, long, long);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, long long, longlong);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, unsigned int, uint);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, unsigned long, ulong);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, unsigned long long, ulonglong);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, int32_t, int32);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH, int64_t, int64);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, uint32_t, uint32);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH, uint64_t, uint64);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, size_t, size);
-  // TEST_SHMEM_FETCH(ATOMIC_FETCH, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, float, float);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, double, double);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, int, int);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, long, long);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, long long, longlong);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, unsigned int, uint);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, unsigned long, ulong);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, unsigned long long, ulonglong);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, int32_t, int32);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, int64_t, int64);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, uint32_t, uint32);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, uint64_t, uint64);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, size_t, size);
-  // TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH, ptrdiff_t, ptrdiff);
-
-  /*
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, float, float);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, double, double);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, int, int);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, long, long);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, long long, longlong);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, unsigned int, uint);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, unsigned long, ulong);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, int32_t, int32);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, int64_t, int64);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, uint32_t, uint32);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, uint64_t, uint64);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, size_t, size);
-  TEST_SHMEM_FETCH(ATOMIC_FETCH_NBI, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, float, float);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, double, double);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, int, int);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, long, long);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, long long, longlong);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, unsigned int, uint);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, unsigned long, ulong);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, int32_t, int32);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, int64_t, int64);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, uint32_t, uint32);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, uint64_t, uint64);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, size_t, size);
-  TEST_SHMEM_FETCH(CTX_ATOMIC_FETCH_NBI, ptrdiff_t, ptrdiff);
-  */
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_inc.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_inc.cpp
deleted file mode 100644
index b8c5174a84..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_atomic_inc.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-enum op {
-  INC = 0,
-  ATOMIC_INC,
-  CTX_ATOMIC_INC,
-  FINC,
-  ATOMIC_FETCH_INC,
-  CTX_ATOMIC_FETCH_INC,
-  ATOMIC_FETCH_INC_NBI,
-  CTX_ATOMIC_FETCH_INC_NBI
-};
-
-#ifdef ENABLE_DEPRECATED_TESTS
-#define DEPRECATED_INC(TYPENAME, ...) rocshmem_##TYPENAME##_inc(__VA_ARGS__)
-#define DEPRECATED_FINC(TYPENAME, ...) rocshmem_##TYPENAME##_finc(__VA_ARGS__)
-#else
-#define DEPRECATED_INC(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_inc(__VA_ARGS__)
-#define DEPRECATED_FINC(TYPENAME, ...) \
-  rocshmem_##TYPENAME##_atomic_fetch_inc(__VA_ARGS__)
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-#define SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)                               \
-  case ATOMIC_FETCH_INC_NBI:                                                  \
-    rocshmem_##TYPENAME##_atomic_fetch_inc_nbi(&old, remote, i);              \
-    rocshmem_quiet();                                                         \
-    if (old > (TYPE)npes) {                                                   \
-      printf("PE %i error inconsistent value of old (%s, %s)\n", mype, #OP,   \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    break;                                                                    \
-  case CTX_ATOMIC_FETCH_INC_NBI:                                              \
-    rocshmem_ctx_##TYPENAME##_atomic_fetch_inc_nbi(ROCSHMEM_CTX_DEFAULT,      \
-                                                    &old, remote, i);         \
-    rocshmem_quiet();                                                         \
-    if (old > (TYPE)npes) {                                                   \
-      printf("PE %i error inconsistent value of old (%s, %s)\n", mype, #OP,   \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    break;
-
-#define TEST_SHMEM_INC(OP, TYPE, TYPENAME)                                    \
-  do {                                                                        \
-    TYPE *remote;                                                             \
-    TYPE old;                                                                 \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = (TYPE)0;                                                        \
-    rocshmem_barrier_all();                                                   \
-    for (int i = 0; i < npes; i++) switch (OP) {                              \
-        case INC:                                                             \
-          DEPRECATED_INC(TYPENAME, remote, i);                                \
-          break;                                                              \
-        case ATOMIC_INC:                                                      \
-          rocshmem_##TYPENAME##_atomic_inc(remote, i);                        \
-          break;                                                              \
-        case CTX_ATOMIC_INC:                                                  \
-          rocshmem_ctx_##TYPENAME##_atomic_inc(ROCSHMEM_CTX_DEFAULT, remote,  \
-                                                i);                           \
-          break;                                                              \
-        case FINC:                                                            \
-          old = DEPRECATED_FINC(TYPENAME, remote, i);                         \
-          if (old > (TYPE)npes) {                                             \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        case ATOMIC_FETCH_INC:                                                \
-          old = rocshmem_##TYPENAME##_atomic_fetch_inc(remote, i);            \
-          if (old > (TYPE)npes) {                                             \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        case CTX_ATOMIC_FETCH_INC:                                            \
-          old = rocshmem_ctx_##TYPENAME##_atomic_fetch_inc(                   \
-              ROCSHMEM_CTX_DEFAULT, remote, i);                               \
-          if (old > (TYPE)npes) {                                             \
-            printf("PE %i error inconsistent value of old (%s, %s)\n", mype,  \
-                   #OP, #TYPE);                                               \
-            rc = EXIT_FAILURE;                                                \
-          }                                                                   \
-          break;                                                              \
-        /*SHMEM_NBI_OPS_CASES(OP, TYPE, TYPENAME)*/                           \
-        default:                                                              \
-          printf("Invalid operation (%d)\n", OP);                             \
-          rocshmem_global_exit(1);                                            \
-      }                                                                       \
-    rocshmem_barrier_all();                                                   \
-    if ((*remote) != (TYPE)npes) {                                            \
-      printf("PE %i observed error with TEST_SHMEM_INC(%s, %s)\n", mype, #OP, \
-             #TYPE);                                                          \
-      rc = EXIT_FAILURE;                                                      \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-    if (rc == EXIT_FAILURE) rocshmem_global_exit(1);                          \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-
-#ifdef ENABLE_DEPRECATED_TESTS
-  TEST_SHMEM_INC(INC, int, int);
-  TEST_SHMEM_INC(INC, long, long);
-  TEST_SHMEM_INC(INC, long long, longlong);
-  TEST_SHMEM_INC(INC, unsigned int, uint);
-  TEST_SHMEM_INC(INC, unsigned long, ulong);
-  TEST_SHMEM_INC(INC, unsigned long long, ulonglong);
-  TEST_SHMEM_INC(INC, int32_t, int32);
-  TEST_SHMEM_INC(INC, int64_t, int64);
-  TEST_SHMEM_INC(INC, uint32_t, uint32);
-  TEST_SHMEM_INC(INC, uint64_t, uint64);
-  TEST_SHMEM_INC(INC, size_t, size);
-  TEST_SHMEM_INC(INC, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_INC(FINC, int, int);
-  TEST_SHMEM_INC(FINC, long, long);
-  TEST_SHMEM_INC(FINC, long long, longlong);
-  TEST_SHMEM_INC(FINC, unsigned int, uint);
-  TEST_SHMEM_INC(FINC, unsigned long, ulong);
-  TEST_SHMEM_INC(FINC, unsigned long long, ulonglong);
-  TEST_SHMEM_INC(FINC, int32_t, int32);
-  TEST_SHMEM_INC(FINC, int64_t, int64);
-  TEST_SHMEM_INC(FINC, uint32_t, uint32);
-  TEST_SHMEM_INC(FINC, uint64_t, uint64);
-  TEST_SHMEM_INC(FINC, size_t, size);
-  TEST_SHMEM_INC(FINC, ptrdiff_t, ptrdiff);
-#endif /* ENABLE_DEPRECATED_TESTS */
-
-  // TEST_SHMEM_INC(ATOMIC_INC, int, int);
-  // TEST_SHMEM_INC(ATOMIC_INC, long, long);
-  // TEST_SHMEM_INC(ATOMIC_INC, long long, longlong);
-  // TEST_SHMEM_INC(ATOMIC_INC, unsigned int, uint);
-  // TEST_SHMEM_INC(ATOMIC_INC, unsigned long, ulong);
-  // TEST_SHMEM_INC(ATOMIC_INC, unsigned long long, ulonglong);
-  // TEST_SHMEM_INC(ATOMIC_INC, int32_t, int32);
-  TEST_SHMEM_INC(ATOMIC_INC, int64_t, int64);
-  // TEST_SHMEM_INC(ATOMIC_INC, uint32_t, uint32);
-  TEST_SHMEM_INC(ATOMIC_INC, uint64_t, uint64);
-  // TEST_SHMEM_INC(ATOMIC_INC, size_t, size);
-  // TEST_SHMEM_INC(ATOMIC_INC, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, int, int);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, long, long);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, long long, longlong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, unsigned int, uint);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, unsigned long, ulong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, unsigned long long, ulonglong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, int32_t, int32);
-  TEST_SHMEM_INC(CTX_ATOMIC_INC, int64_t, int64);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, uint32_t, uint32);
-  TEST_SHMEM_INC(CTX_ATOMIC_INC, uint64_t, uint64);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, size_t, size);
-  // TEST_SHMEM_INC(CTX_ATOMIC_INC, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, int, int);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, long, long);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, long long, longlong);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, unsigned int, uint);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, unsigned long, ulong);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, unsigned long long, ulonglong);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, int32_t, int32);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC, int64_t, int64);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, uint32_t, uint32);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC, uint64_t, uint64);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, size_t, size);
-  // TEST_SHMEM_INC(ATOMIC_FETCH_INC, ptrdiff_t, ptrdiff);
-
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, int, int);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, long, long);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, long long, longlong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, unsigned int, uint);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, unsigned long, ulong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, unsigned long long, ulonglong);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, int32_t, int32);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, int64_t, int64);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, uint32_t, uint32);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, uint64_t, uint64);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, size_t, size);
-  // TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC, ptrdiff_t, ptrdiff);
-
-  /*
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, int, int);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, long, long);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, long long, longlong);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, unsigned int, uint);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, unsigned long, ulong);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, int32_t, int32);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, int64_t, int64);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, uint32_t, uint32);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, uint64_t, uint64);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, size_t, size);
-  TEST_SHMEM_INC(ATOMIC_FETCH_INC_NBI, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, int, int);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, long, long);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, long long, longlong);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, unsigned int, uint);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, unsigned long, ulong);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, unsigned long long, ulonglong);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, int32_t, int32);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, int64_t, int64);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, uint32_t, uint32);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, uint64_t, uint64);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, size_t, size);
-  TEST_SHMEM_INC(CTX_ATOMIC_FETCH_INC_NBI, ptrdiff_t, ptrdiff);
-  */
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_g.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_g.cpp
deleted file mode 100644
index a7dc2ac0ba..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_g.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define TEST_SHMEM_G(USE_CTX, TYPE, TYPENAME)                                 \
-  do {                                                                        \
-    TYPE* remote;                                                             \
-    remote = (TYPE*)rocshmem_malloc(sizeof(TYPE));                            \
-    TYPE val;                                                                 \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    *remote = (TYPE)mype;                                                     \
-    rocshmem_barrier_all();                                                   \
-    if (USE_CTX)                                                              \
-      val = rocshmem_ctx_##TYPENAME##_g(ROCSHMEM_CTX_DEFAULT, remote,         \
-                                         (mype + 1) % npes);                  \
-    else                                                                      \
-      val = rocshmem_##TYPENAME##_g(remote, (mype + 1) % npes);               \
-    if (val != (TYPE)((mype + 1) % npes)) {                                   \
-      printf(                                                                 \
-          "PE %i received incorrect value with"                               \
-          "TEST_SHMEM_G(%d, %s)\n",                                           \
-          mype, (int)(USE_CTX), #TYPE);                                       \
-      rc = EXIT_FAILURE;                                                      \
-      rocshmem_global_exit(1);                                                \
-    }                                                                         \
-  } while (false)
-
-int main(int argc, char* argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-  TEST_SHMEM_G(0, float, float);
-  TEST_SHMEM_G(0, double, double);
-  // TEST_SHMEM_G(0, long double, longdouble);
-  TEST_SHMEM_G(0, char, char);
-  TEST_SHMEM_G(0, signed char, schar);
-  TEST_SHMEM_G(0, short, short);
-  TEST_SHMEM_G(0, int, int);
-  TEST_SHMEM_G(0, long, long);
-  TEST_SHMEM_G(0, long long, longlong);
-  TEST_SHMEM_G(0, unsigned char, uchar);
-  TEST_SHMEM_G(0, unsigned short, ushort);
-  TEST_SHMEM_G(0, unsigned int, uint);
-  TEST_SHMEM_G(0, unsigned long, ulong);
-  TEST_SHMEM_G(0, unsigned long long, ulonglong);
-  // TEST_SHMEM_G(0, int8_t, int8);
-  // TEST_SHMEM_G(0, int16_t, int16);
-  // TEST_SHMEM_G(0, int32_t, int32);
-  // TEST_SHMEM_G(0, int64_t, int64);
-  // TEST_SHMEM_G(0, uint8_t, uint8);
-  // TEST_SHMEM_G(0, uint16_t, uint16);
-  // TEST_SHMEM_G(0, uint32_t, uint32);
-  // TEST_SHMEM_G(0, uint64_t, uint64);
-  // TEST_SHMEM_G(0, size_t, size);
-  // TEST_SHMEM_G(0, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_G(1, float, float);
-  TEST_SHMEM_G(1, double, double);
-  // TEST_SHMEM_G(1, long double, longdouble);
-  TEST_SHMEM_G(1, char, char);
-  TEST_SHMEM_G(1, signed char, schar);
-  TEST_SHMEM_G(1, short, short);
-  TEST_SHMEM_G(1, int, int);
-  TEST_SHMEM_G(1, long, long);
-  TEST_SHMEM_G(1, long long, longlong);
-  TEST_SHMEM_G(1, unsigned char, uchar);
-  TEST_SHMEM_G(1, unsigned short, ushort);
-  TEST_SHMEM_G(1, unsigned int, uint);
-  TEST_SHMEM_G(1, unsigned long, ulong);
-  TEST_SHMEM_G(1, unsigned long long, ulonglong);
-  // TEST_SHMEM_G(1, int8_t, int8);
-  // TEST_SHMEM_G(1, int16_t, int16);
-  // TEST_SHMEM_G(1, int32_t, int32);
-  // TEST_SHMEM_G(1, int64_t, int64);
-  // TEST_SHMEM_G(1, uint8_t, uint8);
-  // TEST_SHMEM_G(1, uint16_t, uint16);
-  // TEST_SHMEM_G(1, uint32_t, uint32);
-  // TEST_SHMEM_G(1, uint64_t, uint64);
-  // TEST_SHMEM_G(1, size_t, size);
-  // TEST_SHMEM_G(1, ptrdiff_t, ptrdiff);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_p.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_p.cpp
deleted file mode 100644
index 9dc25b7005..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_p.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define TEST_SHMEM_P(USE_CTX, TYPE, TYPENAME)                                 \
-  do {                                                                        \
-    TYPE* remote;                                                             \
-    remote = (TYPE*)rocshmem_malloc(sizeof(TYPE));                            \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    if (USE_CTX)                                                              \
-      rocshmem_ctx_##TYPENAME##_p(ROCSHMEM_CTX_DEFAULT, remote, (TYPE)mype,   \
-                                   (mype + 1) % npes);                        \
-    else                                                                      \
-      rocshmem_##TYPENAME##_p(remote, (TYPE)mype, (mype + 1) % npes);         \
-    rocshmem_barrier_all();                                                   \
-    if ((*remote) != (TYPE)((mype + npes - 1) % npes)) {                      \
-      printf(                                                                 \
-          "PE %i received incorrect value with "                              \
-          "TEST_SHMEM_P(%d, %s)\n",                                           \
-          mype, (int)(USE_CTX), #TYPE);                                       \
-      rc = EXIT_FAILURE;                                                      \
-      rocshmem_global_exit(1);                                                \
-    }                                                                         \
-  } while (false)
-
-int main(int argc, char* argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-  TEST_SHMEM_P(0, float, float);
-  TEST_SHMEM_P(0, double, double);
-  // TEST_SHMEM_P(0, long double, longdouble);
-  TEST_SHMEM_P(0, char, char);
-  TEST_SHMEM_P(0, signed char, schar);
-  TEST_SHMEM_P(0, short, short);
-  TEST_SHMEM_P(0, int, int);
-  TEST_SHMEM_P(0, long, long);
-  TEST_SHMEM_P(0, long long, longlong);
-  TEST_SHMEM_P(0, unsigned char, uchar);
-  TEST_SHMEM_P(0, unsigned short, ushort);
-  TEST_SHMEM_P(0, unsigned int, uint);
-  TEST_SHMEM_P(0, unsigned long, ulong);
-  TEST_SHMEM_P(0, unsigned long long, ulonglong);
-  // TEST_SHMEM_P(0, int8_t, int8);
-  // TEST_SHMEM_P(0, int16_t, int16);
-  // TEST_SHMEM_P(0, int32_t, int32);
-  // TEST_SHMEM_P(0, int64_t, int64);
-  // TEST_SHMEM_P(0, uint8_t, uint8);
-  // TEST_SHMEM_P(0, uint16_t, uint16);
-  // TEST_SHMEM_P(0, uint32_t, uint32);
-  // TEST_SHMEM_P(0, uint64_t, uint64);
-  // TEST_SHMEM_P(0, size_t, size);
-  // TEST_SHMEM_P(0, ptrdiff_t, ptrdiff);
-
-  TEST_SHMEM_P(1, float, float);
-  TEST_SHMEM_P(1, double, double);
-  // TEST_SHMEM_P(1, long double, longdouble);
-  TEST_SHMEM_P(1, char, char);
-  TEST_SHMEM_P(1, signed char, schar);
-  TEST_SHMEM_P(1, short, short);
-  TEST_SHMEM_P(1, int, int);
-  TEST_SHMEM_P(1, long, long);
-  TEST_SHMEM_P(1, long long, longlong);
-  TEST_SHMEM_P(1, unsigned char, uchar);
-  TEST_SHMEM_P(1, unsigned short, ushort);
-  TEST_SHMEM_P(1, unsigned int, uint);
-  TEST_SHMEM_P(1, unsigned long, ulong);
-  TEST_SHMEM_P(1, unsigned long long, ulonglong);
-  // TEST_SHMEM_P(1, int8_t, int8);
-  // TEST_SHMEM_P(1, int16_t, int16);
-  // TEST_SHMEM_P(1, int32_t, int32);
-  // TEST_SHMEM_P(1, int64_t, int64);
-  // TEST_SHMEM_P(1, uint8_t, uint8);
-  // TEST_SHMEM_P(1, uint16_t, uint16);
-  // TEST_SHMEM_P(1, uint32_t, uint32);
-  // TEST_SHMEM_P(1, uint64_t, uint64);
-  // TEST_SHMEM_P(1, size_t, size);
-  // TEST_SHMEM_P(1, ptrdiff_t, ptrdiff);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_test.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_test.cpp
deleted file mode 100644
index 299847c7f0..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_test.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define TEST_SHMEM_TEST(TYPE, TYPENAME)                                       \
-  do {                                                                        \
-    TYPE *remote;                                                             \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = 0;                                                              \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    rocshmem_##TYPENAME##_p(remote, (TYPE)mype + 1, (mype + 1) % npes);       \
-    while (!rocshmem_##TYPENAME##_test(remote, ROCSHMEM_CMP_NE, 0))           \
-      ;                                                                       \
-    if ((*remote) != (TYPE)((mype + npes - 1) % npes) + 1) {                  \
-      printf(                                                                 \
-          "PE %i received incorrect value with "                              \
-          "TEST_SHMEM_TEST(%s)\n",                                            \
-          mype, #TYPE);                                                       \
-      rc = EXIT_FAILURE;                                                      \
-      rocshmem_global_exit(1);                                                \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-  TEST_SHMEM_TEST(short, short);
-  TEST_SHMEM_TEST(int, int);
-  TEST_SHMEM_TEST(long, long);
-  TEST_SHMEM_TEST(long long, longlong);
-  TEST_SHMEM_TEST(unsigned short, ushort);
-  TEST_SHMEM_TEST(unsigned int, uint);
-  TEST_SHMEM_TEST(unsigned long, ulong);
-  TEST_SHMEM_TEST(unsigned long long, ulonglong);
-  // TEST_SHMEM_TEST(int32_t, int32);
-  // TEST_SHMEM_TEST(int64_t, int64);
-  // TEST_SHMEM_TEST(uint32_t, uint32);
-  // TEST_SHMEM_TEST(uint64_t, uint64);
-  // TEST_SHMEM_TEST(size_t, size);
-  // TEST_SHMEM_TEST(ptrdiff_t, ptrdiff);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_wait_until.cpp b/projects/rocshmem/tests/sos_tests/cxx_test_shmem_wait_until.cpp
deleted file mode 100644
index 4dfa985bd9..0000000000
--- a/projects/rocshmem/tests/sos_tests/cxx_test_shmem_wait_until.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define TEST_SHMEM_WAIT_UNTIL(TYPE, TYPENAME)                                 \
-  do {                                                                        \
-    TYPE *remote = 0;                                                         \
-    remote = (TYPE *)rocshmem_malloc(sizeof(TYPE));                           \
-    *remote = 0;                                                              \
-    const int mype = rocshmem_my_pe();                                        \
-    const int npes = rocshmem_n_pes();                                        \
-    rocshmem_##TYPENAME##_p(remote, (TYPE)mype + 1, (mype + 1) % npes);       \
-    rocshmem_##TYPENAME##_wait_until(remote, ROCSHMEM_CMP_NE, 0);             \
-    if ((*remote) != (TYPE)((mype + npes - 1) % npes) + 1) {                  \
-      printf(                                                                 \
-          "PE %i received incorrect value with "                              \
-          "TEST_SHMEM_WAIT_UNTIL(%s)\n",                                      \
-          mype, #TYPE);                                                       \
-      rc = EXIT_FAILURE;                                                      \
-      rocshmem_global_exit(1);                                                \
-    }                                                                         \
-    rocshmem_free(remote);                                                    \
-  } while (false)
-
-int main(int argc, char *argv[]) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-  TEST_SHMEM_WAIT_UNTIL(short, short);
-  TEST_SHMEM_WAIT_UNTIL(int, int);
-  TEST_SHMEM_WAIT_UNTIL(long, long);
-  TEST_SHMEM_WAIT_UNTIL(long long, longlong);
-  TEST_SHMEM_WAIT_UNTIL(unsigned short, ushort);
-  TEST_SHMEM_WAIT_UNTIL(unsigned int, uint);
-  TEST_SHMEM_WAIT_UNTIL(unsigned long, ulong);
-  TEST_SHMEM_WAIT_UNTIL(unsigned long long, ulonglong);
-  // TEST_SHMEM_WAIT_UNTIL(int32_t, int32);
-  // TEST_SHMEM_WAIT_UNTIL(int64_t, int64);
-  // TEST_SHMEM_WAIT_UNTIL(uint32_t, uint32);
-  // TEST_SHMEM_WAIT_UNTIL(uint64_t, uint64);
-  // TEST_SHMEM_WAIT_UNTIL(size_t, size);
-  // TEST_SHMEM_WAIT_UNTIL(ptrdiff_t, ptrdiff);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/get1.cpp b/projects/rocshmem/tests/sos_tests/get1.cpp
deleted file mode 100644
index 951144ee27..0000000000
--- a/projects/rocshmem/tests/sos_tests/get1.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-static long target[10];
-
-int main(int argc, char *argv[]) {
-  int i;
-  long *source;
-
-  rocshmem_init();
-
-  if (rocshmem_n_pes() == 1) {
-    printf("%s: Requires number of PEs > 1\n", argv[0]);
-    rocshmem_finalize();
-    return 0;
-  }
-
-  source = (long *)rocshmem_malloc(10 * sizeof(long));
-  for (i = 0; i < 10; i++) {
-    source[i] = i + 1;
-  }
-
-  rocshmem_barrier_all(); /* sync sender and receiver */
-
-  if (rocshmem_my_pe() == 0) {
-    memset(target, 0, sizeof(target));
-    /* put 10 elements into target on PE 1 */
-    rocshmem_long_get(target, source, 10, 1);
-  }
-
-  rocshmem_barrier_all(); /* sync sender and receiver */
-
-  if (rocshmem_my_pe() == 0) {
-    if (0 != memcmp(source, target, sizeof(long) * 10)) {
-      fprintf(stderr, "[%d] Src & Target mismatch?\n", rocshmem_my_pe());
-      for (i = 0; i < 10; ++i) {
-        printf("%ld,%ld ", source[i], target[i]);
-      }
-      printf("\n");
-      rocshmem_global_exit(1);
-    }
-  }
-
-  rocshmem_free(source);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/get_nbi.cpp b/projects/rocshmem/tests/sos_tests/get_nbi.cpp
deleted file mode 100644
index 0455b4ea32..0000000000
--- a/projects/rocshmem/tests/sos_tests/get_nbi.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Non-Blocking Get Test
- * Tom St. John <tom.st.john@intel.com>
- * January, 2016
- *
- * PE 0 uses a non-blocking get to copy an array from
- * every remote PE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-static long target[10];
-
-int main(int argc, char *argv[]) {
-  int i, j, num_pes;
-  int failed = 0;
-  long *source;
-
-  rocshmem_init();
-
-  source = (long *)rocshmem_malloc(10 * sizeof(long));
-  for (i = 0; i < 10; i++) {
-    source[i] = i + 1;
-  }
-
-  rocshmem_barrier_all();
-
-  if (rocshmem_my_pe() == 0) {
-    num_pes = rocshmem_n_pes();
-
-    for (j = 0; j < num_pes; j++) {
-      memset(target, 0, sizeof(long) * 10);
-      rocshmem_long_get_nbi(target, source, 10, j);
-      rocshmem_quiet();
-
-      for (i = 0; i < 10; i++) {
-        if (source[i] != target[i]) {
-          fprintf(stderr,
-                  "[%d] get_nbi from PE %d: target[%d] = %ld, expected %ld\n",
-                  rocshmem_my_pe(), j, i, target[i], source[i]);
-          failed = 1;
-        }
-      }
-
-      if (failed) rocshmem_global_exit(1);
-    }
-  }
-
-  rocshmem_free(source);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/global_exit.cpp b/projects/rocshmem/tests/sos_tests/global_exit.cpp
deleted file mode 100644
index 440bfb65f6..0000000000
--- a/projects/rocshmem/tests/sos_tests/global_exit.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char* argv[]) {
-  rocshmem_init();
-
-  if (rocshmem_my_pe() == 0) {
-    rocshmem_global_exit(0);
-    abort();
-  }
-
-  /* All other PEs wait in this barrier */
-  rocshmem_barrier_all();
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/hello.cpp b/projects/rocshmem/tests/sos_tests/hello.cpp
deleted file mode 100644
index 9dc4fc6a39..0000000000
--- a/projects/rocshmem/tests/sos_tests/hello.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char* argv[], char* envp[]) {
-  int me, myshmem_n_pes;
-  /*
-  ** Starts/Initializes SHMEM/OpenSHMEM
-  */
-  rocshmem_init();
-  /*
-  ** Fetch the number or processes
-  ** Some implementations use num_pes();
-  */
-  myshmem_n_pes = rocshmem_n_pes();
-  /*
-  ** Assign my process ID to me
-  */
-  me = rocshmem_my_pe();
-
-  if (NULL == getenv("MAKELEVEL")) {
-    printf("Hello World from %d of %d\n", me, myshmem_n_pes);
-  }
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/lfinc.cpp b/projects/rocshmem/tests/sos_tests/lfinc.cpp
deleted file mode 100644
index d79bfb2cac..0000000000
--- a/projects/rocshmem/tests/sos_tests/lfinc.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* long_finc neighbor - Perf test rocshmem_atomic_fetch_inc(); */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define LOOPS 25000
-
-static double shmem_wtime(void) {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
-}
-
-int Verbose;
-double elapsed;
-
-int main(int argc, char *argv[]) {
-  int rc = 0, my_pe, npes, neighbor;
-  int loops = LOOPS;
-  int j;
-  size_t data_sz = sizeof(long) * 3;
-  double start_time;
-  long *data, lval = 0;
-
-  if (argc > 1) loops = atoi(argv[1]);
-
-  rocshmem_init();
-
-  my_pe = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if (loops <= 0) {
-    if (my_pe == 0) printf("Error: loops must be greater than 0\n");
-
-    rocshmem_finalize();
-    return 1;
-  }
-
-  data = (long *)rocshmem_malloc(data_sz);
-  if (!data) {
-    fprintf(stderr, "[%d] rocshmem_malloc(%ld) failure? %d\n", my_pe, data_sz,
-            errno);
-    rocshmem_global_exit(1);
-  }
-  memset((void *)data, 0, data_sz);
-
-  rocshmem_barrier_all();
-
-  neighbor = (my_pe + 1) % npes;
-  start_time = shmem_wtime();
-  for (j = 0, elapsed = 0.0; j < loops; j++) {
-    start_time = shmem_wtime();
-    lval = rocshmem_int64_atomic_fetch_inc((int64_t *)&data[1], neighbor);
-    elapsed += shmem_wtime() - start_time;
-    if (lval != (long)j) {
-      fprintf(stderr, "[%d] Test: FAIL previous val %ld != %d Exit.\n", my_pe,
-              lval, j);
-      rocshmem_global_exit(1);
-    }
-  }
-  rocshmem_barrier_all();
-
-  rc = 0;
-  if (data[1] != (long)loops) {
-    fprintf(stderr, "[%d] finc neighbot: FAIL data[1](%p) %ld != %d Exit.\n",
-            my_pe, (void *)&data[1], data[1], loops);
-    rc--;
-  }
-
-  /* check if adjancent memory locations distrubed */
-  assert(data[0] == 0);
-  assert(data[2] == 0);
-
-  if (my_pe == 0) {
-    if (rc == 0 && Verbose)
-      fprintf(stderr, "[%d] finc neighbor: PASSED.\n", my_pe);
-    fprintf(
-        stderr,
-        "[%d] %d loops of rocshmem_int64_atomic_fetch_inc() in %6.4f secs\n"
-        "  %2.6f usecs per rocshmem_int64_atomic_fetch_inc()\n",
-        my_pe, loops, elapsed, ((elapsed * 100000.0) / (double)loops));
-  }
-  rocshmem_free(data);
-
-  rocshmem_finalize();
-
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/many-ctx.cpp b/projects/rocshmem/tests/sos_tests/many-ctx.cpp
deleted file mode 100644
index c71f6013e6..0000000000
--- a/projects/rocshmem/tests/sos_tests/many-ctx.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-#define NUM_CTX 32
-
-using namespace rocshmem;
-
-int main(int argc, char **argv) {
-  int me, npes, i;
-  int errors = 0;
-  rocshmem_ctx_t ctx[NUM_CTX];
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  int64_t *data = (int64_t *)rocshmem_malloc(sizeof(int64_t));
-
-  /* Initialize the counter */
-  memset(data, 0, sizeof(int64_t));
-  rocshmem_barrier_all();
-
-  for (i = 0; i < NUM_CTX; i++) {
-    int err = rocshmem_ctx_create(0, &ctx[i]);
-
-    if (err) {
-      printf("%d: Warning, could not create context %d (%d)\n", me, i, err);
-      ctx[i] = ROCSHMEM_CTX_DEFAULT;
-    }
-  }
-
-  for (i = 0; i < NUM_CTX; i++)
-    rocshmem_ctx_int64_atomic_inc(ctx[i], data, (me + 1) % npes);
-
-  for (i = 0; i < NUM_CTX; i++) rocshmem_ctx_quiet(ctx[i]);
-
-  rocshmem_sync_all();
-
-  if ((*data) != NUM_CTX) {
-    printf("%d: error expected %d, got %ld\n", me, NUM_CTX, (*data));
-    ++errors;
-  }
-
-  rocshmem_free(data);
-
-  rocshmem_finalize();
-  return errors;
-}
diff --git a/projects/rocshmem/tests/sos_tests/max_reduction.cpp b/projects/rocshmem/tests/sos_tests/max_reduction.cpp
deleted file mode 100644
index 24897b0af0..0000000000
--- a/projects/rocshmem/tests/sos_tests/max_reduction.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * reduce [0...num_pes]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define N 3
-
-#define MAX(a, b) ((a) > (b)) ? (a) : (b)
-#define WRK_SIZE MAX(N / 2 + 1, ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE)
-
-int main(int argc, char *argv[]) {
-  int i, Verbose = 0;
-  char *pgm;
-  long *pSync, *pWrk;
-  long *src, *dst;
-
-  if ((pgm = strrchr(argv[0], '/'))) {
-    pgm++;
-  } else {
-    pgm = argv[0];
-  }
-
-  if (argc > 1) {
-    if (strncmp(argv[1], "-v", 3) == 0) {
-      Verbose = 1;
-    } else if (strncmp(argv[1], "-h", 3) == 0) {
-      fprintf(stderr, "usage: %s {v(verbose)|h(help)}\n", pgm);
-      rocshmem_finalize();
-      exit(1);
-    }
-  }
-
-  rocshmem_init();
-
-  src = (long *)rocshmem_malloc(N * sizeof(long));
-  for (i = 0; i < N; i += 1) {
-    src[i] = rocshmem_my_pe() + i;
-  }
-
-  dst = (long *)rocshmem_malloc(N * sizeof(long));
-
-  pSync = (long *)rocshmem_malloc(ROCSHMEM_REDUCE_SYNC_SIZE * sizeof(long));
-  for (i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i += 1) {
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  pWrk = (long *)rocshmem_malloc(WRK_SIZE * sizeof(long));
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_long_max_to_all(ROCSHMEM_CTX_DEFAULT, dst, src, N, 0, 0,
-                                rocshmem_n_pes(), pWrk, pSync);
-
-  if (Verbose) {
-    printf("%d/%d\tdst =", rocshmem_my_pe(), rocshmem_n_pes());
-    for (i = 0; i < N; i += 1) {
-      printf(" %ld", dst[i]);
-    }
-    printf("\n");
-  }
-
-  for (i = 0; i < N; i += 1) {
-    if (dst[i] != rocshmem_n_pes() - 1 + i) {
-      printf("[%3d] Error: dst[%d] == %ld, expected %ld\n", rocshmem_my_pe(),
-             i, dst[i], rocshmem_n_pes() - 1 + (long)i);
-      rocshmem_global_exit(1);
-    }
-  }
-
-  rocshmem_free(dst);
-  rocshmem_free(src);
-  rocshmem_free(pSync);
-  rocshmem_free(pWrk);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/micro_unit_shmem.cpp b/projects/rocshmem/tests/sos_tests/micro_unit_shmem.cpp
deleted file mode 100644
index 0391a93c01..0000000000
--- a/projects/rocshmem/tests/sos_tests/micro_unit_shmem.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- *for back to back operation testing: independent buffers for each operation
- *as well as alternating PE waiting
- * */
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-typedef enum { NUM_WRITE = 8, NUM_READ = 5, NUM_SYNC = 3 } max_ops;
-
-long *target;
-long *source;
-long *sync_pes;
-
-int verbose;
-int debug;
-
-static inline void wait_until(long *wait_var, int iterations, int pe) {
-  if (debug) printf("PE %d waiting...%ld\n", pe, *wait_var);
-
-  rocshmem_long_wait_until(wait_var, ROCSHMEM_CMP_EQ, iterations);
-
-  if (debug) printf("PE %d wait_until passed\n", pe);
-}
-
-static inline void pre_op_check(const char *op, int check_var, int iterations,
-                                int pe) {
-  if (verbose) printf("SHMEM %s, performing %d iterations\n", op, iterations);
-
-  if (debug) printf("BEFORE operation PE %d target = %d\n", pe, check_var);
-}
-
-static inline void post_op_check(const char *op, int check_var, int iterations,
-                                 int pe) {
-  if (check_var != iterations) {
-    fprintf(stderr, "%s ERR: PE %d source = %d != %d\n", op, pe, check_var,
-            iterations);
-    rocshmem_global_exit(EXIT_FAILURE);
-  }
-}
-
-static inline void putfence(int me, int iterations, int T) {
-  int i;
-
-  if (me == 1) pre_op_check(__func__, target[T], iterations, 1);
-
-  if (me == 0) {
-    for (i = 1; i < iterations; i++) {
-      rocshmem_long_p(&target[T], i, 1);
-      rocshmem_fence();
-    }
-
-    rocshmem_long_p(&target[T], i, 1);
-
-  } else
-    wait_until(&target[T], iterations, 1);
-
-  if (verbose)
-    if (me == 0) printf("SHMEM %s finished\n", __func__);
-}
-
-static inline void gettest(int me, int iterations, int T, int S, int P) {
-  int i;
-
-  if (me == 1) {
-    pre_op_check(__func__, target[T], iterations, 1);
-
-    rocshmem_long_p(&source[S], iterations, 0);
-    rocshmem_fence();
-
-    for (i = 0; i < iterations; i++)
-      target[T] = rocshmem_long_g(&source[S], 0);
-
-    rocshmem_long_p(&sync_pes[P], iterations, 0);
-
-    post_op_check("get", target[T], iterations, 1);
-
-  } else
-    wait_until(&sync_pes[P], iterations, 0);
-
-  if (verbose) {
-    if (me == 0) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-static inline void atomic_inc(int me, int iterations, int T) {
-  int i;
-
-  if (me == 1) pre_op_check(__func__, target[T], iterations, 1);
-
-  target[T] = 0;
-  rocshmem_barrier_all();
-
-  if (me == 0) {
-    for (i = 0; i < iterations; i++) {
-      rocshmem_int64_atomic_inc((int64_t *)&target[T], 1);
-      rocshmem_fence();
-    }
-    rocshmem_int64_atomic_inc((int64_t *)&target[T], 1);
-
-    if (debug) printf("PE 0 done with operation\n");
-
-  } else
-    wait_until(&target[T], (iterations + 1), 1);
-
-  if (verbose) {
-    if (me == 1) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-static inline void atomic_add(int me, int iterations, int T) {
-  int i;
-
-  if (me == 0) pre_op_check(__func__, target[T], iterations, 0);
-
-  target[T] = 0;
-  rocshmem_barrier_all();
-
-  if (me == 1) {
-    for (i = 0; i < iterations; i++) {
-      rocshmem_int64_atomic_add((int64_t *)&target[T], 1, 0);
-      rocshmem_fence();
-    }
-    rocshmem_int64_atomic_add((int64_t *)&target[T], 1, 0);
-
-    if (debug) printf("PE 1 done with operation\n");
-
-  } else
-    wait_until(&target[T], (iterations + 1), 0);
-
-  if (verbose) {
-    if (me == 1) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-/*
-static inline void swaptest(int me, int iterations, int T, int S, int P)
-{
-
-    int i;
-    const int tswap = 5, sswap = 2;
-    target[T] = tswap;
-    source[S] = sswap;
-
-    rocshmem_barrier_all(); /* Ensure target/source initialization completed */
-/*
-
-    if (me == 0)
-        pre_op_check(__func__, source[S], iterations, 0);
-
-    if (me == 0) {
-        for (i = 0; i < iterations; i++)
-            source[S] = rocshmem_long_atomic_swap(&target[T], source[S], 1);
-
-        rocshmem_long_p(&sync_pes[P], i, 1);
-
-        if (debug)
-            printf("AFTER flag PE 0 value of source is %d"
-                   " = 5?\n", source[S]);
-
-        if (((iterations % 2 == 1) && (source[S] != tswap)) ||
-            ((iterations % 2 == 0) &&
-             (source[S] != sswap))) {
-            fprintf(stderr, "swap ERR: PE 0 source = %d\n",
-                    source[S]);
-            rocshmem_global_exit(EXIT_FAILURE);
-        }
-
-    } else {
-        wait_until(&sync_pes[P], iterations, 1);
-
-        if (((iterations % 2 == 1) && (target[T] != sswap)) ||
-            ((iterations % 2 == 0) &&
-             (target[T] != tswap))) {
-            fprintf(stderr, "swap ERR: PE 0 target = %d \n",
-                    target[T]);
-            rocshmem_global_exit(EXIT_FAILURE);
-        }
-
-    }
-
-    if (verbose) {
-        if (me == 0)
-            printf("SHMEM %s finished\n", __func__);
-    }
-}
-*/
-
-static inline void cswaptest(int me, int iterations, int T, int S, int P) {
-  int i;
-  source[S] = -100;
-
-  target[T] = 0;
-  rocshmem_barrier_all();
-
-  if (me == 1) {
-    pre_op_check(__func__, source[S], iterations, 1);
-
-    for (i = 0; i < iterations; i++)
-      source[S] = rocshmem_int64_atomic_compare_swap((int64_t *)&(target[T]),
-                                                      i, (i + 1), 0);
-
-    rocshmem_long_p(&sync_pes[P], i, 0);
-
-    post_op_check("compare_swap", source[S], (iterations - 1), 1);
-
-  } else {
-    wait_until(&sync_pes[P], iterations, 0);
-
-    if (target[T] != iterations) {
-      fprintf(stderr, "compare_swap ERR: PE 1 target = %ld != %d\n", target[T],
-              iterations);
-      rocshmem_global_exit(EXIT_FAILURE);
-    }
-  }
-
-  if (verbose) {
-    if (me == 1) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-static inline void fetchatomic_add(int me, int iterations, int T, int S) {
-  int i;
-
-  if (me == 1) pre_op_check(__func__, target[T], iterations, 1);
-
-  target[T] = 0;
-  rocshmem_barrier_all();
-
-  if (me == 0) {
-    if (debug) {
-      printf(
-          "BEFORE flag PE 0 value of source is"
-          " %ld = 0?\n",
-          source[S]);
-    }
-
-    for (i = 0; i < iterations; i++) {
-      source[S] = rocshmem_int64_atomic_fetch_add((int64_t *)&target[T], 1, 1);
-      rocshmem_fence();
-    }
-    source[S] = rocshmem_int64_atomic_fetch_add((int64_t *)&target[T], 1, 1);
-
-    post_op_check("fetch_add", source[S], iterations, 0);
-
-  } else
-    wait_until(&target[T], (iterations + 1), 1);
-
-  if (verbose) {
-    if (me == 0) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-static inline void fetchatomic_inc(int me, int iterations, int T, int S) {
-  int i;
-
-  if (me == 0) pre_op_check(__func__, target[T], iterations, 0);
-
-  target[T] = 0;
-  rocshmem_barrier_all();
-
-  if (me == 1) {
-    if (debug) {
-      printf("BEFORE flag PE 1 value of source is %ld\n", source[S]);
-    }
-
-    for (i = 0; i < iterations; i++) {
-      source[S] = rocshmem_int64_atomic_fetch_inc((int64_t *)&target[T], 0);
-      rocshmem_fence();
-    }
-
-    post_op_check("fetch_inc", source[S], (iterations - 1), 1);
-  } else
-    wait_until(&target[T], iterations, 0);
-
-  if (verbose) {
-    if (me == 1) printf("SHMEM %s finished\n", __func__);
-  }
-}
-
-int main(int argc, char **argv) {
-  int me, nproc;
-  int c, all_ops = 1;
-  int T = 0, S = 0, P = 0;
-  const int DEFAULT_ITR = 7;
-  int iterations = DEFAULT_ITR;
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  nproc = rocshmem_n_pes();
-
-  target = (long *)rocshmem_malloc(NUM_WRITE * sizeof(long));
-  source = (long *)rocshmem_malloc(NUM_READ * sizeof(long));
-  sync_pes = (long *)rocshmem_malloc(NUM_SYNC * sizeof(long));
-
-  memset(target, -1, NUM_WRITE * sizeof(int));
-  memset(source, -1, NUM_READ * sizeof(int));
-  memset(sync_pes, -1, NUM_SYNC * sizeof(int));
-
-  rocshmem_barrier_all();
-
-  if (nproc != 2) {
-    if (me == 0) {
-      fprintf(stderr,
-              "This is a micro test and is only "
-              "intended to run on exactly two processes you"
-              " are using %d\n",
-              nproc);
-    }
-    rocshmem_finalize();
-    return 0;
-  }
-
-  while ((c = getopt(argc, argv, "i:vdpgaAscfFh")) != -1) {
-    switch (c) {
-      case 'i':
-        iterations = atoi(optarg);
-        assert(iterations > 0);
-        all_ops += 2;
-        break;
-      case 'v':
-        verbose = 1;
-        all_ops++;
-        break;
-      case 'd':
-        debug = 1;
-        break;
-      case 'p':
-        putfence(me, iterations, T++);
-        break;
-      case 'g':
-        gettest(me, iterations, T++, S++, P++);
-        break;
-      case 'a':
-        atomic_add(me, iterations, T++);
-        break;
-      case 'A':
-        atomic_inc(me, iterations, T++);
-        break;
-      /*
-      case 's':
-          swaptest(me, iterations, T++, S++, P++);
-          break;
-      */
-      case 'c':
-        cswaptest(me, iterations, T++, S++, P++);
-        break;
-      case 'f':
-        fetchatomic_add(me, iterations, T++, S++);
-        break;
-      case 'F':
-        fetchatomic_inc(me, iterations, T++, S++);
-        break;
-      case 'h':
-      default:
-        if (me == 0) {
-          fprintf(stderr,
-                  "input options:\n 1) single"
-                  " argument option will run all tests by default"
-                  "and additionally request:  -v (verbose) | "
-                  "-i <number of interations>\n");
-          fprintf(stderr,
-                  " 2) two argument options "
-                  "choose any combination of the following "
-                  "to run individual tests:  -i <iterations>, -v"
-                  ", -d, -p, -g, -a, -A, -s, -c, -f, -F, -h\n");
-        }
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  if (argc == all_ops || argc == 1) {
-    putfence(me, iterations, T++);
-    gettest(me, iterations, T++, S++, P++);
-    atomic_add(me, iterations, T++);
-    atomic_inc(me, iterations, T++);
-    // swaptest(me, iterations, T++, S++, P++);
-    cswaptest(me, iterations, T++, S++, P++);
-    fetchatomic_add(me, iterations, T++, S++);
-    fetchatomic_inc(me, iterations, T++, S++);
-  }
-
-  if (verbose) {
-    if (me == 1)
-      printf("PE 1: PASS: %8d iterations\n", iterations);
-    else
-      printf("PE 0 Successful exit\n");
-  }
-
-  rocshmem_free(target);
-  rocshmem_free(source);
-  rocshmem_free(sync_pes);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/mt_a2a.cpp b/projects/rocshmem/tests/sos_tests/mt_a2a.cpp
deleted file mode 100644
index 1990414ec7..0000000000
--- a/projects/rocshmem/tests/sos_tests/mt_a2a.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Multithreaded All-to-All Test
- * James Dinan <james.dinan@intel.com>
- * January, 2014
- */
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define T 8
-
-long *dest;
-long *flag;
-
-int me, npes;
-int errors = 0;
-pthread_barrier_t fencebar;
-pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static void *thread_main(void *arg) {
-  int tid = *(int *)arg;
-  int i, expected;
-  long val;
-
-  /* TEST CONCURRENT ATOMICS */
-  val = me;
-  for (i = 1; i <= npes; i++)
-    rocshmem_int64_atomic_add(&dest[tid], val, (me + i) % npes);
-
-  /* Ensure that fence does not overlap with communication calls */
-  pthread_barrier_wait(&fencebar);
-  if (tid == 0) rocshmem_fence();
-  pthread_barrier_wait(&fencebar);
-
-  for (i = 1; i <= npes; i++)
-    rocshmem_int64_atomic_inc(&flag[tid], (me + i) % npes);
-
-  rocshmem_long_wait_until(&flag[tid], ROCSHMEM_CMP_EQ, npes);
-
-  expected = (npes - 1) * npes / 2;
-  if (dest[tid] != expected || flag[tid] != npes) {
-    printf(
-        "Atomic test error: [PE = %d | TID = %d] -- "
-        "dest = %ld (expected %d), flag = %ld (expected %d)\n",
-        me, tid, dest[tid], expected, flag[tid], npes);
-    pthread_mutex_lock(&mutex);
-    ++errors;
-    pthread_mutex_unlock(&mutex);
-  }
-
-  pthread_barrier_wait(&fencebar);
-  if (0 == tid) rocshmem_barrier_all();
-  pthread_barrier_wait(&fencebar);
-
-  /* TEST CONCURRENT PUTS */
-  val = -1;
-  rocshmem_long_put(&dest[tid], &val, 1, (me + 1) % npes);
-
-  /* Ensure that all puts are issued before the shmem barrier is called. */
-  pthread_barrier_wait(&fencebar);
-  if (0 == tid) rocshmem_barrier_all();
-  pthread_barrier_wait(&fencebar);
-
-  /* TEST CONCURRENT GETS */
-  for (i = 1; i <= npes; i++) {
-    rocshmem_long_get(&val, &dest[tid], 1, (me + i) % npes);
-
-    expected = -1;
-    if (val != expected) {
-      printf(
-          "Put/get test error: [PE = %d | TID = %d] -- From PE %d, got %ld "
-          "expected %d\n",
-          me, tid, (me + i) % npes, val, expected);
-      pthread_mutex_lock(&mutex);
-      ++errors;
-      pthread_mutex_unlock(&mutex);
-    }
-  }
-
-  pthread_barrier_wait(&fencebar);
-  if (0 == tid) rocshmem_barrier_all();
-
-  return NULL;
-}
-
-int main(int argc, char **argv) {
-  int tl, i, ret;
-  pthread_t threads[T];
-  int t_arg[T];
-
-  rocshmem_init_thread(ROCSHMEM_THREAD_MULTIPLE, &tl);
-
-  if (tl != ROCSHMEM_THREAD_MULTIPLE) {
-    printf("Init failed (requested thread level %d, got %d)\n",
-           ROCSHMEM_THREAD_MULTIPLE, tl);
-    rocshmem_global_exit(1);
-  }
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  pthread_barrier_init(&fencebar, NULL, T);
-
-  dest = (long *)rocshmem_malloc(sizeof(long) * T);
-  flag = (long *)rocshmem_malloc(sizeof(long) * T);
-
-  if (me == 0)
-    printf("Starting multithreaded test on %d PEs, %d threads/PE\n", npes, T);
-
-  for (i = 0; i < T; i++) {
-    int err;
-    dest[i] = 0;
-    flag[i] = 0;
-    t_arg[i] = i;
-    err = pthread_create(&threads[i], NULL, thread_main, (void *)&t_arg[i]);
-    assert(0 == err);
-  }
-
-  for (i = 0; i < T; i++) {
-    int err;
-    err = pthread_join(threads[i], NULL);
-    assert(0 == err);
-  }
-
-  pthread_barrier_destroy(&fencebar);
-
-  if (me == 0) {
-    if (errors)
-      printf("Encountered %d errors\n", errors);
-    else
-      printf("Success\n");
-  }
-
-  rocshmem_free(dest);
-  rocshmem_free(flag);
-
-  rocshmem_finalize();
-  return (errors == 0) ? 0 : 1;
-}
diff --git a/projects/rocshmem/tests/sos_tests/mt_contention.cpp b/projects/rocshmem/tests/sos_tests/mt_contention.cpp
deleted file mode 100644
index f3cd0b14db..0000000000
--- a/projects/rocshmem/tests/sos_tests/mt_contention.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright (c) 2018 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Multithreaded Contention Test: Overlapping AMO/quiet on a shared (default)
- * context */
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define T 8
-
-long *dest;
-
-int me, npes;
-int errors = 0;
-
-static void *thread_main(void *arg) {
-  int tid = *(int *)arg;
-  int i;
-
-  /* Threads increment the counter on each PE and then performs a quiet.
-   * All threads use the default context; thus, this checks that quiet
-   * with overlapping AMOs behaves correctly. */
-
-  for (i = 1; i <= npes; i++)
-    rocshmem_int64_atomic_add(dest, tid, (me + i) % npes);
-
-  rocshmem_quiet();
-
-  return NULL;
-}
-
-int main(int argc, char **argv) {
-  int tl, i, ret;
-  pthread_t threads[T];
-  int t_arg[T];
-
-  rocshmem_init_thread(ROCSHMEM_THREAD_MULTIPLE, &tl);
-
-  if (tl != ROCSHMEM_THREAD_MULTIPLE) {
-    printf("Init failed (requested thread level %d, got %d)\n",
-           ROCSHMEM_THREAD_MULTIPLE, tl);
-    rocshmem_global_exit(1);
-  }
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if (me == 0)
-    printf("Starting multithreaded test on %d PEs, %d threads/PE\n", npes, T);
-
-  dest = (long *)rocshmem_malloc(sizeof(long));
-  *dest = 0;
-
-  for (i = 0; i < T; i++) {
-    int err;
-    t_arg[i] = i;
-    err = pthread_create(&threads[i], NULL, thread_main, (void *)&t_arg[i]);
-    assert(0 == err);
-  }
-
-  for (i = 0; i < T; i++) {
-    int err;
-    err = pthread_join(threads[i], NULL);
-    assert(0 == err);
-  }
-
-  rocshmem_sync_all();
-
-  if ((*dest) != ((T - 1) * T / 2) * npes) {
-    printf("%d: dest = %ld, expected %d\n", me, *dest,
-           ((T - 1) * T / 2) * npes);
-    errors++;
-  }
-
-  rocshmem_free(dest);
-
-  rocshmem_finalize();
-  return (errors == 0) ? 0 : 1;
-}
diff --git a/projects/rocshmem/tests/sos_tests/pi.cpp b/projects/rocshmem/tests/sos_tests/pi.cpp
deleted file mode 100644
index ea85e397a4..0000000000
--- a/projects/rocshmem/tests/sos_tests/pi.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NUM_POINTS 10000
-
-int main(int argc, char *argv[], char *envp[]) {
-  int me, myrocshmem_n_pes;
-  long long *inside, *total;
-
-  /*
-  ** Starts/Initializes SHMEM/OpenSHMEM
-  */
-  rocshmem_init();
-  /*
-  ** Fetch the number or processes
-  ** Some implementations use num_pes();
-  */
-  myrocshmem_n_pes = rocshmem_n_pes();
-  /*
-  ** Assign my process ID to me
-  */
-  me = rocshmem_my_pe();
-
-  inside = (long long *)rocshmem_malloc(sizeof(long long));
-  total = (long long *)rocshmem_malloc(sizeof(long long));
-  *inside = *total = 0;
-
-  srand(1 + me);
-
-  for ((*total) = 0; (*total) < NUM_POINTS; ++(*total)) {
-    double x, y;
-    x = rand() / (double)RAND_MAX;
-    y = rand() / (double)RAND_MAX;
-
-    if (x * x + y * y < 1) {
-      ++(*inside);
-    }
-  }
-
-  rocshmem_barrier_all();
-
-  int errors = 0;
-
-  if (me == 0) {
-    for (int i = 1; i < myrocshmem_n_pes; ++i) {
-      long long remoteInside, remoteTotal;
-      rocshmem_longlong_get(&remoteInside, inside, 1, i);
-      rocshmem_longlong_get(&remoteTotal, total, 1, i);
-      (*total) += remoteTotal;
-      (*inside) += remoteInside;
-    }
-
-    double approx_pi = 4.0 * (*inside) / (double)(*total);
-
-    if (fabs(M_PI - approx_pi) > 0.1) {
-      ++errors;
-    }
-
-    if (NULL == getenv("MAKELEVEL")) {
-      printf("Pi from %llu points on %d PEs: %lf\n", *total, myrocshmem_n_pes,
-             approx_pi);
-    }
-  }
-
-  rocshmem_free(inside);
-  rocshmem_free(total);
-
-  rocshmem_finalize();
-
-  return errors;
-}
diff --git a/projects/rocshmem/tests/sos_tests/ping.cpp b/projects/rocshmem/tests/sos_tests/ping.cpp
deleted file mode 100644
index fe6add096d..0000000000
--- a/projects/rocshmem/tests/sos_tests/ping.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * ping test  usage: ping {-V} {longs-per-put(128)} {loop-cnt(10)}
- *
- * For yod -c X ./ping
- * Proc0 puts nWords to Proc1 ... Proc(X-1)
- */
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define Rfprintf \
-  if (rocshmem_my_pe() == 0) fprintf
-#define Rprintf \
-  if (rocshmem_my_pe() == 0) printf
-
-#define RDprintf \
-  if (Verbose && rocshmem_my_pe() == 0) printf
-#define RDfprintf \
-  if (Verbose && rocshmem_my_pe() == 0) fprintf
-
-/* option flags */
-#define OUTPUT_MOD 1  // output debug every X loops
-int output_mod = OUTPUT_MOD;
-int Verbose;
-int Slow;
-
-#define DFLT_NWORDS 128
-#define TARGET_SZ 8192
-#define VAL 0xCafeBabe
-
-long src[TARGET_SZ];
-
-int main(int argc, char *argv[]) {
-  int c, j, loops, k;
-  int proc, num_procs;
-  int nWords = 1;
-  int failures = 0;
-  char *prog_name;
-  long *Target;
-
-  rocshmem_init();
-  proc = rocshmem_my_pe();
-  num_procs = rocshmem_n_pes();
-
-  if (num_procs == 1) {
-    Rfprintf(stderr, "ERR - Requires > 1 PEs\n");
-    rocshmem_finalize();
-    return 0;
-  }
-
-  prog_name = strrchr(argv[0], '/');
-  if (prog_name)
-    prog_name++;
-  else
-    prog_name = argv[0];
-
-  while ((c = getopt(argc, argv, "hVM:s")) != -1) {
-    switch (c) {
-      case 's':
-        Slow++;
-        break;
-      case 'V':
-        Verbose++;
-        break;
-      case 'M':
-        output_mod = atoi(optarg);
-        if (output_mod <= 0) {
-          Rfprintf(stderr,
-                   "ERR - output modulo arg out of "
-                   "bounds '%d'?]\n",
-                   output_mod);
-          rocshmem_finalize();
-          return 1;
-        }
-        Rfprintf(stderr, "%s: output modulo %d\n", prog_name, output_mod);
-        break;
-      case 'h':
-        Rfprintf(stderr, "usage: %s {nWords-2-put} {Loop-count}\n", prog_name);
-        rocshmem_finalize();
-        return 1;
-      default:
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  if (optind == argc)
-    nWords = DFLT_NWORDS;
-  else {
-    nWords = atoi(argv[optind++]);
-    if (nWords <= 0 || nWords > TARGET_SZ) {
-      Rfprintf(stderr, "ERR - nWords arg out of bounds '%d' [1..%d]?\n", nWords,
-               TARGET_SZ);
-      rocshmem_finalize();
-      return 1;
-    }
-  }
-
-  if (optind == argc)
-    loops = 10;
-  else {
-    loops = atoi(argv[optind++]);
-    if (loops <= 0 || loops > 1000000) {
-      Rfprintf(stderr, "ERR - loops arg out of bounds '%d'?\n", loops);
-      rocshmem_finalize();
-      return 1;
-    }
-  }
-
-  // Rprintf("%s: %d loops of %d longs per put\n",prog_name,loops,nWords);
-
-  for (j = 0; j < nWords; j++) src[j] = VAL;
-
-  Target = (long *)rocshmem_malloc(TARGET_SZ * sizeof(long));
-
-  for (j = 0; j < loops; j++) {
-    rocshmem_barrier_all();
-
-    if (Verbose && (j == 0 || (j % output_mod) == 0))
-      fprintf(stderr, "[%d] +(%d)\n", rocshmem_my_pe(), j);
-
-    if (proc == 0) {
-      int p;
-      for (p = 1; p < num_procs; p++)
-        rocshmem_long_put(Target, src, nWords, p);
-    } else {
-      if (Slow) {
-        /* wait for each put to complete */
-        for (k = 0; k < nWords; k++)
-          rocshmem_long_wait_until(&Target[k], ROCSHMEM_CMP_NE, proc);
-      } else {
-        /* wait for last word to be written */
-        rocshmem_long_wait_until(&Target[nWords - 1], ROCSHMEM_CMP_NE, proc);
-      }
-    }
-
-    if (Verbose && (j == 0 || (j % output_mod) == 0))
-      fprintf(stderr, "[%d] -(%d)\n", rocshmem_my_pe(), j);
-
-    rocshmem_barrier_all();
-
-    if (proc != 0) {
-      for (k = 0; k < nWords; k++) {
-        if (Target[k] != VAL) {
-          fprintf(stderr,
-                  "[%d] Target[%d] %#lx "
-                  "!= %#x\?\n",
-                  proc, k, Target[k], VAL);
-          failures++;
-        }
-        // assert(Target[proc] == VAL);
-        Target[k] = 0;
-      }
-    } else
-      memset(Target, 0, TARGET_SZ);
-  }
-
-  rocshmem_barrier_all();
-
-  if (failures || Verbose)
-    Rprintf("%d(%d) Exit(%d)\n", proc, num_procs, failures);
-
-  rocshmem_free(Target);
-
-  rocshmem_finalize();
-
-  return failures;
-}
diff --git a/projects/rocshmem/tests/sos_tests/put1.cpp b/projects/rocshmem/tests/sos_tests/put1.cpp
deleted file mode 100644
index 8803d1e852..0000000000
--- a/projects/rocshmem/tests/sos_tests/put1.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char *argv[]) {
-  long source[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-  long *target;
-
-  rocshmem_init();
-
-  if (rocshmem_n_pes() == 1) {
-    printf("%s: Requires number of PEs > 1\n", argv[0]);
-    rocshmem_finalize();
-    return 0;
-  }
-
-  target = (long *)rocshmem_malloc(10 * sizeof(long));
-
-  if (rocshmem_my_pe() == 0) {
-    /* put 10 elements into target on PE 1 */
-    rocshmem_long_put(target, source, 10, 1);
-  }
-
-  rocshmem_barrier_all(); /* sync sender and receiver */
-
-  if (rocshmem_my_pe() == 1) {
-    if (0 != memcmp(source, target, sizeof(long) * 10)) {
-      int i;
-      fprintf(stderr, "[%d] Src & Target mismatch?\n", rocshmem_my_pe());
-      for (i = 0; i < 10; ++i) {
-        printf("%ld,%ld ", source[i], target[i]);
-      }
-      printf("\n");
-      rocshmem_global_exit(1);
-    }
-  }
-
-  rocshmem_free(target);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/put_ctx_mbw_mr.cpp b/projects/rocshmem/tests/sos_tests/put_ctx_mbw_mr.cpp
deleted file mode 100644
index a9f9d816c6..0000000000
--- a/projects/rocshmem/tests/sos_tests/put_ctx_mbw_mr.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include <getopt.h>
-#include <omp.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define CACHE_LINE_SIZE 64
-#define PAGE_SIZE 4096
-#define DEF_NUM_THREADS 1
-#define DEF_MESSAGE_SIZE 8
-#define WINDOW_SIZE 64
-#define DEF_NUM_MESSAGES 640000
-#define LARGE_MSG_TH 16384
-#define DEF_LARGE_NUM_MESSAGES 64000
-
-/* An rocSHMEM+threads put message-rate
- * and bandwidth benchmark.
- *
- * Always with 2 processes
- * Thread i on PE 0 sends to thread i on PE 1.
- */
-
-int num_threads;
-int num_messages;
-int message_size;
-
-int run_bench(int rank, int size);
-void print_usage(const char *argv0);
-
-double get_time() {
-  double seconds = 0.0;
-  struct timespec tv;
-
-  clock_gettime(CLOCK_MONOTONIC, &tv);
-  seconds = tv.tv_sec;
-  seconds += (double)tv.tv_nsec / 1.0e9;
-
-  return seconds;
-}
-
-int run_bench(int rank, int size) {
-  int i;
-  size_t buffer_size, contig_buffer_size;
-  double *t_elapsed;
-  double msg_rate, my_msg_rate, bandwidth, my_bandwidth;
-  rocshmem_ctx_t *ctx;
-  char *dest_buf, *source_buf;
-
-  num_messages = WINDOW_SIZE * (num_messages / num_threads / WINDOW_SIZE);
-
-  t_elapsed = (double *)calloc(num_threads, sizeof(double));
-
-  /* Allocate array of ctxs */
-  ctx = (rocshmem_ctx_t *)malloc(sizeof(rocshmem_ctx_t) * num_threads);
-
-  /**
-   * Allocate contiguous buffer for all the threads on the target.
-   * Ensure that adjacent buffers are not on the same cache line.
-   */
-  buffer_size = (message_size + CACHE_LINE_SIZE) * sizeof(char);
-  contig_buffer_size = buffer_size * num_threads;
-
-  dest_buf = (char *)rocshmem_malloc(contig_buffer_size);
-  memset(dest_buf, 0, sizeof(contig_buffer_size));
-  rocshmem_barrier_all();
-
-  /* Create windows */
-  for (i = 0; i < num_threads; i++) {
-    int err = rocshmem_ctx_create(0, &ctx[i]);
-    if (err) {
-      printf("PE %d: Warning, could not create context %d (%d)\n", rank, i,
-             err);
-      ctx[i] = ROCSHMEM_CTX_DEFAULT;
-    }
-  }
-
-  /* Allocate the source buffers on the device */
-  if (rank % 2 == 0) {
-    hipMalloc((void **)&source_buf, contig_buffer_size);
-  }
-
-#pragma omp parallel
-  {
-    int tid;
-    int win_i, win_post_i, win_posts;
-    int my_message_size;
-    rocshmem_ctx_t my_ctx;
-
-    tid = omp_get_thread_num();
-    my_message_size = message_size;
-    my_ctx = ctx[tid];
-    win_posts = num_messages / WINDOW_SIZE;
-    if (win_posts * WINDOW_SIZE != num_messages)
-      printf(
-          "Warning: The final reported numbers will be off. Please choose "
-          "number of messages to be a multiple of window size\n");
-
-    if (rank % 2 == 0) {
-      /* Putter */
-      void *my_source_buf = (void *)&source_buf[tid * buffer_size];
-      void *my_dest_buf = (void *)&dest_buf[tid * buffer_size];
-      double t_start, t_end;
-
-      /* Warmup */
-      for (win_post_i = 0; win_post_i < win_posts; win_post_i++) {
-        for (win_i = 0; win_i < WINDOW_SIZE; win_i++) {
-          rocshmem_ctx_putmem_nbi(my_ctx, my_dest_buf, my_source_buf,
-                                   my_message_size, rank + 1);
-        }
-        rocshmem_ctx_quiet(my_ctx);
-      }
-
-#pragma omp master
-      { rocshmem_barrier_all(); }
-#pragma omp barrier
-
-      /* Benchmark */
-      t_start = get_time();
-
-      for (win_post_i = 0; win_post_i < win_posts; win_post_i++) {
-        for (win_i = 0; win_i < WINDOW_SIZE; win_i++) {
-          rocshmem_ctx_putmem_nbi(my_ctx, my_dest_buf, my_source_buf,
-                                   my_message_size, rank + 1);
-        }
-        rocshmem_ctx_quiet(my_ctx);
-      }
-
-      t_end = get_time();
-      t_elapsed[tid] = t_end - t_start;
-      ;
-
-    } else {
-      /* Target */
-
-      /* Warmup */
-
-#pragma omp master
-      { rocshmem_barrier_all(); }
-#pragma omp barrier
-
-      /* Benchmark */
-    }
-  }
-
-  rocshmem_barrier_all();
-
-  if (rank % 2 == 0) {
-    int thread_i;
-    msg_rate = 0;
-    bandwidth = 0;
-    printf("%-10s\t%-10s\t%-10s\n", "Thread", "Mmsgs/s", "MB/s");
-    for (thread_i = 0; thread_i < num_threads; thread_i++) {
-      my_msg_rate = ((double)num_messages / t_elapsed[thread_i]) / 1e6;
-      my_bandwidth =
-          (((double)message_size * (double)num_messages) / (1024 * 1024)) /
-          t_elapsed[thread_i];
-      printf("%-10d\t%-10.2f\t%-10.2f\n", thread_i, my_msg_rate, my_bandwidth);
-      msg_rate += my_msg_rate;
-      bandwidth += my_bandwidth;
-    }
-    printf("\n%-10s\t%-10s\t%-10s\t%-10s\n", "Size", "Threads", "Mmsgs/s",
-           "MB/s");
-    printf("%-10d\t", message_size);
-    printf("%-10d\t", num_threads);
-    printf("%f\t", msg_rate);
-    printf("%f\n", bandwidth);
-  }
-
-  rocshmem_barrier_all();
-
-  for (i = 0; i < num_threads; i++) rocshmem_ctx_destroy(ctx[i]);
-  free(ctx);
-  free(t_elapsed);
-  hipFree(source_buf);
-
-  return 0;
-}
-
-int main(int argc, char *argv[]) {
-  int op, ret;
-  int provided, size, rank;
-
-  struct option long_options[] = {
-      {.name = "threads", .has_arg = 1, .val = 'T'},
-      {.name = "window-size", .has_arg = 1, .val = 'W'},
-      {.name = "num-messages", .has_arg = 1, .val = 'M'},
-      {.name = "message-size", .has_arg = 1, .val = 'S'},
-      {0, 0, 0, 0}};
-
-  num_threads = DEF_NUM_THREADS;
-  num_messages = DEF_NUM_MESSAGES;
-  message_size = DEF_MESSAGE_SIZE;
-
-  while (1) {
-    op = getopt_long(argc, argv, "h?T:W:M:S:w:C:", long_options, NULL);
-    if (op == -1) break;
-
-    switch (op) {
-      case '?':
-      case 'h':
-        print_usage(argv[0]);
-        return -1;
-      case 'T':
-        num_threads = atoi(optarg);
-        break;
-      case 'M':
-        num_messages = atoi(optarg);
-        break;
-      case 'S':
-        message_size = atoi(optarg);
-        break;
-      default:
-        printf("Unrecognized argument\n");
-        return EXIT_FAILURE;
-    }
-  }
-
-  if (optind < argc) {
-    print_usage(argv[0]);
-    return -1;
-  }
-
-  if (message_size > LARGE_MSG_TH) {
-    if (num_messages == DEF_NUM_MESSAGES) num_messages = DEF_LARGE_NUM_MESSAGES;
-  }
-
-  rocshmem_init();
-
-  size = rocshmem_n_pes();
-  if (size != 2) {
-    printf("Run with only two processes.\n");
-    rocshmem_finalize();
-  }
-
-  omp_set_num_threads(num_threads);
-
-  rank = rocshmem_my_pe();
-
-  ret = run_bench(rank, size);
-  if (ret) {
-    fprintf(stderr, "Error in running bench \n");
-    ret = EXIT_FAILURE;
-  }
-
-  rocshmem_finalize();
-
-  return ret;
-}
-
-void print_usage(const char *argv0) {
-  printf("Usage:\n");
-  printf(
-      "  mpiexec -n 2 -ppn 1 ###options-to-bind-threads### -hosts "
-      "<sender>,<receiver> %s <options>\n",
-      argv0);
-  printf("\n");
-  printf("Options:\n");
-  printf("  -T, --threads=<#threads>			number of threads\n");
-  printf("  -M, --num-messages=<num_messages>	number of messages\n");
-  printf("  -S, --message-size=<message_size>	size of messages\n");
-}
diff --git a/projects/rocshmem/tests/sos_tests/put_nbi.cpp b/projects/rocshmem/tests/sos_tests/put_nbi.cpp
deleted file mode 100644
index ac8b8d1a80..0000000000
--- a/projects/rocshmem/tests/sos_tests/put_nbi.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (c) 2016 Intel COrporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      Redistribution and use in source and binary forms, with or
- *      without modfiication, 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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Non-Blocking Put Test
- * Tom St. John <tom.st.john@intel.com>
- * January, 2016
- *
- * PE 0 uses non-blocking put to write a message followed by a
- * notification flag to every remote PE,
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char *argv[]) {
-  long source[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-  long *target;
-  int *flag;
-  int i, num_pes;
-  int failed = 0;
-
-  rocshmem_init();
-
-  target = (long *)rocshmem_malloc(sizeof(long) * 10);
-  flag = (int *)rocshmem_malloc(sizeof(int));
-  if (!flag) {
-    fprintf(stderr, "ERR - null flag pointer\n");
-    rocshmem_global_exit(1);
-  }
-  *flag = 0;
-
-  num_pes = rocshmem_n_pes();
-
-  if (target) {
-    memset(target, 0, sizeof(long) * 10);
-  } else {
-    fprintf(stderr, "ERR - null target pointer\n");
-    rocshmem_global_exit(1);
-  }
-
-  rocshmem_barrier_all();
-
-  if (rocshmem_my_pe() == 0) {
-    for (i = 0; i < num_pes; i++) {
-      rocshmem_long_put_nbi(target, source, 10, i);
-      rocshmem_fence();
-      rocshmem_int64_atomic_inc((int64_t *)flag, i);
-    }
-  }
-
-  rocshmem_int_wait_until(flag, ROCSHMEM_CMP_EQ, 1);
-
-  for (i = 0; i < 10; i++) {
-    if (target[i] != source[i]) {
-      fprintf(stderr, "[%d] target[%d] = %ld, expected %ld\n",
-              rocshmem_my_pe(), i, target[i], source[i]);
-      failed = 1;
-    }
-  }
-
-  rocshmem_free(target);
-  rocshmem_free(flag);
-
-  rocshmem_finalize();
-
-  return failed;
-}
diff --git a/projects/rocshmem/tests/sos_tests/query_thread.cpp b/projects/rocshmem/tests/sos_tests/query_thread.cpp
deleted file mode 100644
index fea6288a10..0000000000
--- a/projects/rocshmem/tests/sos_tests/query_thread.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2018 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(int argc, char* argv[]) {
-  int provided;
-
-  int tl, ret;
-  rocshmem_init_thread(ROCSHMEM_THREAD_FUNNELED, &tl);
-
-  if (tl < ROCSHMEM_THREAD_FUNNELED || ret != 0) {
-    printf("Init failed (requested thread level %d, got %d)\n",
-           ROCSHMEM_THREAD_FUNNELED, tl);
-    rocshmem_global_exit(1);
-  }
-
-  rocshmem_query_thread(&provided);
-  printf("%d: Query result for thread level %d\n", rocshmem_my_pe(), provided);
-
-  if (provided < ROCSHMEM_THREAD_FUNNELED) {
-    printf("Error: thread support changed to an invalid level after init\n");
-    rocshmem_global_exit(1);
-  }
-
-  rocshmem_finalize();
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/reduce_active_set.cpp b/projects/rocshmem/tests/sos_tests/reduce_active_set.cpp
deleted file mode 100644
index e2a5506128..0000000000
--- a/projects/rocshmem/tests/sos_tests/reduce_active_set.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NELEM 10
-
-int main(void) {
-  int i, me, npes;
-  int errors = 0;
-  long *src, *dst_max, *dst_min;
-  long *min_psync, *max_psync;
-  long *min_pwrk, *max_pwrk;
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  src = (long *)rocshmem_malloc(NELEM * sizeof(long));
-  dst_max = (long *)rocshmem_malloc(NELEM * sizeof(long));
-  dst_min = (long *)rocshmem_malloc(NELEM * sizeof(long));
-
-  for (i = 0; i < NELEM; i++) {
-    src[i] = me;
-    dst_max[i] = -1;
-    dst_min[i] = -1;
-  }
-
-  max_psync =
-      (long *)rocshmem_malloc(ROCSHMEM_REDUCE_SYNC_SIZE * sizeof(long));
-  min_psync =
-      (long *)rocshmem_malloc(ROCSHMEM_REDUCE_SYNC_SIZE * sizeof(long));
-  for (i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i++) {
-    max_psync[i] = ROCSHMEM_SYNC_VALUE;
-    min_psync[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  max_pwrk = (long *)rocshmem_malloc(
-      (NELEM / 2 + ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE) * sizeof(long));
-  min_pwrk = (long *)rocshmem_malloc(
-      (NELEM / 2 + ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE) * sizeof(long));
-
-  if (me == 0) printf("Shrinking active set test\n");
-
-  rocshmem_barrier_all();
-
-  /* A total of npes tests are performed, where the active set in each test
-   * includes PEs i..npes-1 */
-  for (i = 0; i <= me; i++) {
-    int j;
-
-    if (me == i)
-      printf(" + PE_start=%d, logPE_stride=0, PE_size=%d\n", i, npes - i);
-
-    rocshmem_ctx_long_max_to_all(ROCSHMEM_CTX_DEFAULT, dst_max, src, NELEM, i,
-                                  0, npes - i, max_pwrk, max_psync);
-
-    /* Validate reduced data */
-    for (j = 0; j < NELEM; j++) {
-      long expected = npes - 1;
-      if (dst_max[j] != expected) {
-        printf(
-            "%d: Max expected dst_max[%d] = %ld, got dst_max[%d] = %ld, "
-            "iteration %d\n",
-            me, j, expected, j, dst_max[j], i);
-        errors++;
-      }
-    }
-
-    rocshmem_ctx_long_min_to_all(ROCSHMEM_CTX_DEFAULT, dst_min, src, NELEM, i,
-                                  0, npes - i, min_pwrk, min_psync);
-
-    /* Validate reduced data */
-    for (j = 0; j < NELEM; j++) {
-      long expected = i;
-      if (dst_min[j] != expected) {
-        printf(
-            "%d: Min expected dst_min[%d] = %ld, got dst_min[%d] = %ld, "
-            "iteration %d\n",
-            me, j, expected, j, dst_min[j], i);
-        errors++;
-      }
-    }
-  }
-
-  rocshmem_free(src);
-  rocshmem_free(dst_max);
-  rocshmem_free(dst_min);
-
-  rocshmem_free(max_psync);
-  rocshmem_free(min_psync);
-
-  rocshmem_free(max_pwrk);
-  rocshmem_free(min_pwrk);
-
-  rocshmem_finalize();
-
-  return errors != 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/reduce_in_place.cpp b/projects/rocshmem/tests/sos_tests/reduce_in_place.cpp
deleted file mode 100644
index 625b0262a2..0000000000
--- a/projects/rocshmem/tests/sos_tests/reduce_in_place.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NELEM 10
-
-int main(void) {
-  int me, npes;
-  int errors = 0;
-  long *psync, *pwrk, *src;
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  src = (long *)rocshmem_malloc(NELEM * sizeof(long));
-  for (int i = 0; i < NELEM; i++) src[i] = me;
-
-  psync = (long *)rocshmem_malloc(ROCSHMEM_REDUCE_SYNC_SIZE * sizeof(long));
-  for (int i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i++)
-    psync[i] = ROCSHMEM_SYNC_VALUE;
-
-  pwrk = (long *)rocshmem_malloc(
-      (NELEM / 2 + ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE) * sizeof(long));
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_long_max_to_all(ROCSHMEM_CTX_DEFAULT, src, src, NELEM, 0, 0,
-                                npes, pwrk, psync);
-
-  /* Validate reduced data */
-  for (int j = 0; j < NELEM; j++) {
-    long expected = npes - 1;
-    if (src[j] != expected) {
-      printf("%d: Expected src[%d] = %ld, got src[%d] = %ld\n", me, j, expected,
-             j, src[j]);
-      errors++;
-    }
-  }
-
-  rocshmem_free(src);
-  rocshmem_free(psync);
-  rocshmem_free(pwrk);
-
-  rocshmem_finalize();
-
-  return errors != 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmalloc.cpp b/projects/rocshmem/tests/sos_tests/shmalloc.cpp
deleted file mode 100644
index 90a9b35be3..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmalloc.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/* :vim:sw=4:ts=4: */
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- *  usage: shmalloc [-p] [nWords] [loops] [incWords-per-loop]
- *    where: -p == power-of-two allocation bump per loop
- *      [nWords] # of longs to rocshmem_malloc()\n"
- *      [loops(1)]  # of loops\n"
- *      [incWords(2)] nWords += incWords per loop\n");
- * Loop:
- *  PE* rocshmem_malloc(nWords)
- *   set *DataType = 1
- *  PE* rocshmem_malloc(nWords)
- *   set *DataType = 2
- *  PE* rocshmem_malloc(nWords)
- *   set *DataType = 3
- *
- *  for(1...3) allocated ranges
- *    verify
- *    rocshmem_free()
- * end-loop
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define DFLT_NWORDS 32
-#define DFLT_INCR 1025
-#define DFLT_LOOPS 50
-
-#define DataType long
-
-static DataType *source;
-static DataType *target;
-static DataType *result;
-
-static int source_sz;
-static int target_sz;
-static int result_sz;
-
-static char *pgm;
-
-void usage(void);
-int getSize(char *);
-
-void usage(void) {
-  if (rocshmem_my_pe() == 0) {
-    fprintf(stderr, "Usage: %s [-p]  [nWords(%d)] [loops(%d)] [incWords(%d)]\n",
-            pgm, DFLT_NWORDS, DFLT_LOOPS, DFLT_INCR);
-    fprintf(stderr,
-            "  -p  == (2**0 ... 2**22) rocshmem_malloc(), other args ignored\n"
-            "  -v == Verbose output\n"
-            "  [nWords] # of longs to rocshmem_malloc()\n"
-            "  [loops]  # of loops\n"
-            "  [incWords] nWords += incWords per loop\n");
-  }
-  rocshmem_finalize();
-  exit(1);
-}
-
-int getSize(char *str) {
-  int size;
-  char mod[32];
-
-  switch (sscanf(str, "%d%1[mMkK]", &size, mod)) {
-    case 1:
-      return (size);
-
-    case 2:
-      switch (*mod) {
-        case 'm':
-        case 'M':
-          return (size << 20);
-
-        case 'k':
-        case 'K':
-          return (size << 10);
-
-        default:
-          return (size);
-      }
-
-    default:
-      return (-1);
-  }
-}
-
-int main(int argc, char **argv) {
-  int me, nProcs, c, l;
-  int nWords, loops, incWords;
-  int Verbose = 0, power2 = 0, modulo = 5;
-  DataType *dp;
-
-  pgm = strrchr(argv[0], '/');
-  if (pgm)
-    pgm++;
-  else
-    pgm = argv[0];
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  nProcs = rocshmem_n_pes();
-
-  while ((c = getopt(argc, argv, "hpv")) != -1) switch (c) {
-      case 'p':
-        power2++;
-        break;
-      case 'v':
-        Verbose++;
-        break;
-      case 'h':
-      default:
-        usage();
-        break;
-    }
-
-  if (optind == argc)
-    nWords = DFLT_NWORDS;
-  else if ((nWords = getSize(argv[optind++])) <= 0)
-    usage();
-
-  if (optind == argc)
-    loops = DFLT_LOOPS;
-  else if ((loops = getSize(argv[optind++])) < 0)
-    usage();
-
-  if (optind == argc)
-    incWords = DFLT_INCR;
-  else if ((incWords = getSize(argv[optind++])) < 0)
-    usage();
-
-  if (power2) {
-    nWords = 1;
-    modulo = 1;
-    loops = 21;
-  }
-
-  if (Verbose && me == 0) {
-    if (power2) {
-      printf("%s: nWords(1) << 1 per loop.\n", pgm);
-    } else
-      printf("%s: nWords(%d) loops(%d) nWords-incr-per-loop(%d)\n", pgm, nWords,
-             loops, incWords);
-  }
-
-  for (l = 0; l < loops; l++) {
-    /*
-    result = (DataType *)rocshmem_malloc(0);
-    if (result != NULL) {
-        perror ("Zero-length memory allocation has non-null result");
-        rocshmem_finalize();
-        exit (1);
-    }
-    */
-
-    result_sz = nProcs * (nWords * sizeof(DataType));
-    result = (DataType *)rocshmem_malloc(result_sz);
-    if (!result) {
-      perror("Failed result memory allocation");
-      rocshmem_finalize();
-      exit(1);
-    }
-    for (dp = result; dp < &result[(result_sz / sizeof(DataType))];) *dp++ = 1;
-
-    target_sz = nWords * sizeof(DataType);
-    if (!(target = (DataType *)rocshmem_malloc(target_sz))) {
-      perror("Failed target memory allocation");
-      rocshmem_finalize();
-      exit(1);
-    }
-    for (dp = target; dp < &target[(target_sz / sizeof(DataType))];) *dp++ = 2;
-
-    source_sz = 2 * nWords * sizeof(DataType);
-    if (!(source = (DataType *)rocshmem_malloc(source_sz))) {
-      perror("Failed source memory allocation");
-      rocshmem_finalize();
-      exit(1);
-    }
-    for (dp = source; dp < &source[(source_sz / sizeof(DataType))];) *dp++ = 3;
-
-    rocshmem_barrier_all(); /* sync sender and receiver */
-
-    for (dp = source; dp < &source[(source_sz / sizeof(DataType))]; dp++)
-      if (*dp != 3) {
-        printf("source not consistent @ 3?\n");
-        break;
-      }
-    rocshmem_free(source);
-
-    for (dp = target; dp < &target[(target_sz / sizeof(DataType))]; dp++)
-      if (*dp != 2) {
-        printf("target not consistent @ 2?\n");
-        break;
-      }
-    rocshmem_free(target);
-
-    for (dp = result; dp < &result[(result_sz / sizeof(DataType))]; dp++)
-      if (*dp != 1) {
-        printf("result not consistent @ 1?\n");
-        break;
-      }
-    rocshmem_free(result);
-
-    if (loops > 1) {
-      if (Verbose && me == 0) {
-        if (l == 0 || (l % modulo == 0))
-          printf("End loop %3d nWords(%d)\n", (l + 1), nWords);
-      }
-      if (power2)
-        nWords <<= 1;
-      else
-        nWords += incWords;  // watch for double inc.
-    }
-  }
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmem_team_b2b_collectives.cpp b/projects/rocshmem/tests/sos_tests/shmem_team_b2b_collectives.cpp
deleted file mode 100644
index 8ca9b3641a..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmem_team_b2b_collectives.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Copyright (c) 2019 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define NITERS 100
-#define NELEMS 10
-
-/*
-#define TEST_B2B_COLLECTIVE(NAME, ROUTINE, ...) \
-    do { \
-        if (me == 0) printf("%s... ", NAME); \
-        int i; \
-        for (i = 0; i < NITERS; i++) { \
-            errors += ROUTINE(__VA_ARGS__); \
-        } \
-        error_check(&errors, &total_errors, NAME, me); \ } while (0)
-
-static void error_check(int *errors, int *total_errors, char *routine, int me) {
-    if (*errors == 0) {
-        if (me == 0) printf("passed.\n");
-    } else {
-        printf("%s error on PE %d\n", routine, me);
-        *total_errors += *errors;
-        *errors = 0;
-    }
-    return;
-}
-*/
-
-#define TEST_B2B_COLLECTIVE(NAME, ROUTINE, ...)   \
-  do {                                            \
-    if (me == 0) printf("%s... ", NAME);          \
-    int i;                                        \
-    for (i = 0; i < NITERS; i++) {                \
-      ROUTINE(__VA_ARGS__);                       \
-    }                                             \
-    if (me == 0) printf("Done with %s.\n", NAME); \
-  } while (0)
-
-int main(void) {
-  int errors = 0, total_errors = 0;
-  rocshmem_init();
-  int me = rocshmem_my_pe();
-
-  long *dest = (long *)rocshmem_malloc(NELEMS * sizeof(long));
-  long *src = (long *)rocshmem_malloc(NELEMS * sizeof(long));
-
-  size_t i;
-  for (i = 0; i < NELEMS; i++) {
-    src[i] = me;
-  }
-
-  TEST_B2B_COLLECTIVE("broadcast", rocshmem_ctx_long_broadcast,
-                      ROCSHMEM_CTX_DEFAULT, ROCSHMEM_TEAM_WORLD, dest, src,
-                      NELEMS, 0);
-  TEST_B2B_COLLECTIVE("reduce", rocshmem_ctx_long_sum_to_all,
-                      ROCSHMEM_CTX_DEFAULT, ROCSHMEM_TEAM_WORLD, dest, src,
-                      NELEMS);
-  // TEST_B2B_COLLECTIVE("collect", rocshmem_long_collect, SHMEM_TEAM_WORLD,
-  // dest, src, NELEMS); TEST_B2B_COLLECTIVE("fcollect", rocshmem_long_fcollect,
-  // SHMEM_TEAM_WORLD, dest, src, NELEMS); TEST_B2B_COLLECTIVE("alltoall",
-  // rocshmem_long_alltoall, SHMEM_TEAM_WORLD, dest, src, NELEMS);
-  // TEST_B2B_COLLECTIVE("alltoalls", rocshmem_long_alltoalls,
-  // SHMEM_TEAM_WORLD, dest, src, 1, 1, NELEMS);
-
-  rocshmem_free(dest);
-  rocshmem_free(src);
-
-  rocshmem_finalize();
-  return total_errors;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmem_team_reduce.cpp b/projects/rocshmem/tests/sos_tests/shmem_team_reduce.cpp
deleted file mode 100644
index 0adc2b844d..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmem_team_reduce.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  This test program is derived from a unit test created by Nick Park.
- *  The original unit test is a work of the U.S. Government and is not subject
- *  to copyright protection in the United States.  Foreign copyrights may
- *  apply.
- *
- *  Copyright (c) 2021 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-//#include <complex.h>
-//#include <math.h>
-#include <stdbool.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define MAX_NPES 32
-
-#define STRINGIFY(x) #x
-
-#define REDUCTION(OP, TYPE)                                                   \
-  do {                                                                        \
-    rocshmem_ctx_##TYPE##_##OP##_to_all(                                      \
-        ROCSHMEM_CTX_DEFAULT, ROCSHMEM_TEAM_WORLD, dest, src, npes);          \
-  } while (0)
-
-#define INIT_SRC_BUFFER(TYPE)                                                 \
-  do {                                                                        \
-    for (int i = 0; i < MAX_NPES; i++) {                                      \
-      src[i] = (TYPE)1ULL;                                                    \
-    }                                                                         \
-  } while (0)
-
-#define CHECK_DEST_BUFFER(OP, TYPE, CORRECT_VAL)                              \
-  do {                                                                        \
-    for (int i = 0; i < npes; i++) {                                          \
-      if (dest[i] != (TYPE)CORRECT_VAL) {                                     \
-        printf(                                                               \
-            "PE %i received incorrect value with "                            \
-            "TEST_SHMEM_REDUCE(%s, %s)\n",                                    \
-            mype, #OP, #TYPE);                                                \
-        rc = EXIT_FAILURE;                                                    \
-      }                                                                       \
-    }                                                                         \
-  } while (0)
-
-#define TEST_SHMEM_REDUCE(OP, TYPENAME, TYPE)                                 \
-  do {                                                                        \
-    TYPE *src, *dest;                                                         \
-    src = dest = nullptr;                                                     \
-    src = (TYPE *)rocshmem_malloc(sizeof(TYPE) * MAX_NPES);                   \
-    dest = (TYPE *)rocshmem_malloc(sizeof(TYPE) * MAX_NPES);                  \
-                                                                              \
-    INIT_SRC_BUFFER(TYPE);                                                    \
-                                                                              \
-    REDUCTION(OP, TYPENAME);                                                  \
-                                                                              \
-    rocshmem_barrier_all();                                                   \
-                                                                              \
-    std::string op = STRINGIFY(OP);                                           \
-    if (op.compare("and") == 0) {                                             \
-      CHECK_DEST_BUFFER(OP, TYPE, 1ULL);                                      \
-    } else if (op.compare("or") == 0) {                                       \
-      CHECK_DEST_BUFFER(OP, TYPE, 1ULL);                                      \
-    } else if (op.compare("xor") == 0) {                                      \
-      CHECK_DEST_BUFFER(OP, TYPE, (TYPE)(npes % 2 ? 1ULL : 0ULL));            \
-    } else if (op.compare("max") == 0) {                                      \
-      CHECK_DEST_BUFFER(OP, TYPE, 1ULL);                                      \
-    } else if (op.compare("min") == 0) {                                      \
-      CHECK_DEST_BUFFER(OP, TYPE, 1ULL);                                      \
-    } else if (op.compare("sum") == 0) {                                      \
-      CHECK_DEST_BUFFER(OP, TYPE, npes);                                      \
-    } else if (op.compare("prod") == 0) {                                     \
-      CHECK_DEST_BUFFER(OP, TYPE, 1ULL);                                      \
-    } else {                                                                  \
-      printf("Invalid operation (%s)\n", STRINGIFY(OP));                      \
-      rocshmem_global_exit(1);                                                \
-    }                                                                         \
-                                                                              \
-    rocshmem_free(src);                                                       \
-    rocshmem_free(dest);                                                      \
-                                                                              \
-  } while (0)
-
-int main(void) {
-  rocshmem_init();
-
-  int rc = EXIT_SUCCESS;
-
-  const int mype = rocshmem_my_pe();
-  const int npes = rocshmem_n_pes();
-
-  if (npes > MAX_NPES) {
-    if (mype == 0)
-      fprintf(stderr, "ERR - Requires less than %d PEs\n", MAX_NPES);
-    rocshmem_global_exit(1);
-  }
-
-  // TEST_SHMEM_REDUCE(and, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(and, ushort, unsigned short);
-  TEST_SHMEM_REDUCE(and, short, short);
-  // TEST_SHMEM_REDUCE(and, uint, unsigned int);
-  // TEST_SHMEM_REDUCE(and, ulong, unsigned long);
-  TEST_SHMEM_REDUCE(and, long, long);
-  // TEST_SHMEM_REDUCE(and, ulonglong, unsigned long long);
-  TEST_SHMEM_REDUCE(and, longlong, long long);
-  TEST_SHMEM_REDUCE(and, int, int);
-  // TEST_SHMEM_REDUCE(and, int8, int8_t);
-  // TEST_SHMEM_REDUCE(and, int16, int16_t);
-  // TEST_SHMEM_REDUCE(and, int32, int32_t);
-  // TEST_SHMEM_REDUCE(and, int64, int64_t);
-  // TEST_SHMEM_REDUCE(and, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(and, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(and, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(and, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(and, size, size_t);
-
-  // TEST_SHMEM_REDUCE(or, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(or, ushort, unsigned short);
-  TEST_SHMEM_REDUCE(or, short, short);
-  // TEST_SHMEM_REDUCE(or, uint, unsigned int);
-  TEST_SHMEM_REDUCE(or, int, int);
-  // TEST_SHMEM_REDUCE(or, ulong, unsigned long);
-  TEST_SHMEM_REDUCE(or, long, long);
-  // TEST_SHMEM_REDUCE(or, ulonglong, unsigned long long);
-  TEST_SHMEM_REDUCE(or, longlong, long long);
-  // TEST_SHMEM_REDUCE(or, int8, int8_t);
-  // TEST_SHMEM_REDUCE(or, int16, int16_t);
-  // TEST_SHMEM_REDUCE(or, int32, int32_t);
-  // TEST_SHMEM_REDUCE(or, int64, int64_t);
-  // TEST_SHMEM_REDUCE(or, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(or, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(or, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(or, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(or, size, size_t);
-
-  // TEST_SHMEM_REDUCE(xor, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(xor, ushort, unsigned short);
-  TEST_SHMEM_REDUCE(xor, short, short);
-  // TEST_SHMEM_REDUCE(xor, uint, unsigned int);
-  TEST_SHMEM_REDUCE(xor, int, int);
-  // TEST_SHMEM_REDUCE(xor, ulong, unsigned long);
-  TEST_SHMEM_REDUCE(xor, long, long);
-  // TEST_SHMEM_REDUCE(xor, ulonglong, unsigned long long);
-  // TEST_SHMEM_REDUCE(xor, int8, int8_t);
-  TEST_SHMEM_REDUCE(xor, longlong, long long);
-  // TEST_SHMEM_REDUCE(xor, int16, int16_t);
-  // TEST_SHMEM_REDUCE(xor, int32, int32_t);
-  // TEST_SHMEM_REDUCE(xor, int64, int64_t);
-  // TEST_SHMEM_REDUCE(xor, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(xor, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(xor, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(xor, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(xor, size, size_t);
-
-  // TEST_SHMEM_REDUCE(max, char, char);
-  // TEST_SHMEM_REDUCE(max, schar, signed char);
-  TEST_SHMEM_REDUCE(max, short, short);
-  TEST_SHMEM_REDUCE(max, int, int);
-  TEST_SHMEM_REDUCE(max, long, long);
-  TEST_SHMEM_REDUCE(max, longlong, long long);
-  // TEST_SHMEM_REDUCE(max, ptrdiff, ptrdiff_t);
-  // TEST_SHMEM_REDUCE(max, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(max, ushort, unsigned short);
-  // TEST_SHMEM_REDUCE(max, uint, unsigned int);
-  // TEST_SHMEM_REDUCE(max, ulong, unsigned long);
-  // TEST_SHMEM_REDUCE(max, ulonglong, unsigned long long);
-  // TEST_SHMEM_REDUCE(max, int8, int8_t);
-  // TEST_SHMEM_REDUCE(max, int16, int16_t);
-  // TEST_SHMEM_REDUCE(max, int32, int32_t);
-  // TEST_SHMEM_REDUCE(max, int64, int64_t);
-  // TEST_SHMEM_REDUCE(max, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(max, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(max, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(max, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(max, size, size_t);
-  TEST_SHMEM_REDUCE(max, float, float);
-  TEST_SHMEM_REDUCE(max, double, double);
-  // TEST_SHMEM_REDUCE(max, longdouble, long double);
-
-  // TEST_SHMEM_REDUCE(min, char, char);
-  // TEST_SHMEM_REDUCE(min, schar, signed char);
-  TEST_SHMEM_REDUCE(min, short, short);
-  TEST_SHMEM_REDUCE(min, int, int);
-  TEST_SHMEM_REDUCE(min, long, long);
-  TEST_SHMEM_REDUCE(min, longlong, long long);
-  // TEST_SHMEM_REDUCE(min, ptrdiff, ptrdiff_t);
-  // TEST_SHMEM_REDUCE(min, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(min, ushort, unsigned short);
-  // TEST_SHMEM_REDUCE(min, uint, unsigned int);
-  // TEST_SHMEM_REDUCE(min, ulong, unsigned long);
-  // TEST_SHMEM_REDUCE(min, ulonglong, unsigned long long);
-  // TEST_SHMEM_REDUCE(min, int8, int8_t);
-  // TEST_SHMEM_REDUCE(min, int16, int16_t);
-  // TEST_SHMEM_REDUCE(min, int32, int32_t);
-  // TEST_SHMEM_REDUCE(min, int64, int64_t);
-  // TEST_SHMEM_REDUCE(min, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(min, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(min, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(min, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(min, size, size_t);
-  TEST_SHMEM_REDUCE(min, float, float);
-  TEST_SHMEM_REDUCE(min, double, double);
-  // TEST_SHMEM_REDUCE(min, longdouble, long double);
-
-  // TEST_SHMEM_REDUCE(sum, char, char);
-  // TEST_SHMEM_REDUCE(sum, schar, signed char);
-  TEST_SHMEM_REDUCE(sum, short, short);
-  TEST_SHMEM_REDUCE(sum, int, int);
-  TEST_SHMEM_REDUCE(sum, long, long);
-  TEST_SHMEM_REDUCE(sum, longlong, long long);
-  // TEST_SHMEM_REDUCE(sum, ptrdiff, ptrdiff_t);
-  // TEST_SHMEM_REDUCE(sum, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(sum, ushort, unsigned short);
-  // TEST_SHMEM_REDUCE(sum, uint, unsigned int);
-  // TEST_SHMEM_REDUCE(sum, ulong, unsigned long);
-  // TEST_SHMEM_REDUCE(sum, ulonglong, unsigned long long);
-  // TEST_SHMEM_REDUCE(sum, int8, int8_t);
-  // TEST_SHMEM_REDUCE(sum, int16, int16_t);
-  // TEST_SHMEM_REDUCE(sum, int32, int32_t);
-  // TEST_SHMEM_REDUCE(sum, int64, int64_t);
-  // TEST_SHMEM_REDUCE(sum, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(sum, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(sum, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(sum, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(sum, size, size_t);
-  TEST_SHMEM_REDUCE(sum, float, float);
-  TEST_SHMEM_REDUCE(sum, double, double);
-  // TEST_SHMEM_REDUCE(sum, longdouble, long double);
-  // TEST_SHMEM_REDUCE(sum, complexd, double _Complex);
-  // TEST_SHMEM_REDUCE(sum, complexf, float _Complex);
-
-  // TEST_SHMEM_REDUCE(prod, char, char);
-  // TEST_SHMEM_REDUCE(prod, schar, signed char);
-  TEST_SHMEM_REDUCE(prod, short, short);
-  TEST_SHMEM_REDUCE(prod, int, int);
-  TEST_SHMEM_REDUCE(prod, long, long);
-  TEST_SHMEM_REDUCE(prod, longlong, long long);
-  // TEST_SHMEM_REDUCE(prod, ptrdiff, ptrdiff_t);
-  // TEST_SHMEM_REDUCE(prod, uchar, unsigned char);
-  // TEST_SHMEM_REDUCE(prod, ushort, unsigned short);
-  // TEST_SHMEM_REDUCE(prod, uint, unsigned int);
-  // TEST_SHMEM_REDUCE(prod, ulong, unsigned long);
-  // TEST_SHMEM_REDUCE(prod, ulonglong, unsigned long long);
-  // TEST_SHMEM_REDUCE(prod, int8, int8_t);
-  // TEST_SHMEM_REDUCE(prod, int16, int16_t);
-  // TEST_SHMEM_REDUCE(prod, int32, int32_t);
-  // TEST_SHMEM_REDUCE(prod, int64, int64_t);
-  // TEST_SHMEM_REDUCE(prod, uint8, uint8_t);
-  // TEST_SHMEM_REDUCE(prod, uint16, uint16_t);
-  // TEST_SHMEM_REDUCE(prod, uint32, uint32_t);
-  // TEST_SHMEM_REDUCE(prod, uint64, uint64_t);
-  // TEST_SHMEM_REDUCE(prod, size, size_t);
-  TEST_SHMEM_REDUCE(prod, float, float);
-  TEST_SHMEM_REDUCE(prod, double, double);
-  // TEST_SHMEM_REDUCE(prod, longdouble, long double);
-  // TEST_SHMEM_REDUCE(prod, complexd, double _Complex);
-  // TEST_SHMEM_REDUCE(prod, complexf, float _Complex);
-
-  rocshmem_finalize();
-  return rc;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmem_team_reuse_teams.cpp b/projects/rocshmem/tests/sos_tests/shmem_team_reuse_teams.cpp
deleted file mode 100644
index 54c7611685..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmem_team_reuse_teams.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2019 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(void) {
-  int i, me, npes;
-  int ret = 0, errors = 0;
-
-  rocshmem_init();
-
-  me = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  if (me == 0) printf("Reuse teams test\n");
-
-  rocshmem_team_t old_team, new_team;
-  ret = rocshmem_team_split_strided(ROCSHMEM_TEAM_WORLD, 0, 1, npes, NULL, 0,
-                                     &old_team);
-  if (ret) ++errors;
-
-  /* A total of npes-1 iterations are performed, where the active set in
-   * iteration i includes PEs i..npes-1.  The size of the team decreases by 1
-   * each iteration.  */
-  for (i = 1; i < npes; i++) {
-    if (me == i) {
-      printf("%3d: creating new team (start, stride, size): %3d, %3d, %3d\n",
-             me, rocshmem_team_translate_pe(old_team, 1, ROCSHMEM_TEAM_WORLD),
-             1, rocshmem_team_n_pes(old_team) - 1);
-    }
-
-    ret = rocshmem_team_split_strided(
-        old_team, 1, 1, rocshmem_team_n_pes(old_team) - 1, NULL, 0, &new_team);
-    if (old_team != ROCSHMEM_TEAM_INVALID && ret) ++errors;
-
-    rocshmem_team_destroy(old_team);
-    old_team = new_team;
-  }
-
-  rocshmem_team_destroy(old_team);
-  rocshmem_finalize();
-
-  return errors != 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmem_team_translate.cpp b/projects/rocshmem/tests/sos_tests/shmem_team_translate.cpp
deleted file mode 100644
index 6f4f256a61..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmem_team_translate.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************/
-
-/*
- * rocSHMEM rocshmem_team_translate example to verify the team formed by even
- * ranked PEs from ROCSHMEM_TEAM_WORLD using the team created from
- * rocshmem_team_split_stride operation
- */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int main(void) {
-  int my_pe, npes, errors = 0;
-  int t_pe_2, t_pe_3, t_pe_2_to_3, t_pe_3_to_2;
-  rocshmem_team_t team_2s;
-  rocshmem_team_t team_3s;
-  rocshmem_team_config_t *config;
-
-  rocshmem_init();
-  config = NULL;
-  my_pe = rocshmem_my_pe();
-  npes = rocshmem_n_pes();
-
-  rocshmem_team_split_strided(ROCSHMEM_TEAM_WORLD, 0, 2, ((npes - 1) / 2) + 1,
-                               config, 0, &team_2s);
-  rocshmem_team_split_strided(ROCSHMEM_TEAM_WORLD, 0, 3, ((npes - 1) / 3) + 1,
-                               config, 0, &team_3s);
-
-  t_pe_3 = rocshmem_team_my_pe(team_3s);
-  t_pe_2 = rocshmem_team_my_pe(team_2s);
-  t_pe_3_to_2 = rocshmem_team_translate_pe(team_3s, t_pe_3, team_2s);
-  t_pe_2_to_3 = rocshmem_team_translate_pe(team_2s, t_pe_2, team_3s);
-
-  if (my_pe % 2 == 0 && my_pe % 3 == 0) {
-    if (t_pe_2 == -1 || t_pe_3 == -1 || t_pe_2_to_3 == -1 ||
-        t_pe_3_to_2 == -1) {
-      printf(
-          "ERROR: PE %d, t_pe_2=%d, t_pe_3=%d, t_pe_3_to_2=%d, "
-          "t_pe_2_to_3=%d\n",
-          my_pe, t_pe_2, t_pe_3, t_pe_3_to_2, t_pe_2_to_3);
-      ++errors;
-    }
-  } else if (my_pe % 2 == 0) {
-    if (t_pe_2 == -1 || t_pe_3 != -1 || t_pe_2_to_3 != -1 ||
-        t_pe_3_to_2 != -1) {
-      printf(
-          "ERROR: PE %d, t_pe_2=%d, t_pe_3=%d, t_pe_3_to_2=%d, "
-          "t_pe_2_to_3=%d\n",
-          my_pe, t_pe_2, t_pe_3, t_pe_3_to_2, t_pe_2_to_3);
-      ++errors;
-    }
-  } else if (my_pe % 3 == 0) {
-    if (t_pe_2 != -1 || t_pe_3 == -1 || t_pe_2_to_3 != -1 ||
-        t_pe_3_to_2 != -1) {
-      printf(
-          "ERROR: PE %d, t_pe_2=%d, t_pe_3=%d, t_pe_3_to_2=%d, "
-          "t_pe_2_to_3=%d\n",
-          my_pe, t_pe_2, t_pe_3, t_pe_3_to_2, t_pe_2_to_3);
-      ++errors;
-    }
-  } else {
-    if (t_pe_2 != -1 || t_pe_3 != -1 || t_pe_2_to_3 != -1 ||
-        t_pe_3_to_2 != -1) {
-      printf(
-          "ERROR: PE %d, t_pe_2=%d, t_pe_3=%d, t_pe_3_to_2=%d, "
-          "t_pe_2_to_3=%d\n",
-          my_pe, t_pe_2, t_pe_3, t_pe_3_to_2, t_pe_2_to_3);
-      ++errors;
-    }
-  }
-
-  rocshmem_finalize();
-  return errors != 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/shmem_test.cpp b/projects/rocshmem/tests/sos_tests/shmem_test.cpp
deleted file mode 100644
index cc460a825d..0000000000
--- a/projects/rocshmem/tests/sos_tests/shmem_test.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/* Each PE sends a message to every PE.  PEs wait for all messages to
- * arrive using rocshmem_test to poll the array. */
-
-#include <stdio.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-/* Wait for any entry in the given ivar array to match the wait criteria and
- * return the index of the entry that satisfied the test. */
-static int wait_any(long *ivar, int count, rocshmem_cmps cmp, long value) {
-  int idx = 0;
-  while (!rocshmem_long_test(&ivar[idx], cmp, value)) idx = (idx + 1) % count;
-  return idx;
-}
-
-int main(void) {
-  rocshmem_init();
-  const int mype = rocshmem_my_pe();
-  const int npes = rocshmem_n_pes();
-
-  long *wait_vars = (long *)rocshmem_malloc(npes * sizeof(long));
-  for (int i = 0; i < npes; i++) {
-    wait_vars[i] = 0;
-  }
-
-  /* Put mype+1 to every PE */
-  for (int i = 0; i < npes; i++)
-    rocshmem_long_p(&wait_vars[mype], mype + 1, i);
-
-  int nrecv = 0, errors = 0;
-
-  /* Wait for all messages to arrive */
-  while (nrecv < npes) {
-    int who = wait_any(wait_vars, npes, ROCSHMEM_CMP_NE, 0);
-    if (wait_vars[who] != who + 1) {
-      printf("%d: wait_vars[%d] = %ld, expected %d\n", mype, who,
-             wait_vars[who], who + 1);
-      errors++;
-    }
-    wait_vars[who] = 0;
-    nrecv++;
-  }
-
-  rocshmem_free(wait_vars);
-  rocshmem_finalize();
-  return errors;
-}
diff --git a/projects/rocshmem/tests/sos_tests/sping.cpp b/projects/rocshmem/tests/sos_tests/sping.cpp
deleted file mode 100644
index 055c00c104..0000000000
--- a/projects/rocshmem/tests/sos_tests/sping.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * SHMEM PingPong test
- * :vim:sw=4:ts=4:
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-int getSize(char *);
-double gettime(void);
-double dt(double *, double *);
-void usage(char *);
-void help(char *);
-void printStats(int, int, int, int, double);
-
-#define dprint \
-  if (Verbose) printf
-#define DFLT_MIN_WORDS 128
-#define DFLT_REPS 1000;
-
-int Verbose = 0;
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-int getSize(char *str) {
-  int size;
-  char mod[32];
-
-  switch (sscanf(str, "%d%1[mMkK]", &size, mod)) {
-    case 1:
-      return (size);
-
-    case 2:
-      switch (*mod) {
-        case 'm':
-        case 'M':
-          return (size << 20);
-
-        case 'k':
-        case 'K':
-          return (size << 10);
-
-        default:
-          return (size);
-      }
-
-    default:
-      return (-1);
-  }
-}
-
-double gettime() {
-  struct timeval tv;
-  gettimeofday(&tv, 0);
-  return (tv.tv_sec * 1000000 + tv.tv_usec);
-}
-
-double dt(double *tv1, double *tv2) { return (*tv1 - *tv2); }
-
-void usage(char *name) {
-  fprintf(stderr, "Usage: %s [flags] nwords [maxWords] [incWords]\n", name);
-  fprintf(stderr, " %s -h\n", name);
-  exit(1);
-}
-
-void help(char *name) {
-  if (rocshmem_my_pe() == 0) {
-    printf("Usage: %s [flags] nwords [maxWords] [incWords]\n\n", name);
-    printf(" Flags may be any of\n");
-    printf(" -n number repititions\n");
-    printf(" -e everyone print timing info\n");
-    printf(" -h print this info\n\n");
-    printf(" Numbers may be postfixed with 'k' or 'm'\n\n");
-  }
-  rocshmem_barrier_all();
-  exit(0);
-}
-
-void printStats(int proc, int peer, int doprint, int now, double t) {
-  if (doprint || (proc & 1))
-    printf("%3d pinged %3d: %8d words %9.2f uSec %8.2f MB/s\n", proc, peer, now,
-           t, sizeof(long) * now / (t));
-}
-
-int main(int argc, char *argv[]) {
-  double t, tv[2];
-  int reps = DFLT_REPS;
-  int doprint = 1 /*0*/;
-  char *progName;
-  int minWords;
-  int maxWords;
-  int incWords, nwords, nproc, proc, peer, c, r, i;
-  long *rbuf; /* remote buffer - sink */
-  long *tbuf; /* transmit buffer - src */
-
-  rocshmem_init();
-  proc = rocshmem_my_pe();
-  nproc = rocshmem_n_pes();
-  if (nproc == 1) {
-    fprintf(stderr, "ERR - Requires > 1 Processing Elements\n");
-    rocshmem_finalize();
-    return 0;
-  }
-
-  for (progName = argv[0] + strlen(argv[0]);
-       progName > argv[0] && *(progName - 1) != '/'; progName--)
-    ;
-
-  while ((c = getopt(argc, argv, "n:evh")) != -1) switch (c) {
-      case 'n':
-        if ((reps = getSize(optarg)) <= 0) usage(progName);
-        break;
-      case 'e':
-        doprint++;
-        break;
-      case 'v':
-        Verbose++;
-        break;
-      case 'h':
-        help(progName);
-      default:
-        usage(progName);
-    }
-
-  if (optind == argc)
-    minWords = DFLT_MIN_WORDS;
-  else if ((minWords = getSize(argv[optind++])) <= 0)
-    usage(progName);
-
-  if (optind == argc)
-    maxWords = minWords;
-  else if ((maxWords = getSize(argv[optind++])) < minWords)
-    usage(progName);
-
-  if (optind == argc)
-    incWords = 0;
-  else if ((incWords = getSize(argv[optind++])) < 0)
-    usage(progName);
-
-  if (!(rbuf = (long *)rocshmem_malloc(maxWords * sizeof(long)))) {
-    perror("Failed memory allocation");
-    exit(1);
-  }
-  memset(rbuf, 0, maxWords * sizeof(long));
-
-  if (!(tbuf = (long *)rocshmem_malloc(maxWords * sizeof(long)))) {
-    perror("Failed memory allocation");
-    exit(1);
-  }
-
-  for (i = 0; i < maxWords; i++) tbuf[i] = 1000 + (i & 255);
-
-  if (doprint)
-    printf(
-        "%d(%d): Shmem PING reps %d minWords %d maxWords %d "
-        "incWords %d\n",
-        proc, nproc, reps, minWords, maxWords, incWords);
-
-  dprint("[%d] rbuf: %ld\n", proc, (unsigned long)rbuf);
-
-  rocshmem_barrier_all();
-
-  peer = proc ^ 1;
-  if (peer >= nproc) doprint = 0;
-
-  for (nwords = minWords; nwords <= maxWords;
-       nwords = incWords ? nwords + incWords : nwords ? 2 * nwords : 1) {
-    r = reps;
-    rocshmem_barrier_all();
-    tv[0] = gettime();
-    if (peer < nproc) {
-      if (proc & 1) {
-        r--;
-        rocshmem_long_wait_until(&rbuf[nwords - 1], ROCSHMEM_CMP_NE, 0);
-        rbuf[nwords - 1] = 0;
-      }
-
-      while (r-- > 0) {
-        rocshmem_long_put(rbuf, tbuf, nwords, peer);
-        rocshmem_long_wait_until(&rbuf[nwords - 1], ROCSHMEM_CMP_NE, 0);
-        rbuf[nwords - 1] = 0;
-      }
-
-      if (proc & 1) {
-        rocshmem_long_put(rbuf, tbuf, nwords, peer);
-      }
-    }
-    tv[1] = gettime();
-    t = dt(&tv[1], &tv[0]) / (2 * reps);
-
-    rocshmem_barrier_all();
-
-    printStats(proc, peer, doprint, nwords, t);
-  }
-
-  rocshmem_free(rbuf);
-  rocshmem_free(tbuf);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/thread_wait.cpp b/projects/rocshmem/tests/sos_tests/thread_wait.cpp
deleted file mode 100644
index e8a39cbb56..0000000000
--- a/projects/rocshmem/tests/sos_tests/thread_wait.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* Thread wait test: Test whether a store performed by one thead will wake up a
- * second thread from a call to rocshmem_wait. */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-static long *shr_var;
-
-static void *src_thread_fn(void *arg) {
-  /* Try to get the dst thread to enter wait before the call to sleep */
-  sleep(1);
-
-  /* This should wake up the waiting dst thread */
-  *shr_var = 1;
-
-  /* Quiet should provide a store fence */
-  rocshmem_quiet();
-  return NULL;
-}
-
-static void *dst_thread_fn(void *arg) {
-  rocshmem_long_wait_until(shr_var, ROCSHMEM_CMP_NE, 0);
-  printf("shr_var is now %ld\n", *shr_var);
-  return NULL;
-}
-
-int main(int argc, char *argv[]) {
-  int tl, ret;
-  pthread_t src_thread, dst_thread;
-
-  rocshmem_init_thread(ROCSHMEM_THREAD_MULTIPLE, &tl);
-
-  if (tl != ROCSHMEM_THREAD_MULTIPLE) {
-    printf("Init failed (requested thread level %d, got %d)\n",
-           ROCSHMEM_THREAD_MULTIPLE, tl);
-    rocshmem_global_exit(1);
-  }
-
-  shr_var = (long *)rocshmem_malloc(sizeof(long));
-  *shr_var = 0;
-
-  pthread_create(&dst_thread, NULL, &dst_thread_fn, NULL);
-  pthread_create(&src_thread, NULL, &src_thread_fn, NULL);
-
-  pthread_join(dst_thread, NULL);
-  pthread_join(src_thread, NULL);
-
-  rocshmem_free(shr_var);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/threading.cpp b/projects/rocshmem/tests/sos_tests/threading.cpp
deleted file mode 100644
index 5734bd893d..0000000000
--- a/projects/rocshmem/tests/sos_tests/threading.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-/* For systems without the PThread barrier API (e.g. MacOS) */
-//#include "pthread_barrier.h"
-
-#define N_THREADS 8
-#define N_ELEMS 10
-
-static long *source;
-static long *target;
-pthread_barrier_t fencebar;
-
-static void *roundrobin(void *tparam) {
-  ptrdiff_t tid = (ptrdiff_t)tparam;
-  int offset = tid * N_ELEMS;
-  /* fprintf(stderr,"Starting thread %lu with offset %d\n",tid,offset); */
-
-  int nextpe = (rocshmem_my_pe() + 1) % rocshmem_n_pes();
-  int prevpe = (rocshmem_my_pe() - 1 + rocshmem_n_pes()) % rocshmem_n_pes();
-  rocshmem_long_put(target + offset, source + offset, N_ELEMS, nextpe);
-
-  /* fprintf(stderr,"Thread %lu done first put\n",tid); */
-  pthread_barrier_wait(&fencebar);
-  if (tid == 0) rocshmem_barrier_all();
-  pthread_barrier_wait(&fencebar);
-
-  rocshmem_long_get(source + offset, target + offset, N_ELEMS, prevpe);
-
-  /* fprintf(stderr,"Thread %lu done first get\n",tid); */
-  pthread_barrier_wait(&fencebar);
-  if (tid == 0) rocshmem_barrier_all();
-  pthread_barrier_wait(&fencebar);
-
-  rocshmem_long_get(target + offset, source + offset, N_ELEMS, nextpe);
-
-  /* fprintf(stderr,"Thread %lu done second get\n",tid); */
-  pthread_barrier_wait(&fencebar);
-  if (tid == 0) rocshmem_barrier_all();
-  pthread_barrier_wait(&fencebar);
-  /* fprintf(stderr,"Done thread %lu\n",tid); */
-
-  return 0;
-}
-
-int main(int argc, char *argv[]) {
-  int i;
-
-  int tl;
-  rocshmem_init_thread(ROCSHMEM_THREAD_MULTIPLE, &tl);
-
-  if (tl != ROCSHMEM_THREAD_MULTIPLE) {
-    printf("Init failed (requested thread level %d, got %d)\n",
-           ROCSHMEM_THREAD_MULTIPLE, tl);
-    rocshmem_global_exit(1);
-  }
-
-  if (rocshmem_n_pes() == 1) {
-    printf("%s: Requires number of PEs > 1\n", argv[0]);
-    rocshmem_finalize();
-    return 0;
-  }
-
-  source = (long *)rocshmem_malloc(N_THREADS * N_ELEMS * sizeof(long));
-  target = (long *)rocshmem_malloc(N_THREADS * N_ELEMS * sizeof(long));
-
-  for (i = 0; i < N_THREADS * N_ELEMS; ++i) {
-    source[i] = i + 1;
-  }
-
-  pthread_t threads[N_THREADS];
-
-  pthread_barrier_init(&fencebar, NULL, N_THREADS);
-
-  fprintf(stderr, "Starting threads\n");
-  for (i = 0; i < N_THREADS; ++i) {
-    /* fprintf(stderr,"Starting thread %d\n",i); */
-    ptrdiff_t tid = i;
-    pthread_create(&threads[i], NULL, &roundrobin, (void *)tid);
-  }
-
-  for (i = 0; i < N_THREADS; ++i) {
-    pthread_join(threads[i], NULL);
-  }
-  pthread_barrier_destroy(&fencebar);
-
-  if (0 != memcmp(source, target, sizeof(long) * N_THREADS * N_ELEMS)) {
-    fprintf(stderr, "[%d] Src & Target mismatch?\n", rocshmem_my_pe());
-    for (i = 0; i < 10; ++i) {
-      printf("%ld,%ld ", source[i], target[i]);
-    }
-    printf("\n");
-    rocshmem_global_exit(1);
-  }
-
-  rocshmem_free(source);
-  rocshmem_free(target);
-
-  rocshmem_finalize();
-
-  return 0;
-}
diff --git a/projects/rocshmem/tests/sos_tests/to_all.cpp b/projects/rocshmem/tests/sos_tests/to_all.cpp
deleted file mode 100644
index 3b506df757..0000000000
--- a/projects/rocshmem/tests/sos_tests/to_all.cpp
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * to_all - exercise SHMEM max,min,or,prod,sum,or,xor_to_all() reduction calls.
- *       Each reduction is invoked for all data types:
- *           short, int, long, float, double, long double, long long.
- *       Point being numerous SHMEM atomics and synchronizations in flight.
- *       From OpenSHMEM_specification_v1.0-final doc:
- *           The pWrk and pSync arrays on all PEs in the active set must not be
- *           in use from a prior call to a collective OpenSHMEM routine.
- *
- * frank @ SystemFabric Works identified an interesting overflow issue in the
- * prod_to_all test. In the presence of slightly larger PE counts (>=14),
- * overflow is encountered in short, int and float, double and long double.
- * The short and int both wrap correctly and are both uniformly
- * wrong...uniformly being the salient point. float, double and long double all
- * suffer from floating point rounding errors, hence the FP test results are
- * ignored (assumed to pass)when FP rounding is encountered. FP*_prod_to_all()
- * calls are still made so as not to upset the pSync ordering.
- *
- * usage: to_all {-amopsSv|h}
- *   where:
- *       -a  do not run and_to_all
- *       -m  do not run min_to_all, max_to_all() always run.
- *       -o  do not run or_to_all
- *       -p  do not run prod_to_all
- *       -s  do not run sum_to_all
- *       -x  do not run xor_to_all
- *       -S  Serialize *_to_all() calls with barriers.
- *       -v  verbose(additional -v, more verbose)
- *       -h  this text.
- */
-#include <complex.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define Rprintf \
-  if (rocshmem_my_pe() == 0) printf
-#define Rfprintf \
-  if (rocshmem_my_pe() == 0) fprintf
-#define Vprintf \
-  if (Verbose > 1) printf
-
-int sum_to_all(int me, int npes);
-int and_to_all(int me, int npes);
-int min_to_all(int me, int npes);
-int max_to_all(int me, int npes);
-int prod_to_all(int me, int npes);
-int or_to_all(int me, int npes);
-int xor_to_all(int me, int npes);
-
-int Verbose;
-int Serialize;
-int Min, And, Sum, Prod, Or, Xor;
-int Passed;
-
-long *pSync;
-long *pSync1;
-
-#define N 128
-
-#define MAX(a, b) ((a) > (b)) ? (a) : (b)
-#define WRK_SIZE MAX(N / 2 + 1, ROCSHMEM_REDUCE_MIN_WRKDATA_SIZE)
-
-short *src0, *dst0, *pWrk0;
-int *src1, *dst1, *pWrk1;
-long *src2, *dst2, *pWrk2;
-float *src3, *dst3, *pWrk3;
-double *src4, *dst4, *pWrk4;
-long double *src5, *dst5, *pWrk5;
-long long *src6, *dst6, *pWrk6;
-
-short expected_result0;
-int expected_result1;
-long expected_result2;
-float expected_result3;
-double expected_result4;
-long double expected_result5;
-long long expected_result6;
-
-int ok[7];
-
-int max_to_all(int me, int npes) {
-  int i, j, pass = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src3[i] = src4[i] = src5[i] = src6[i] =
-        me + i;
-  }
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_max_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                 npes, pWrk0, pSync);
-  rocshmem_ctx_int_max_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0, npes,
-                               pWrk1, pSync1);
-  rocshmem_ctx_long_max_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                npes, pWrk2, pSync);
-  rocshmem_ctx_float_max_to_all(ROCSHMEM_CTX_DEFAULT, dst3, src3, N, 0, 0,
-                                 npes, pWrk3, pSync1);
-  rocshmem_ctx_double_max_to_all(ROCSHMEM_CTX_DEFAULT, dst4, src4, N, 0, 0,
-                                  npes, pWrk4, pSync);
-  // rocshmem_ctx_longdouble_max_to_all(ROCSHMEM_CTX_DEFAULT, dst5, src5, N,
-  // 0, 0, npes, pWrk5, pSync1);
-  rocshmem_ctx_longlong_max_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                    npes, pWrk6, pSync);
-
-  if (me == 0) {
-    for (i = 0, j = -1; i < N; i++, j++) {
-      if (dst0[i] != npes + j) ok[0] = 1;
-      if (dst1[i] != npes + j) ok[1] = 1;
-      if (dst2[i] != npes + j) ok[2] = 1;
-      if (dst3[i] != npes + j) ok[3] = 1;
-      if (dst4[i] != npes + j) ok[4] = 1;
-      if (dst5[i] != npes + j) ok[5] = 1;
-      if (dst6[i] != npes + j) ok[6] = 1;
-    }
-
-    if (ok[0] == 1) {
-      printf("Reduction operation rocshmem_short_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_short_max_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[1] == 1) {
-      printf("Reduction operation rocshmem_int_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_int_max_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[2] == 1) {
-      printf("Reduction operation rocshmem_long_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_long_max_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[3] == 1) {
-      printf("Reduction operation rocshmem_float_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_float_max_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[4] == 1) {
-      printf("Reduction operation rocshmem_double_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_double_max_to_all: Passed\n");
-      pass++;
-    }
-    /*
-    if(ok[5]==1){
-      printf("Reduction operation rocshmem_longdouble_max_to_all: Failed\n");
-    }
-    else{
-       Vprintf("Reduction operation rocshmem_longdouble_max_to_all: Passed\n");
-       pass++;
-    }
-    */
-    pass++;
-    if (ok[6] == 1) {
-      printf("Reduction operation rocshmem_longlong_max_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_longlong_max_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 7 ? 1 : 0);
-}
-
-int min_to_all(int me, int npes) {
-  int i, pass = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src3[i] = src4[i] = src5[i] = src6[i] =
-        me + i;
-    dst0[i] = -9;
-    dst1[i] = -9;
-    dst2[i] = -9;
-    dst3[i] = -9;
-    dst4[i] = -9;
-    dst5[i] = -9;
-    dst6[i] = -9;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_min_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                 npes, pWrk0, pSync);
-  rocshmem_ctx_int_min_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0, npes,
-                               pWrk1, pSync1);
-  rocshmem_ctx_long_min_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                npes, pWrk2, pSync);
-  rocshmem_ctx_float_min_to_all(ROCSHMEM_CTX_DEFAULT, dst3, src3, N, 0, 0,
-                                 npes, pWrk3, pSync1);
-  rocshmem_ctx_double_min_to_all(ROCSHMEM_CTX_DEFAULT, dst4, src4, N, 0, 0,
-                                  npes, pWrk4, pSync);
-  // rocshmem_ctx_longdouble_min_to_all(ROCSHMEM_CTX_DEFAULT, dst5, src5, N,
-  // 0, 0, npes, pWrk5, pSync1);
-  rocshmem_ctx_longlong_min_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                    npes, pWrk6, pSync);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      if (dst0[i] != i) ok[0] = 1;
-      if (dst1[i] != i) ok[1] = 1;
-      if (dst2[i] != i) ok[2] = 1;
-      if (dst3[i] != i) ok[3] = 1;
-      if (dst4[i] != i) ok[4] = 1;
-      if (dst5[i] != i) ok[5] = 1;
-      if (dst6[i] != i) ok[6] = 1;
-    }
-    if (ok[0] == 1) {
-      printf("Reduction operation rocshmem_short_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_short_min_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[1] == 1) {
-      printf("Reduction operation rocshmem_int_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_int_min_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[2] == 1) {
-      printf("Reduction operation rocshmem_long_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_long_min_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[3] == 1) {
-      printf("Reduction operation rocshmem_float_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_float_min_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[4] == 1) {
-      printf("Reduction operation rocshmem_double_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_double_min_to_all: Passed\n");
-      pass++;
-    }
-    /*
-    if(ok[5]==1){
-    printf("Reduction operation rocshmem_longdouble_min_to_all: Failed\n");
-    }
-  else{
-    Vprintf("Reduction operation rocshmem_longdouble_min_to_all: Passed\n");
-    pass++;
-    }
-    */
-    pass++;
-    if (ok[6] == 1) {
-      printf("Reduction operation rocshmem_longlong_min_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_longlong_min_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 7 ? 1 : 0);
-}
-
-int sum_to_all(int me, int npes) {
-  int i, pass = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src3[i] = src4[i] = src5[i] = src6[i] = me;
-    dst0[i] = -9;
-    dst1[i] = -9;
-    dst2[i] = -9;
-    dst3[i] = -9;
-    dst4[i] = -9;
-    dst5[i] = -9;
-    dst6[i] = -9;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                 npes, pWrk0, pSync);
-  rocshmem_ctx_int_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0, npes,
-                               pWrk1, pSync1);
-  rocshmem_ctx_long_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                npes, pWrk2, pSync);
-  rocshmem_ctx_float_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst3, src3, N, 0, 0,
-                                 npes, pWrk3, pSync1);
-  rocshmem_ctx_double_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst4, src4, N, 0, 0,
-                                  npes, pWrk4, pSync);
-  // rocshmem_ctx_longdouble_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst5, src5, N,
-  // 0, 0, npes, pWrk5, pSync1);
-  rocshmem_ctx_longlong_sum_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                    npes, pWrk6, pSync);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      if (dst0[i] != (short)(npes * (npes - 1) / 2)) ok[0] = 1;
-      if (dst1[i] != (int)(npes * (npes - 1) / 2)) ok[1] = 1;
-      if (dst2[i] != (long)(npes * (npes - 1) / 2)) ok[2] = 1;
-      if (dst3[i] != (float)(npes * (npes - 1) / 2)) ok[3] = 1;
-      if (dst4[i] != (double)(npes * (npes - 1) / 2)) ok[4] = 1;
-      if (dst5[i] != (long double)(npes * (npes - 1) / 2)) ok[5] = 1;
-      if (dst6[i] != (long long)(npes * (npes - 1) / 2)) ok[6] = 1;
-    }
-    if (ok[0] == 1) {
-      printf("Reduction operation rocshmem_short_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_short_sum_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[1] == 1) {
-      printf("Reduction operation rocshmem_int_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_int_sum_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[2] == 1) {
-      printf("Reduction operation rocshmem_long_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_long_sum_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[3] == 1) {
-      printf("Reduction operation rocshmem_float_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_float_sum_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[4] == 1) {
-      printf("Reduction operation rocshmem_double_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_double_sum_to_all: Passed\n");
-      pass++;
-    }
-    /*
-    if(ok[5]==1){
-      printf("Reduction operation rocshmem_longdouble_sum_to_all: Failed\n");
-    }
-    else{
-      Vprintf("Reduction operation rocshmem_longdouble_sum_to_all: Passed\n");
-      pass++;
-    }
-    */
-    pass++;
-    if (ok[6] == 1) {
-      printf("Reduction operation rocshmem_longlong_sum_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_longlong_sum_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-    fflush(stdout);
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 7 ? 1 : 0);
-}
-
-int and_to_all(int me, int num_pes) {
-  int i, pass = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src6[i] = me;
-    dst0[i] = dst1[i] = dst2[i] = dst6[i] = -9;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_and_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                 num_pes, pWrk0, pSync);
-  rocshmem_ctx_int_and_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0,
-                               num_pes, pWrk1, pSync1);
-  rocshmem_ctx_long_and_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                num_pes, pWrk2, pSync);
-  rocshmem_ctx_longlong_and_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                    num_pes, pWrk6, pSync1);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      if (dst0[i] != 0) ok[0] = 1;
-      if (dst1[i] != 0) ok[1] = 1;
-      if (dst2[i] != 0) ok[2] = 1;
-      if (dst6[i] != 0) ok[3] = 1;
-    }
-
-    if (ok[0] == 1) {
-      printf("Reduction operation rocshmem_short_and_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_short_and_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[1] == 1) {
-      printf("Reduction operation rocshmem_int_and_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_int_and_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[2] == 1) {
-      printf("Reduction operation rocshmem_long_and_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_long_and_to_all: Passed\n");
-      pass++;
-    }
-    if (ok[3] == 1) {
-      printf("Reduction operation rocshmem_longlong_and_to_all: Failed\n");
-    } else {
-      Vprintf("Reduction operation rocshmem_longlong_and_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-    fflush(stdout);
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 4 ? 1 : 0);
-}
-
-int prod_to_all(int me, int npes) {
-  int i, pass = 0;
-  int float_rounding_err = 0;
-  int double_rounding_err = 0;
-  int ldouble_rounding_err = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src3[i] = src4[i] = src5[i] = src6[i] =
-        me + 1;
-    dst0[i] = -9;
-    dst1[i] = -9;
-    dst2[i] = -9;
-    dst3[i] = -9;
-    dst4[i] = -9;
-    dst5[i] = -9;
-    dst6[i] = -9;
-  }
-
-  expected_result0 = expected_result1 = expected_result2 = expected_result6 = 1;
-  expected_result3 = expected_result4 = expected_result5 = 1.0;
-
-  for (i = 1; i <= npes; i++) {
-    expected_result0 *= i;
-    expected_result1 *= i;
-    expected_result2 *= i;
-    expected_result3 *= (float)i;
-    expected_result4 *= (double)i;
-    if ((double)expected_result3 != expected_result4) {
-      if (!float_rounding_err && Verbose > 2 && me == 0)
-        printf("float_err @ npes %d\n", i);
-      float_rounding_err = 1;
-    }
-    expected_result5 *= (long double)i;
-    if ((long double)expected_result4 != expected_result5) {
-      if (!double_rounding_err && Verbose > 2 && me == 0)
-        printf("double_err @ npes %d\n", i);
-      ldouble_rounding_err = double_rounding_err = 1;
-    }
-    expected_result6 *= i;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                  npes, pWrk0, pSync);
-  rocshmem_ctx_int_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0,
-                                npes, pWrk1, pSync1);
-  rocshmem_ctx_long_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                 npes, pWrk2, pSync);
-  rocshmem_ctx_float_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst3, src3, N, 0, 0,
-                                  npes, pWrk3, pSync1);
-  rocshmem_ctx_double_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst4, src4, N, 0, 0,
-                                   npes, pWrk4, pSync);
-  // rocshmem_ctx_longdouble_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst5, src5, N,
-  // 0, 0, npes, pWrk5, pSync1);
-  rocshmem_ctx_longlong_prod_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                     npes, pWrk6, pSync);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      if (dst0[i] != expected_result0) ok[0] = 1;
-      if (dst1[i] != expected_result1) ok[1] = 1;
-      if (dst2[i] != expected_result2) ok[2] = 1;
-
-      /* check for overflow */
-      if (!float_rounding_err && dst3[i] != expected_result3) {
-        ok[3] = 1;
-        printf("dst3[%d]: %f, expected val: %f\n", i, dst3[i],
-               expected_result3);
-      }
-      if (!double_rounding_err && dst4[i] != expected_result4) {
-        ok[4] = 1;
-        printf("dst4[%d]: %f, expected val: %f\n", i, dst4[i],
-               expected_result4);
-      }
-      /*
-      if(!ldouble_rounding_err && dst5[i] != expected_result5) {ok[5] = 1;
-          printf("dst5[%d]: %Lf, expected val: %Lf T4 %f\n",i, dst5[i],
-      expected_result5,dst4[i]);
-      }
-      */
-      if (dst6[i] != expected_result6) ok[6] = 1;
-    }
-
-    if (ok[0] == 1)
-      printf("Reduction operation rocshmem_short_prod_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_short_prod_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[1] == 1)
-      printf("Reduction operation rocshmem_int_prod_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_int_prod_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[2] == 1)
-      printf("Reduction operation rocshmem_long_prod_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_long_prod_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[3] == 1)
-      printf("Reduction operation rocshmem_float_prod_to_all: Failed\n");
-    else {
-      if (float_rounding_err) {
-        Vprintf(
-            "Reduction operation rocshmem_float_prod_to_all: skipped due to "
-            "float rounding error\n");
-      } else {
-        Vprintf("Reduction operation rocshmem_float_prod_to_all: Passed\n");
-      }
-      pass++;
-    }
-
-    if (ok[4] == 1)
-      printf("Reduction operation rocshmem_double_prod_to_all: Failed\n");
-    else {
-      if (double_rounding_err) {
-        Vprintf(
-            "Reduction operation rocshmem_double_prod_to_all: skipped due to "
-            "double rounding error\n");
-      } else {
-        Vprintf("Reduction operation rocshmem_double_prod_to_all: Passed\n");
-      }
-      pass++;
-    }
-
-    /*
-    if(ok[5]==1)
-      printf("Reduction operation rocshmem_longdouble_prod_to_all: Failed\n");
-    else {
-      if (double_rounding_err) {
-          Vprintf("Reduction operation rocshmem_longdouble_prod_to_all: skipped
-    due to long double rounding error\n");
-      }
-      else {
-          Vprintf("Reduction operation rocshmem_longdouble_prod_to_all:
-    Passed\n");
-      }
-      pass++;
-    }
-    */
-    pass++;
-
-    if (ok[6] == 1)
-      printf("Reduction operation rocshmem_longlong_prod_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_longlong_prod_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 7 ? 1 : 0);
-}
-
-int or_to_all(int me, int npes) {
-  int i, pass = 0;
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src6[i] = (me + 1) % 4;
-    dst0[i] = -9;
-    dst1[i] = -9;
-    dst2[i] = -9;
-    dst6[i] = -9;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_or_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                npes, pWrk0, pSync);
-  rocshmem_ctx_int_or_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0, npes,
-                              pWrk1, pSync1);
-  rocshmem_ctx_long_or_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0, npes,
-                               pWrk2, pSync);
-  rocshmem_ctx_longlong_or_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                   npes, pWrk6, pSync1);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      int expected = (npes == 1) ? 1 : 3;
-
-      if (dst0[i] != expected) ok[0] = 1;
-      if (dst1[i] != expected) ok[1] = 1;
-      if (dst2[i] != expected) ok[2] = 1;
-      if (dst6[i] != expected) ok[6] = 1;
-    }
-
-    if (ok[0] == 1)
-      printf("Reduction operation rocshmem_short_or_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_short_or_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[1] == 1)
-      printf("Reduction operation rocshmem_int_or_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_int_or_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[2] == 1)
-      printf("Reduction operation rocshmem_long_or_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_long_or_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[6] == 1)
-      printf("Reduction operation rocshmem_longlong_or_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_longlong_or_to_all: Passed\n");
-      pass++;
-    }
-    Vprintf("\n");
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 4 ? 1 : 0);
-}
-
-int xor_to_all(int me, int npes) {
-  int i, pass = 0;
-  int expected_result = ((int)(npes / 2) % 2);
-
-  memset(ok, 0, sizeof(ok));
-
-  for (i = 0; i < N; i++) {
-    src0[i] = src1[i] = src2[i] = src6[i] = me % 2;
-    dst0[i] = -9;
-    dst1[i] = -9;
-    dst2[i] = -9;
-    dst6[i] = -9;
-  }
-
-  rocshmem_barrier_all();
-
-  rocshmem_ctx_short_xor_to_all(ROCSHMEM_CTX_DEFAULT, dst0, src0, N, 0, 0,
-                                 npes, pWrk0, pSync);
-  rocshmem_ctx_int_xor_to_all(ROCSHMEM_CTX_DEFAULT, dst1, src1, N, 0, 0, npes,
-                               pWrk1, pSync1);
-  rocshmem_ctx_long_xor_to_all(ROCSHMEM_CTX_DEFAULT, dst2, src2, N, 0, 0,
-                                npes, pWrk2, pSync);
-  rocshmem_ctx_longlong_xor_to_all(ROCSHMEM_CTX_DEFAULT, dst6, src6, N, 0, 0,
-                                    npes, pWrk6, pSync1);
-
-  if (me == 0) {
-    for (i = 0; i < N; i++) {
-      if (dst0[i] != expected_result) ok[0] = 1;
-      if (dst1[i] != expected_result) ok[1] = 1;
-      if (dst2[i] != expected_result) ok[2] = 1;
-      if (dst6[i] != expected_result) ok[6] = 1;
-    }
-
-    if (ok[0] == 1)
-      printf("Reduction operation rocshmem_short_xor_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_short_xor_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[1] == 1)
-      printf("Reduction operation rocshmem_int_xor_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_int_xor_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[2] == 1)
-      printf("Reduction operation rocshmem_long_xor_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_long_xor_to_all: Passed\n");
-      pass++;
-    }
-
-    if (ok[6] == 1)
-      printf("Reduction operation rocshmem_longlong_xor_to_all: Failed\n");
-    else {
-      Vprintf("Reduction operation rocshmem_longlong_xor_to_all: Passed\n");
-      pass++;
-    }
-
-    Vprintf("\n");
-  }
-  if (Serialize) rocshmem_barrier_all();
-
-  return (pass == 4 ? 1 : 0);
-}
-
-int main(int argc, char *argv[]) {
-  int c, i, mype, num_pes, tests, passed;
-  char *pgm;
-
-  rocshmem_init();
-  mype = rocshmem_my_pe();
-  num_pes = rocshmem_n_pes();
-
-  if ((pgm = strrchr(argv[0], '/'))) {
-    pgm++;
-  } else {
-    pgm = argv[0];
-  }
-
-  while ((c = getopt(argc, argv, "ampsSoxhv")) != -1) {
-    switch (c) {
-      case 'a':
-        And++;  // do not run and_to_all
-        break;
-      case 'm':
-        Min++;  // do not run min_to_all
-        break;
-      case 'o':
-        Or++;  // do not run or_to_all
-        break;
-      case 'p':
-        Prod++;  // do not run prod_to_all
-        break;
-      case 's':
-        Sum++;  // do not run sum_to_all
-        break;
-      case 'x':
-        Xor++;  // do not run xor_to_all
-        break;
-      case 'S':
-        Serialize++;
-        break;
-      case 'v':
-        Verbose++;
-        break;
-      case 'h':
-      default:
-        Rfprintf(stderr, "usage: %s {-v(verbose)|h(help)}\n", pgm);
-        rocshmem_finalize();
-        return 1;
-    }
-  }
-
-  tests = passed = 0;
-
-  pSync = (long *)rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE * sizeof(long));
-  pSync1 = (long *)rocshmem_malloc(ROCSHMEM_BCAST_SYNC_SIZE * sizeof(long));
-  if (!pSync || !pSync1) {
-    fprintf(stderr, "ERR: cannot allocate one of the pSync arrays\n");
-  }
-
-  for (i = 0; i < ROCSHMEM_REDUCE_SYNC_SIZE; i++) {
-    pSync[i] = ROCSHMEM_SYNC_VALUE;
-    pSync1[i] = ROCSHMEM_SYNC_VALUE;
-  }
-
-  pWrk0 = (short *)rocshmem_malloc(WRK_SIZE * sizeof(short));
-  pWrk1 = (int *)rocshmem_malloc(WRK_SIZE * sizeof(int));
-  pWrk2 = (long *)rocshmem_malloc(WRK_SIZE * sizeof(long));
-  pWrk3 = (float *)rocshmem_malloc(WRK_SIZE * sizeof(float));
-  pWrk4 = (double *)rocshmem_malloc(WRK_SIZE * sizeof(double));
-  pWrk5 = (long double *)rocshmem_malloc(WRK_SIZE * sizeof(long double));
-  pWrk6 = (long long *)rocshmem_malloc(WRK_SIZE * sizeof(long long));
-  if (!pWrk0 || !pWrk1 || !pWrk2 || !pWrk3 || !pWrk4 || !pWrk5 || !pWrk6) {
-    fprintf(stderr, "ERR: cannot allocate one of the pWrk arrays\n");
-  }
-
-  src0 = (short *)rocshmem_malloc(N * sizeof(short));
-  src1 = (int *)rocshmem_malloc(N * sizeof(int));
-  src2 = (long *)rocshmem_malloc(N * sizeof(long));
-  src3 = (float *)rocshmem_malloc(N * sizeof(float));
-  src4 = (double *)rocshmem_malloc(N * sizeof(double));
-  src5 = (long double *)rocshmem_malloc(N * sizeof(long double));
-  src6 = (long long *)rocshmem_malloc(N * sizeof(long long));
-  if (!src0 || !src1 || !src2 || !src3 || !src4 || !src5 || !src6) {
-    fprintf(stderr, "ERR: cannot allocate one of the src arrays\n");
-  }
-
-  dst0 = (short *)rocshmem_malloc(N * sizeof(short));
-  dst1 = (int *)rocshmem_malloc(N * sizeof(int));
-  dst2 = (long *)rocshmem_malloc(N * sizeof(long));
-  dst3 = (float *)rocshmem_malloc(N * sizeof(float));
-  dst4 = (double *)rocshmem_malloc(N * sizeof(double));
-  dst5 = (long double *)rocshmem_malloc(N * sizeof(long double));
-  dst6 = (long long *)rocshmem_malloc(N * sizeof(long long));
-  if (!dst0 || !dst1 || !dst2 || !dst3 || !dst4 || !dst5 || !dst6) {
-    fprintf(stderr, "ERR: cannot allocate one of the dst arrays\n");
-  }
-
-  rocshmem_barrier_all();
-
-  passed += max_to_all(mype, num_pes);
-  tests++;
-
-  if (!Min) {
-    passed += min_to_all(mype, num_pes);
-    tests++;
-  }
-
-  if (!Sum) {
-    passed += sum_to_all(mype, num_pes);
-    tests++;
-  }
-
-  if (!And) {
-    passed += and_to_all(mype, num_pes);
-    tests++;
-  }
-
-  if (!Prod) {
-    passed += prod_to_all(mype, num_pes);
-    tests++;
-  }
-
-  if (!Or) {
-    passed += or_to_all(mype, num_pes);
-    tests++;
-  }
-
-  if (!Xor) {
-    passed += xor_to_all(mype, num_pes);
-    tests++;
-  }
-
-  c = 0;
-  if (mype == 0) {
-    if ((Verbose || tests != passed))
-      fprintf(stderr, "to_all[%d] %d of %d tests passed\n", mype, passed,
-              tests);
-    c = (tests == passed ? 0 : 1);
-  }
-
-  rocshmem_free(pSync);
-  rocshmem_free(pSync1);
-
-  rocshmem_free(pWrk0);
-  rocshmem_free(pWrk1);
-  rocshmem_free(pWrk2);
-  rocshmem_free(pWrk3);
-  rocshmem_free(pWrk4);
-  rocshmem_free(pWrk5);
-  rocshmem_free(pWrk6);
-
-  rocshmem_free(src0);
-  rocshmem_free(src1);
-  rocshmem_free(src2);
-  rocshmem_free(src3);
-  rocshmem_free(src4);
-  rocshmem_free(src5);
-  rocshmem_free(src6);
-
-  rocshmem_free(dst0);
-  rocshmem_free(dst1);
-  rocshmem_free(dst2);
-  rocshmem_free(dst3);
-  rocshmem_free(dst4);
-  rocshmem_free(dst5);
-  rocshmem_free(dst6);
-
-  rocshmem_finalize();
-
-  return c;
-}
diff --git a/projects/rocshmem/tests/sos_tests/waituntil.cpp b/projects/rocshmem/tests/sos_tests/waituntil.cpp
deleted file mode 100644
index 2b18655ab9..0000000000
--- a/projects/rocshmem/tests/sos_tests/waituntil.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2011 Sandia Corporation. Under the terms of Contract
- * DE-AC04-94AL85000 with Sandia Corporation, the U.S.  Government
- * retains certain rights in this software.
- *
- *  Copyright (c) 2017 Intel Corporation. All rights reserved.
- *  This software is available to you under the BSD license below:
- *
- *      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.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * exercise rocshmem_short_wait() and rocshmem_short_wait_until() functions.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rocshmem/rocshmem.hpp>
-
-using namespace rocshmem;
-
-#define DataType long
-
-#define SHM_PUT rocshmem_long_put
-#define SHM_PUTP rocshmem_long_p
-#define SHM_GETP rocshmem_long_g
-
-#define SHM_WAITU rocshmem_long_wait_until
-#define PF "%ld"
-
-#define Vprintf \
-  if (Verbose) printf
-
-int main(int argc, char *argv[]) {
-  DataType source[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-  DataType *target;
-  DataType *pong;
-  DataType *t2 = NULL;
-  int me, num_pes, pe, Verbose = 0;
-
-  if (argc > 1 && (strcmp(argv[1], "-v") == 0)) {
-    Verbose++;
-  }
-
-  rocshmem_init();
-  me = rocshmem_my_pe();
-  num_pes = rocshmem_n_pes();
-
-  if (num_pes == 1) {
-    printf("%s: Requires number of PEs > 1\n", argv[0]);
-    rocshmem_finalize();
-    return 0;
-  }
-
-  target = (DataType *)rocshmem_malloc(10 * sizeof(DataType));
-
-  pong = (DataType *)rocshmem_malloc(sizeof(DataType));
-  *pong = 666;
-
-  t2 = (DataType *)rocshmem_malloc(10 * sizeof(DataType));
-  if (!t2) {
-    if (me == 0) printf("rocshmem_malloc() failed?\n");
-    rocshmem_global_exit(1);
-  }
-  t2[9] = target[9] = 0xFF;
-
-  rocshmem_barrier_all();
-
-  if (me == 0) {
-    memset(target, 0, 10 * sizeof(DataType));
-    for (pe = 1; pe < num_pes; pe++) SHM_PUT(target, target, 10, pe);
-
-    for (pe = 1; pe < num_pes; pe++) /* put 10 elements into target on PE 1 */
-      SHM_PUT(target, source, 10, pe);
-
-    SHM_WAITU(pong, ROCSHMEM_CMP_GT, 666);
-    Vprintf("PE[%d] pong now " PF "\n", me, *pong);
-
-    for (pe = 1; pe < num_pes; pe++) /* put 1 element into t2 on PE 1 */
-      SHM_PUTP(&t2[9], 0xDD, pe);
-  } else {
-    /* wait for 10th element write of 'target' */
-    SHM_WAITU(&target[9], ROCSHMEM_CMP_NE, 0xFF);
-    Vprintf("PE[%d] target[9] was 255 now " PF ", success.\n", me, target[9]);
-
-    SHM_WAITU(&target[9], ROCSHMEM_CMP_EQ, 10);
-    Vprintf("PE[%d] expected target[9] == 10 now " PF "\n", me, target[9]);
-
-    if (me == 1) {
-      if (Verbose) {
-        DataType tmp = SHM_GETP(pong, 0);
-        printf("PE[%d] @ PE[0] pong == " PF ", setting to 999\n", me, tmp);
-      }
-      SHM_PUTP(pong, 999, 0);
-    }
-
-    SHM_WAITU(&t2[9], ROCSHMEM_CMP_NE, 0xFF);
-  }
-
-  // rocshmem_barrier_all();  /* sync sender and receiver */
-
-  if (me != 0) {
-    if (memcmp(source, target, sizeof(DataType) * 10) != 0) {
-      int i;
-      fprintf(stderr, "[%d] Src & Target mismatch?\n", me);
-      for (i = 0; i < 10; ++i) {
-        printf(PF "," PF " ", source[i], target[i]);
-      }
-      printf("\n");
-      rocshmem_global_exit(1);
-    }
-  }
-  rocshmem_free(t2);
-
-  if (Verbose) fprintf(stderr, "[%d] exit\n", rocshmem_my_pe());
-
-  rocshmem_finalize();
-  return 0;
-}
diff --git a/projects/rocshmem/tests/unit_tests/CMakeLists.txt b/projects/rocshmem/tests/unit_tests/CMakeLists.txt
index 6d25509848..5c52f9aead 100644
--- a/projects/rocshmem/tests/unit_tests/CMakeLists.txt
+++ b/projects/rocshmem/tests/unit_tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 ###############################################################################
-# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.cpp b/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.cpp
index bfb64afed0..e184878a64 100644
--- a/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.hpp b/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.hpp
index 2a5191aefc..b52ed0dcee 100644
--- a/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/abql_block_mutex_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/address_record_gtest.cpp b/projects/rocshmem/tests/unit_tests/address_record_gtest.cpp
index 3524034054..4bd8e92d0a 100644
--- a/projects/rocshmem/tests/unit_tests/address_record_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/address_record_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/address_record_gtest.hpp b/projects/rocshmem/tests/unit_tests/address_record_gtest.hpp
index 6e9713209e..d38b9de9d0 100644
--- a/projects/rocshmem/tests/unit_tests/address_record_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/address_record_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.cpp b/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.cpp
index 69b8a00000..40a2ec00ba 100644
--- a/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.hpp b/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.hpp
index 2fdb8f86ec..5474667cd7 100644
--- a/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/atomic_wf_queue_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/bin_gtest.cpp b/projects/rocshmem/tests/unit_tests/bin_gtest.cpp
index 443a6f1eaa..7d59bd32ca 100644
--- a/projects/rocshmem/tests/unit_tests/bin_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/bin_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/bin_gtest.hpp b/projects/rocshmem/tests/unit_tests/bin_gtest.hpp
index 580e3f375f..12d4221ea2 100644
--- a/projects/rocshmem/tests/unit_tests/bin_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/bin_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/binner_gtest.cpp b/projects/rocshmem/tests/unit_tests/binner_gtest.cpp
index 178b158179..756a3445ee 100644
--- a/projects/rocshmem/tests/unit_tests/binner_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/binner_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/binner_gtest.hpp b/projects/rocshmem/tests/unit_tests/binner_gtest.hpp
index 3f9a02ff54..48d6ebf73d 100644
--- a/projects/rocshmem/tests/unit_tests/binner_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/binner_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/bitwise_gtest.cpp b/projects/rocshmem/tests/unit_tests/bitwise_gtest.cpp
index df7f8bd806..23d30a59d9 100644
--- a/projects/rocshmem/tests/unit_tests/bitwise_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/bitwise_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/bitwise_gtest.hpp b/projects/rocshmem/tests/unit_tests/bitwise_gtest.hpp
index e6770a7c7f..ee480200a1 100644
--- a/projects/rocshmem/tests/unit_tests/bitwise_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/bitwise_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/free_list_gtest.cpp b/projects/rocshmem/tests/unit_tests/free_list_gtest.cpp
index df282fa3cd..f468421181 100644
--- a/projects/rocshmem/tests/unit_tests/free_list_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/free_list_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/free_list_gtest.hpp b/projects/rocshmem/tests/unit_tests/free_list_gtest.hpp
index 66d3452baa..8850ad375b 100644
--- a/projects/rocshmem/tests/unit_tests/free_list_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/free_list_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/heap_memory_gtest.cpp b/projects/rocshmem/tests/unit_tests/heap_memory_gtest.cpp
index 16b3aa0a64..6bcb739425 100644
--- a/projects/rocshmem/tests/unit_tests/heap_memory_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/heap_memory_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/heap_memory_gtest.hpp b/projects/rocshmem/tests/unit_tests/heap_memory_gtest.hpp
index bc905e3410..545a0c734a 100644
--- a/projects/rocshmem/tests/unit_tests/heap_memory_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/heap_memory_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.cpp b/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.cpp
index 598952c0e6..ed4a4526dc 100644
--- a/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.hpp b/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.hpp
index d6d341a57b..901176fa4a 100644
--- a/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/hipmalloc_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/index_strategy_gtest.cpp b/projects/rocshmem/tests/unit_tests/index_strategy_gtest.cpp
index 53b9fad314..751173a1d6 100644
--- a/projects/rocshmem/tests/unit_tests/index_strategy_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/index_strategy_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/index_strategy_gtest.hpp b/projects/rocshmem/tests/unit_tests/index_strategy_gtest.hpp
index d82d3066b3..0cd9e7c3f2 100644
--- a/projects/rocshmem/tests/unit_tests/index_strategy_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/index_strategy_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.cpp b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.cpp
index 2b48798069..636a4f9f9c 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.hpp b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.hpp
index 5b536fabe7..23b46bd293 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_coarse_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.cpp b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.cpp
index 79feb063ee..ae985aa15d 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.hpp b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.hpp
index 55b0757452..d5204d5dd9 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_simple_fine_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.cpp b/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.cpp
index 723b6ddeeb..7522d46afe 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.hpp b/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.hpp
index f66ccfff7c..842886bbc1 100644
--- a/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/ipc_impl_tiled_fine_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.cpp b/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.cpp
index c65ff88820..06fd25231d 100644
--- a/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.hpp b/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.hpp
index 8fd4446996..4f07dafbcc 100644
--- a/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/mpi_init_singleton_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/notifier_gtest.cpp b/projects/rocshmem/tests/unit_tests/notifier_gtest.cpp
index d3b699e3d9..3b8506948b 100644
--- a/projects/rocshmem/tests/unit_tests/notifier_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/notifier_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/notifier_gtest.hpp b/projects/rocshmem/tests/unit_tests/notifier_gtest.hpp
index e130159b2e..8d74fb08cc 100644
--- a/projects/rocshmem/tests/unit_tests/notifier_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/notifier_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.cpp b/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.cpp
index cb328644e5..82189e181a 100644
--- a/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.hpp b/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.hpp
index 3b951154e6..9a39570417 100644
--- a/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/pow2_bins_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.cpp b/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.cpp
index 6282d8b154..aec061d61f 100644
--- a/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.hpp b/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.hpp
index 3c23dd7a86..1e3125e2bb 100644
--- a/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/remote_heap_info_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/shmem_gtest.cpp b/projects/rocshmem/tests/unit_tests/shmem_gtest.cpp
index 8536ca638a..68622e98c9 100644
--- a/projects/rocshmem/tests/unit_tests/shmem_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/shmem_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/single_heap_gtest.cpp b/projects/rocshmem/tests/unit_tests/single_heap_gtest.cpp
index d95cad85f0..afd77f05a3 100644
--- a/projects/rocshmem/tests/unit_tests/single_heap_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/single_heap_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/single_heap_gtest.hpp b/projects/rocshmem/tests/unit_tests/single_heap_gtest.hpp
index 034dae4f3d..8fd9c03460 100644
--- a/projects/rocshmem/tests/unit_tests/single_heap_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/single_heap_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.cpp b/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.cpp
index 0885743166..7f79dc1c6d 100644
--- a/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.hpp b/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.hpp
index b208965e8d..a7cb2bd1d2 100644
--- a/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/symmetric_heap_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.cpp b/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.cpp
index 114ecd2662..96a6c35373 100644
--- a/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.cpp
+++ b/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.cpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.hpp b/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.hpp
index 0ea683b14b..d083011a6d 100644
--- a/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.hpp
+++ b/projects/rocshmem/tests/unit_tests/wavefront_size_gtest.hpp
@@ -1,5 +1,7 @@
 /******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -13,7 +15,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
diff --git a/projects/rocshmem/utils/header_files_gen/AMO.py b/projects/rocshmem/utils/header_files_gen/AMO.py
index afee8d0f43..74e8b8d7df 100644
--- a/projects/rocshmem/utils/header_files_gen/AMO.py
+++ b/projects/rocshmem/utils/header_files_gen/AMO.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/COLL.py b/projects/rocshmem/utils/header_files_gen/COLL.py
index 2bf899699a..a3e68a5e85 100644
--- a/projects/rocshmem/utils/header_files_gen/COLL.py
+++ b/projects/rocshmem/utils/header_files_gen/COLL.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/P2P_SYNC.py b/projects/rocshmem/utils/header_files_gen/P2P_SYNC.py
index 430e0b8aed..72aac15847 100644
--- a/projects/rocshmem/utils/header_files_gen/P2P_SYNC.py
+++ b/projects/rocshmem/utils/header_files_gen/P2P_SYNC.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/RMA.py b/projects/rocshmem/utils/header_files_gen/RMA.py
index cf12a3c3fa..cce93b65fc 100644
--- a/projects/rocshmem/utils/header_files_gen/RMA.py
+++ b/projects/rocshmem/utils/header_files_gen/RMA.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/RMA_X.py b/projects/rocshmem/utils/header_files_gen/RMA_X.py
index 705731fa53..87df7b9ac3 100644
--- a/projects/rocshmem/utils/header_files_gen/RMA_X.py
+++ b/projects/rocshmem/utils/header_files_gen/RMA_X.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/SIG_OP.py b/projects/rocshmem/utils/header_files_gen/SIG_OP.py
index b9880c0d0a..b7ff1a597a 100644
--- a/projects/rocshmem/utils/header_files_gen/SIG_OP.py
+++ b/projects/rocshmem/utils/header_files_gen/SIG_OP.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
-"""
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import os
 
diff --git a/projects/rocshmem/utils/header_files_gen/header_files_gen.py b/projects/rocshmem/utils/header_files_gen/header_files_gen.py
index ca7268298a..99d905ca1b 100644
--- a/projects/rocshmem/utils/header_files_gen/header_files_gen.py
+++ b/projects/rocshmem/utils/header_files_gen/header_files_gen.py
@@ -1,26 +1,26 @@
-"""
-******************************************************************************
- * Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *****************************************************************************
- """
+###############################################################################
+# Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+###############################################################################
 
 import argparse
 from RMA import generate_RMA_header