Added CTI and aarch64 changes

1. Added Cray Inc. contributed changes for both Cray Tools Interface (CTI)
support and base support for aarch64 systems.

2. Removed cobo test Makefile.in.

3. A few minor changes from code review.

Author: Andrew Gontarek

AUTHORS

@@ -2,3 +2,4 @@ Dong H. Ahn (LLNL)
 Matt LeGendre (LLNL)
 Gregory Lee (LLNL)
 Andrew Gontarek (Cray Inc)
+Karen Davis (Cray Inc)

config.h.in

@@ -242,6 +242,9 @@
 /* Define 1 for SUB_ARCH_BGQ */
 #undef SUB_ARCH_BGQ
 
+/* Define 1 for SUB_ARCH_CRAY */
+#undef SUB_ARCH_CRAY
+
 /* Define os-isa string */
 #undef TARGET_OS_ISA_STRING
 

config/x_ac_platform.m4

@@ -28,6 +28,8 @@
 # --------------------------------------------------------------------------------
 #
 #   Update Log:
+#         May 02 2018 KMD: Added aarch64 support
+#         Apr 01 2015 ADG: Added Cray CTI support.
 #         Feb 20 2015 [email protected]: Fixes for Cray systems.
 #         Jun 11 2008 DHA: File created.
 #
@@ -66,6 +68,11 @@ AC_DEFUN([X_AC_PLATFORM], [
               AC_SUBST(LNCHR_BIT_FLAGS, -m64)
               AC_DEFINE(BIT64, 1, [64bit])
               ;;
+    *aarch64*)AC_DEFINE(AARCH64_ARCHITECTURE,1,[Define 1 for AARCH64_ARCHITECTURE])
+              ac_have_known_isa="yes"
+              ac_target_isa="aarch64"
+	      AC_DEFINE(BIT64, 1, [64bit])
+              ;;
     *i686*)   AC_DEFINE(X86_ARCHITECTURE,1,[Define 1 for X86_ARCHITECTURE])
               ac_have_known_isa="yes"
               ac_target_isa="x86"
