Remove Itanium, ENCORE, SEQUANT, NEXT, KSR, old IBM NX,SP,SP1 (#335)

* remove IA64 * remove KSR * remove ENCORE, SEQUANT, NEXT * old IBM NX,SP,SP1 * remove SGI, Interix remnants
GlobalArrays · Jul 28, 2024 · 0ee83a9 · 0ee83a9
1 parent 3dffe9f
commit 0ee83a9
Show file tree

Hide file tree

Showing 42 changed files with 43 additions and 588 deletions.
diff --git a/armci/Makefile.am b/armci/Makefile.am
@@ -126,7 +126,6 @@ libarmci_la_SOURCES += src/ft/armci_storage.h
 libarmci_la_SOURCES += src/include/acc.h
 libarmci_la_SOURCES += src/include/armcip.h
 libarmci_la_SOURCES += src/include/asm-ppc.h
-libarmci_la_SOURCES += src/include/atomic_ops_ia64.h
 libarmci_la_SOURCES += src/include/atomics-i386.h
 libarmci_la_SOURCES += src/include/copy.h
 libarmci_la_SOURCES += src/include/fujitsu-vpp.h

diff --git a/armci/configure.ac b/armci/configure.ac
@@ -91,7 +91,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-GA_CHECK_HEADERS([assert.h c_asm.h errno.h fcntl.h float.h ia64/sys/inline.h malloc.h math.h memory.h mpp/shmem.h netdb.h netinet/in.h netinet/tcp.h process.h setjmp.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h strings.h sys/types.h sys/atomic_op.h sys/errno.h sys/file.h sys/ipc.h sys/mman.h sys/param.h sys/sem.h sys/shm.h sys/socket.h sys/stat.h sys/syscall.h sys/systemcfg.h sys/time.h sys/uio.h sys/wait.h time.h unistd.h windows.h winsock.h rpc/rpc.h rpc/types.h rpc/xdr.h],
+GA_CHECK_HEADERS([assert.h c_asm.h errno.h fcntl.h float.h malloc.h math.h memory.h mpp/shmem.h netdb.h netinet/in.h netinet/tcp.h process.h setjmp.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h strings.h sys/types.h sys/atomic_op.h sys/errno.h sys/file.h sys/ipc.h sys/mman.h sys/param.h sys/sem.h sys/shm.h sys/socket.h sys/stat.h sys/syscall.h sys/systemcfg.h sys/time.h sys/uio.h sys/wait.h time.h unistd.h windows.h winsock.h rpc/rpc.h rpc/types.h rpc/xdr.h],
 [], [],
 [@%:@ifdef HAVE_RPC_TYPES_H
 @%:@include <rpc/types.h>
@@ -287,7 +287,7 @@ AM_CONDITIONAL([ENABLE_SHARED], [test x$enable_shared = xyes])
 
 AS_IF([test "x$ga_cv_target" = xLINUX64],
     [AS_CASE([$host_cpu],
-        [x86_64|ppc64|ia64],
+        [x86_64|ppc64],
             [AC_DEFINE([NEED_MEM_SYNC], [1], [Creates memfenc macro])])])
 AS_IF([test "x$host_cpu" = xPWR4],
     [AC_DEFINE([NEED_MEM_SYNC], [1], [Creates memfenc macro])])

diff --git a/armci/examples/features/gpc/hashtable/GPCHashmap.cc b/armci/examples/features/gpc/hashtable/GPCHashmap.cc
@@ -21,18 +21,6 @@ using std::endl;
 #define ARMCI_ENABLE_GPC_CALLS
 #include "gpc.h"
 
-/***************************** macros ************************/
-extern "C" {
-#  if defined(__ia64)
-#    if defined(__GNUC__) && !defined (__INTEL_COMPILER)
-#       define MEM_FENCE __asm__ __volatile__ ("mf" ::: "memory");
-#    else /* Intel Compiler */
-        extern void _armci_ia64_mb();
-#       define MEM_FENCE _armci_ia64_mb();
-#    endif
-#  endif
-}
-
 #include "Hash_common.h"
 #include "GPCHashmap.h"
 #include "Util.h"

diff --git a/armci/src/collectives/message.c b/armci/src/collectives/message.c
@@ -111,15 +111,6 @@ static bufstruct *_gop_buffer;
 #    define SET_SHM_FLAG(_flg,_val) _clear_lock((int *)(_flg),_val);
 #  elif defined(NEC)
 #    define SET_SHM_FLAG(_flg,_val) MEM_FENCE; *(_flg)=(_val)
-#  elif defined(__ia64)
-#    if defined(__GNUC__) && !defined (__INTEL_COMPILER)
-#       define SET_SHM_FLAG(_flg,_val)\
-            __asm__ __volatile__ ("mf" ::: "memory"); *(_flg)=(_val)
-#    else /* Intel Compiler */
-        extern void _armci_ia64_mb();
-#       define SET_SHM_FLAG(_flg,_val)\
-            _armci_ia64_mb(); *(_flg)=(_val);
-#    endif
 #  elif defined(MACX)
 #    if defined(__GNUC__)
 #    define SET_SHM_FLAG(_flg,_val)\

diff --git a/armci/src/common/signaltrap.c b/armci/src/common/signaltrap.c
@@ -41,12 +41,7 @@
 #if !defined(armci_die)
 extern void Error();
 #endif
-
-#if (defined(ENCORE) || defined(SEQUENT))
-#   define SigType  int
-#else
 #   define SigType  void
-#endif
 
 #ifndef SIG_ERR
 #   define SIG_ERR         (SigType (*)())-1
@@ -142,37 +137,21 @@ SigType SigChldHandler(sig)
      int sig;
 {
   int status;
-#if defined(ENCORE) || defined(SEQUENT) || defined(NEXT)
-  union wait ustatus;
-#endif
-
+
 #if defined(LINUX)
   pid_t ret;
   /* Trap signal as soon as possible to avoid race */
   if ( (SigChldOrig = signal(SIGCHLD, SigChldHandler)) == SIG_ERR)
     Error("SigChldHandler: error from signal setting SIGCHLD",0);
 #endif
 
-#if defined(ENCORE) || defined(SEQUENT) || defined(NEXT)
-
-# if defined(LINUX)
-  ret = wait(&ustatus);
-  if((ret == 0) || ((ret == -1) && (errno == ECHILD))) { return; }
-# else
-  (void) wait(&ustatus); 
-# endif  
-  status = ustatus.w_status;
-
-#else
-
 # if defined(LINUX)
   ret = waitpid(0, &status, WNOHANG);
   if((ret == 0) || ((ret == -1) && (errno == ECHILD))) { return; }
 # else
   (void)wait(&status);
 # endif
 
-#endif
       AR_caught_sigchld=1;
       AR_caught_sig= sig;
       Error("Child process terminated prematurely, status=",(int) status);

diff --git a/armci/src/devices/openib/cbuf.h b/armci/src/devices/openib/cbuf.h
@@ -34,11 +34,7 @@
 #include <malloc.h>
 #include <string.h>
 
-#ifdef _IA64_
-#define CBUF_FLAG_TYPE uint64_t
-#else
 #define CBUF_FLAG_TYPE uint32_t
-#endif
 
 #if (defined(RDMA_FAST_PATH) || defined(ADAPTIVE_RDMA_FAST_PATH))