@@ -118,8 +125,24 @@ AC_DEFUN([X_AC_PLATFORM], [
         AC_SUBST(ARCHHEADER,"/")
         AC_SUBST(ARCHLIB,"/")
     fi
-  elif test "x$ac_target_os" = "xlinux" -a "x$ac_target_isa" = "xx86_64"; then
-    if test -f "/opt/cray/alps/default/bin/aprun"; then
+  elif test "x$ac_target_os" = "xlinux" -a "x$ac_target_isa" = "xx86_64" \
+      -o "x$ac_target_os" = "xlinux" -a "x$ac_target_isa" = "xaarch64"; then
+    #
+    # Check for Cray CTI before falling back to the alps method.
+    #
+    PKG_CHECK_EXISTS([craytools_fe], [ac_have_cray_cti="yes"], [ac_have_cray_cti="no"])
+    if test "x$ac_have_cray_cti" = "xyes"; then
+      AC_DEFINE(SUB_ARCH_CRAY,1,[Define 1 for SUB_ARCH_CRAY])
+      AC_DEFINE(RM_FE_COLOC_CMD, "cti_fe_colocator", [bulk launcher location])
+      PKG_CHECK_MODULES([CRAY_CTI], [craytools_fe])
+      AC_SUBST(ARCHHEADER,"/")
+      AC_SUBST(ARCHLIB,"/")
+      ac_target_rm="cray"
+    else
+dnl For the cray build, we always want to force alps to tbe the target rm. We
+dnl might be building on a whitebox without aprun installed.
+      PKG_CHECK_EXISTS([cray-alps], [ac_have_alps="yes"], [ac_have_alps="no"])
+      if test "x$ac_have_alps" = "xyes"; then
         dnl This is the new OBS system
         AC_DEFINE(SUB_ARCH_ALPS,1,[Define 1 for SUB_ARCH_ALPS])
         AC_DEFINE(RM_BE_STUB_CMD, "alps_be_starter", [be starter stub location])
@@ -128,19 +151,10 @@ AC_DEFUN([X_AC_PLATFORM], [
         AC_SUBST(ARCHHEADER,"/")
         AC_SUBST(ARCHLIB,"/")
         ac_target_rm="alps"
-    elif test -f "/usr/bin/aprun"; then
-        dnl This is the old system. We hack things to work without pkg-config
-        AC_DEFINE(SUB_ARCH_ALPS,1,[Define 1 for SUB_ARCH_ALPS])
-        AC_DEFINE(RM_BE_STUB_CMD, "alps_be_starter", [be starter stub location])
-        AC_DEFINE(RM_FE_COLOC_CMD, "alps_fe_colocator", [bulk launcher location])
-        AC_SUBST(CRAY_ALPS_CFLAGS,"-I/usr/include")
-        AC_SUBST(CRAY_ALPS_LIBS,"-L/usr/lib/alps -lalps")
-        AC_SUBST(ARCHHEADER,"/")
-        AC_SUBST(ARCHLIB,"/")
-        ac_target_rm="alps"
-    else
+      else
         AC_SUBST(ARCHHEADER,"/")
         AC_SUBST(ARCHLIB,"/")
+      fi
     fi
   else
         AC_SUBST(ARCHHEADER,"/")
@@ -149,6 +163,7 @@ AC_DEFUN([X_AC_PLATFORM], [
 
   AC_DEFINE_UNQUOTED(TARGET_OS_ISA_STRING, "$ac_target_os-$ac_target_isa", [Define os-isa string])
   AC_DEFINE_UNQUOTED(TARGET_RM_STRING, "$ac_target_rm" ,[Define rm string])
+  AM_CONDITIONAL([WITH_CTI], [test "x$ac_target_rm" = "xcray"])
   AM_CONDITIONAL([WITH_ALPS], [test "x$ac_target_rm" = "xalps"])
   AM_CONDITIONAL([WITH_CIOD], [test "x$ac_target_rm" = "xbglrm" \
                                     -o "x$ac_target_rm" = "xbgprm" \

configure.ac

@@ -29,6 +29,7 @@ dnl ----------------------------------------------------------------------------
 dnl
 dnl   Update Log:
 dnl         Apr 28 2016 DHA: Modernize autotool support 
+dnl         Apr 01 2015 ADG/KMD: Added Cray CTI support.
 dnl         Feb 20 2015 [email protected]: Added Cray support.
 dnl         Apr 30 2014 DHA: Declare 1.0.1 -- this doesn't have Cray support though.
 dnl         Apr 15 2014 DHA: Drop tools/cobo/test
@@ -292,6 +293,7 @@ AC_CONFIG_FILES([
   tools/cobo/src/Makefile
   tools/alps/Makefile
   tools/alps/src/Makefile
+  tools/cti/Makefile
   tools/handshake/Makefile
   launchmon/Makefile
   launchmon/src/Makefile

etc/Makefile.am

@@ -29,6 +29,7 @@
 ##--------------------------------------------------------------------------------
 ##
 ##  Update Log:
+##        May 18 2018 ADG: Added Cray CTI support
 ##        Apr 28 2016 DHA: Created file.
 ##
 
@@ -42,6 +43,7 @@ etc_SCRIPTS = \
   rm_bgprm.conf \
   rm_bgqrm.conf \
   rm_bgq_slurm.conf \
+  rm_cray.conf \
   rm_mchecker.conf \
   rm_openrte.conf \
   rm_slurm.conf \
@@ -53,6 +55,7 @@ EXTRA_DIST = \
   rm_bglrm.conf \
   rm_bgprm.conf \
   rm_bgqrm.conf \
+  rm_cray.conf \
   rm_gupc.conf \
   rm_bgq_slurm.conf \
   rm_mchecker.conf \

etc/rm_alps.conf

@@ -49,7 +49,6 @@ RM=alps
 RM_MPIR=STD_CRAY
 RM_launcher=aprun
 RM_launcher=aprun.orig
-RM_launcher=alps_fe_colocator
 RM_launcher_id=RM_launcher|sym|AprunUsageMsg
 RM_jobid=RM_launcher|pid
 RM_launch_helper=alps_fe_colocator

etc/rm_cray.conf

@@ -0,0 +1,56 @@
+## $Header: $
+##
+## rm_cray.conf
+##
+##--------------------------------------------------------------------------------
+## Copyright (c) 2008, Lawrence Livermore National Security, LLC. Produced at
+## the Lawrence Livermore National Laboratory. Written by Dong H. Ahn <[email protected]>.
+## LLNL-CODE-409469. All rights reserved.
+##
+## This file is part of LaunchMON. For details, see
+## https://computing.llnl.gov/?set=resources&page=os_projects
+##
+## Please also read LICENSE -- Our Notice and GNU Lesser General Public License.
+##
+##
+## This program is free software; you can redistribute it and/or modify it under the
+## terms of the GNU General Public License (as published by the Free Software
+## Foundation) version 2.1 dated February 1999.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT ANY
+## WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+## Place, Suite 330, Boston, MA 02111-1307 USA
+##--------------------------------------------------------------------------------
+##
+##  Update Log:
+##        Mar 31 2015 [email protected]: Added file for Cray CTI support
+##
+##
+## RM: the name of Resource Manager
+## RM_launcher: the name of the launcher command
+## RM_launcher_id: the rule to get the launcher id 
+## (e.g., RM_launcher|sym|srun says the launcher is identify by testing 
+##        RM_launcher's symbol by the name of srun)
+## RM_jobid: the rule to get the target jobid
+## (e.g., RM_jobid=RM_launcher|sym|totalview_jobid|string says
+##        jobid can be obtained from the launcher's symbol, totalview_jobid,
+##        interpreting that as the string type.
+## RM_launcher_helper= method or command to launch daemons
+## RM_launch_str= options and arguements used for RM_launch_mth.
+##
+
+RM=cray
+RM_MPIR=STD_CRAY
+RM_launcher=aprun
+RM_launcher=aprun.orig
+RM_launcher_id=RM_launcher|sym|AprunUsageMsg
+RM_jobid=RM_launcher|pid
+RM_launch_helper=cti_fe_colocator
+RM_signal_for_kill=SIGINT
+RM_fail_detection=false
+RM_launch_str=--apid=%j --daemon=%d -- %o --lmonsharedsec=%s --lmonsecchk=%c

etc/rm_info.conf

@@ -29,6 +29,8 @@
 ##
 ##  Update Log:
 ##        Sep 30 2011 DHA: Created file.
+##        Apr 01 2015 ADG: Added CTI support.
+##        Mar 01 2018 KMD: Added aarch64 support
 ##
 ##
 ## [platform]
@@ -44,10 +46,19 @@ rm_mchecker.conf
 rm_slurm.conf
 rm_openrte.conf
 rm_alps.conf
+rm_cray.conf
 rm_mchecker.conf
 rm_mpiexec_hydra.conf
 rm_gupc.conf
 
+[linux-aarch64]
+rm_slurm.conf
+rm_openrte.conf
+rm_alps.conf
+rm_cray.conf
+rm_mchecker.conf
+rm_gupc.conf
+
 [linux-power]
 rm_bglrm.conf
 rm_bgprm.conf

etc/rm_slurm.conf

@@ -30,6 +30,7 @@
 ##  Update Log:
 ##        Sep 30 2011 DHA: Created file.
 ##        Feb 02 2016 GLL: Added sattach.
+##        May 18 2018 ADG: Modified launch string to avoid requesting resources.
 ##
 ##
 ## RM: the name of Resource Manager
@@ -58,5 +59,5 @@ RM_jobid=RM_launcher|sym|totalview_jobid|string
 RM_launch_helper=srun
 RM_signal_for_kill=SIGINT|SIGINT
 RM_fail_detection=true
-RM_launch_str=--input=none --jobid=%j --nodes=%n --ntasks=%n --nodelist=%l %d %o --lmonsharedsec=%s --lmonsecchk=%c
+RM_launch_str=--input=none --gres=none --mem-per-cpu=0 --jobid=%j --nodes=%n --ntasks=%n --nodelist=%l %d %o --lmonsharedsec=%s --lmonsecchk=%c
 

launchmon/src/linux/lmon_api/lmon_be.cxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------			
  *
  *  Update Log:
+ *        Apr 01 2015 ADG: Added Cray CTI support.
  *        Dec 11 2012 DHA: Added mods to initialize process control before 
  *        		   MPIR_Breakpoint release.
  *        		   This fixes an apparent race where the early release 
@@ -181,7 +182,7 @@ LMON_be_init ( int ver, int *argc, char ***argv )
       LMON_say_msg ( LMON_BE_MSG_PREFIX, true,
         "LMON BE fails to enable verbosity %d", lrc );
     }
-#elif SUB_ARCH_ALPS
+#elif SUB_ARCH_ALPS || SUB_ARCH_CRAY
   //
   // Without this, the no-verbose build will hang under ALPS
   //

launchmon/src/linux/lmon_api/lmon_be_sync_mpi.cxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------
  *
  *  Update Log:
+ *              Apr 01 2015 ADG: Added Cray CTI support.
  *              Dec 14 2012 DHA: Add support to fix MPIR_Breakpoint
  *                               release race
  *              Nov 23 2011 DHA: File created
@@ -126,6 +127,7 @@ LMON_be_procctl_init ( rm_catalogue_e rmtype,
 
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //
@@ -184,6 +186,7 @@ LMON_be_procctl_stop ( rm_catalogue_e rmtype,
     case RC_slurm:
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //
@@ -254,6 +257,7 @@ LMON_be_procctl_run ( rm_catalogue_e rmtype,
     case RC_slurm:
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //
@@ -321,6 +325,7 @@ LMON_be_procctl_initdone( rm_catalogue_e rmtype,
 
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //
@@ -379,6 +384,7 @@ LMON_be_procctl_done(rm_catalogue_e rmtype,
     case RC_slurm:
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //
@@ -441,6 +447,7 @@ LMON_be_procctl_perf ( rm_catalogue_e rmtype,
     case RC_slurm:
     case RC_orte:
     case RC_alps:
+    case RC_cray:
     case RC_gupc:
     case RC_mpiexec_hydra:
       //

launchmon/src/linux/lmon_api/lmon_fe.cxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------
  *
  *  Update Log:
+ *        Apr 01 2015 ADG: Added Cray CTI support.
  *        Apr 22 2014 DHA: Applied a patch to store RM args/opts into
  *                         a std::list object instead of a std:string string.
  *        Apr 15 2014 DHA: Integrate COBO secure handshake 
@@ -2582,7 +2583,7 @@ LMON_openBindAndListen ( int *sfd )
   // Changed RM_BGL_MPIRUN to RM_BG_MPIRUN to genericize BlueGene Support
   //
   strcat (hn, "-io");
-#elif SUB_ARCH_ALPS
+#elif SUB_ARCH_ALPS || SUB_ARCH_CRAY
   //
   // Cray uses its own way to name a node, so overwriting 
   // hn with the name generated with their method

launchmon/src/linux/main.cxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------			
  *
  *  Update Log:
+ *        May  02 2018 KMD: Added aarch64 support
  *        Nov  08 2010 DHA: Added a lexical scope around the driver object
  *                          to support memory tools 
  *        Aug  10 2008 DHA: Now returns EXIT_FAILURE
@@ -53,10 +54,9 @@ int main(int argc, char* argv[])
 {
   try 
   {
-
     int rc = EXIT_FAILURE;
       {
-#if X86_ARCHITECTURE || X86_64_ARCHITECTURE || PPC_ARCHITECTURE
+#if X86_ARCHITECTURE || X86_64_ARCHITECTURE || PPC_ARCHITECTURE || AARCH64_ARCHITECTURE
         //
         // driver instantiation for the linux platform.
         //

launchmon/src/linux/sdbg_linux_bp.hxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------			
  *
  *  Update Log:
+ *        May 02 2018 KMD: Added aarch64 support
  *        Mar 06 2008 DHA: Added indirect breakpoint support
  *        Mar 11 2008 DHA: Added Linux PowerPC support 
  *        Feb 09 2008 DHA: Added LLNS Copyright
@@ -40,7 +41,7 @@
 #include "sdbg_linux_mach.hxx"
 
 #if BIT64
-# if X86_64_ARCHITECTURE
+# if X86_64_ARCHITECTURE || AARCH64_ARCHITECTURE
   const int NUM_BYTE_INCR_AFTER_SINGLESTEP = 8;
 # else
   const int NUM_BYTE_INCR_AFTER_SINGLESTEP = 4;

launchmon/src/linux/sdbg_linux_driver_impl.hxx

@@ -26,6 +26,7 @@
  *--------------------------------------------------------------------------------			
  *
  *  Update Log:
+ *        May  02 2018 KMD: Added aarch64 support
  *        Mar  11 2008 DHA: Added PowerPC support
  *        Feb  09 2008 DHA: Added LLNS Copyright
  *        Mar  13 2007 DHA: pipe_t support
@@ -102,6 +103,8 @@ linux_driver_t<LINUX_DRIVER_TEMPLPARAM>::create_process (
   return_proc = new linux_ppc_process_t(pid, mi, md, mt, mc);
 #elif IA64_ARCHITECTURE
   return_proc = new linux_ia64_process_t(pid, mi, md, mt, mc);
+#elif AARCH64_ARCHITECTURE
+  return_proc = new linux_aarch64_process_t(pid, mi, md, mt, mc);
 #endif
 
   return return_proc;
@@ -134,6 +137,8 @@ linux_driver_t<LINUX_DRIVER_TEMPLPARAM>::create_process (
   return_proc = new linux_ppc_process_t (pid, mi);
 #elif IA64_ARCHITECTURE
   return_proc = new linux_ia64_process_t (pid, mi);
+#elif AARCH64_ARCHITECTURE
+  return_proc = new linux_aarch64_process_t (pid, mi);
 #endif
 
   return return_proc;