Replace OPAL_ASSEMBLY_ARCH with portable platform

With the introduction of the portable platform header, all the
OPAL_ASSEMBLY_ARCH code was redundant and kind of a pain to
deal with.  Remove all uses of OPAL_ASSEMBLY_ARCH and replace
with the equivalent portable platform conditional.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

config/opal_config_asm.m4

@@ -597,7 +597,7 @@ dnl #################################################################
 AC_DEFUN([OPAL_CONFIG_ASM],[
     AC_REQUIRE([OPAL_SETUP_CC])
 
-    OPAL_VAR_SCOPE_PUSH([atomics_found want_c11_atomics want_gcc_builtin_atomics want_asm_atomics opal_cv_asm_arch result])
+    OPAL_VAR_SCOPE_PUSH([atomics_found want_c11_atomics want_gcc_builtin_atomics want_asm_atomics])
 
     # only assembly style we support today is gcc-style inline
     # assembly, find out if it works.  We need this even for C11/GCC
@@ -672,19 +672,16 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
            x86_64-*x32|i?86-*|x86_64*|amd64*)
                AS_IF([test "$ac_cv_sizeof_long" = "8"],
                      [OPAL_CHECK_CMPXCHG16B
-                      opal_cv_asm_arch="X86_64"
                       atomics_found="x86_64 assembly"])
             ;;
 
             aarch64*)
-                opal_cv_asm_arch="ARM64"
                 atomics_found="aarch64 assembly"
             ;;
 
             powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)
                 AS_IF([test "$ac_cv_sizeof_long" = "8"],
-                      [opal_cv_asm_arch="POWERPC64"
-                       atomics_found="PowerPC asssembly"])
+                      [atomics_found="PowerPC asssembly"])
             ;;
             esac
 
@@ -696,10 +693,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
     AS_IF([test "$aomics_found" = "no"],
           [AC_MSG_ERROR([No usable atomics implementation found.  Cannot continue.])])
 
-    result="OPAL_$opal_cv_asm_arch"
-    AC_DEFINE_UNQUOTED([OPAL_ASSEMBLY_ARCH], [$result],
-        [Architecture type of assembly to use for atomic operations and CMA])
-
     AC_DEFINE_UNQUOTED([OPAL_USE_C11_ATOMICS],
         [$want_c11_atomics],
         [Whether to use C11 atomics for atomics implementation])

ompi/mca/osc/portals4/osc_portals4_component.c

@@ -9,7 +9,7 @@
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
- * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2020      High Performance Computing Center Stuttgart,
  *                         University of Stuttgart.  All rights reserved.
  * $COPYRIGHT$
@@ -24,6 +24,7 @@
 #include "opal/util/printf.h"
 #include "opal/include/opal/align.h"
 #include "opal/mca/mpool/base/base.h"
+#include "opal/opal_portable_platform.h"
 
 #include "ompi/mca/osc/base/base.h"
 #include "ompi/mca/osc/base/osc_base_obj_convert.h"
@@ -589,7 +590,7 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
 
     module->passive_target_access_epoch = false;
 
-#if OPAL_ASSEMBLY_ARCH == OPAL_X86_64 || OPAL_ASSEMBLY_ARCH == OPAL_IA32
+#if defined(PLATFORM_ARCH_X86) || defined(PLATFORM_ARCH_X86_64)
     *model = MPI_WIN_UNIFIED;
 #else
     *model = MPI_WIN_SEPARATE;

opal/include/opal/sys/Makefile.am

@@ -28,7 +28,6 @@
 # This makefile.am does not stand on its own - it is included from opal/Makefile.am
 
 headers += \
-	opal/sys/architecture.h \
 	opal/sys/atomic.h \
 	opal/sys/atomic_stdc.h \
 	opal/sys/atomic_impl_minmax_math.h \

opal/include/opal/sys/architecture.h

@@ -19,7 +19,7 @@
 #ifndef OPAL_SYS_ARCH_TIMER_H
 #define OPAL_SYS_ARCH_TIMER_H 1
 
-#if OPAL_ASSEMBLY_ARCH == OPAL_ARM64
+#if defined(PLATFORM_ARCH_AARCH64)
 typedef uint64_t opal_timer_t;
 #else
 typedef uint32_t opal_timer_t;
@@ -32,7 +32,7 @@ static inline opal_timer_t opal_sys_timer_get_cycles(void)
     opal_timer_t ret;
 
     __asm__ __volatile__("isb" ::: "memory");
-#if OPAL_ASSEMBLY_ARCH == OPAL_ARM64
+#if defined(PLATFORM_ARCH_AARCH64)
     __asm__ __volatile__("mrs %0,  CNTVCT_EL0" : "=r"(ret));
 #else
     __asm__ __volatile__("mrs %0,  CNTVCT" : "=r"(ret));
@@ -44,7 +44,7 @@ static inline opal_timer_t opal_sys_timer_get_cycles(void)
 static inline opal_timer_t opal_sys_timer_get_freq(void)
 {
     opal_timer_t freq;
-#if OPAL_ASSEMBLY_ARCH == OPAL_ARM64
+#if defined(PLATFORM_ARCH_AARCH64)
     __asm__ __volatile__("mrs %0,  CNTFRQ_EL0" : "=r"(freq));
 #else
     __asm__ __volatile__("mrs %0,  CNTFRQ" : "=r"(freq));

opal/include/opal/sys/arm64/timer.h

@@ -49,11 +49,9 @@
 #ifndef OPAL_SYS_ATOMIC_H
 #define OPAL_SYS_ATOMIC_H 1
 
-#include "opal_config.h"
-
 #include <stdbool.h>
 
-#include "opal/sys/architecture.h"
+#include "opal/opal_portable_platform.h"
 #include "opal_stdatomic.h"
 
 BEGIN_C_DECLS
@@ -436,9 +434,9 @@ static inline void opal_atomic_sc_ptr(opal_atomic_intptr_t *addr, intptr_t newva
 #error "No atomics support found."
 #endif
 
-#if OPAL_ASSEMBLY_ARCH == OPAL_ARM64
+#if defined(PLATFORM_ARCH_AARCH64)
 #    include "opal/sys/arm64/atomic_llsc.h"
-#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64
+#elif defined(PLATFORM_ARCH_POWERPC) && defined(PLATFORM_ARCH_64)
 #    include "opal/sys/powerpc/atomic_llsc.h"
 #endif
 

opal/include/opal/sys/atomic.h

@@ -50,7 +50,7 @@ static inline void opal_atomic_wmb(void)
 
 static inline void opal_atomic_rmb(void)
 {
-#    if OPAL_ASSEMBLY_ARCH == OPAL_X86_64
+#    if defined(PLATFORM_ARCH_X86_64)
     /* work around a bug in older gcc versions (observed in gcc 6.x)
      * where acquire seems to get treated as a no-op instead of being
      * equivalent to __asm__ __volatile__("": : :"memory") on x86_64 */

opal/include/opal/sys/atomic_stdc.h

@@ -5,6 +5,8 @@
  * Copyright (c) 2017      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2020      Google, LLC. All rights reserved.
+ * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
+ *                         All Rights reserved.
  * $COPYRIGHT$
  */
 
@@ -19,12 +21,7 @@
 #ifndef OPAL_SYS_CMA_H
 #define OPAL_SYS_CMA_H 1
 
-#if !defined(OPAL_ASSEMBLY_ARCH)
-/* need opal_config.h for the assembly architecture */
-#    include "opal_config.h"
-#endif
-
-#include "opal/sys/architecture.h"
+#include "opal/opal_portable_platform.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
@@ -34,28 +31,28 @@
 #    include <sys/unistd.h>
 #endif
 
-#ifdef __linux__
+#ifdef PLATFORM_OS_LINUX
 
 /* Cross Memory Attach is so far only supported under linux */
 
-#    if OPAL_ASSEMBLY_ARCH == OPAL_X86_64
+#    if defined(PLATFORM_ARCH_x86_64)
 #        define __NR_process_vm_readv  310
 #        define __NR_process_vm_writev 311
-#    elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
+#    elif defined(PLATFORM_ARCH_X86)
 #        define __NR_process_vm_readv  347
 #        define __NR_process_vm_writev 348
-#    elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
+#    elif defined(PLATFORM_ARCH_POWERPC) && defined(PLATFORM_ARCH_32)
 #        define __NR_process_vm_readv  351
 #        define __NR_process_vm_writev 352
-#    elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64
+#    elif defined(PLATFORM_ARCH_POWERPC) && defined(PLATFORM_ARCH_64)
 #        define __NR_process_vm_readv  351
 #        define __NR_process_vm_writev 352
-#    elif OPAL_ASSEMBLY_ARCH == OPAL_ARM
+#    elif defined(PLATFORM_ARCH_ARM)
 
 #        define __NR_process_vm_readv  376
 #        define __NR_process_vm_writev 377
 
-#    elif OPAL_ASSEMBLY_ARCH == OPAL_ARM64
+#    elif defined(PLATFORM_ARCH_AARCH64)
 
 /* ARM64 uses the asm-generic syscall numbers */
 

opal/include/opal/sys/cma.h

@@ -35,7 +35,8 @@
  * Memory Barriers
  *
  *********************************************************************/
-#if (OPAL_ASSEMBLY_ARCH == OPAL_X86_64) && defined (__GNUC__) && !defined(__llvm) && (__GNUC__ < 6)
+
+#if defined(PLATFORM_ARCH_X86_64) && defined (__GNUC__) && !defined(__llvm) && (__GNUC__ < 6)
     /* work around a bug in older gcc versions where ACQUIRE seems to get
      * treated as a no-op instead */
 #define OPAL_BUSTED_ATOMIC_MB 1

opal/include/opal/sys/gcc_builtin/atomic.h

@@ -33,9 +33,7 @@
 #ifndef OPAL_SYS_TIMER_H
 #define OPAL_SYS_TIMER_H 1
 
-#include "opal_config.h"
-
-#include "opal/sys/architecture.h"
+#include "opal/opal_portable_platform.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
@@ -59,11 +57,11 @@ BEGIN_C_DECLS
 
 #if defined(DOXYGEN)
 /* don't include system-level gorp when generating doxygen files */
-#elif OPAL_ASSEMBLY_ARCH == OPAL_X86_64 || OPAL_ASSEMBLY_ARCH == OPAL_IA32
+#elif defined(PLATFORM_ARCH_X86_64) || defined(PLATFORM_ARCH_X86)
 #    include "opal/sys/x86_64/timer.h"
-#elif OPAL_ASSEMBLY_ARCH == OPAL_ARM64 || OPAL_ASSEMBLY_ARCH == OPAL_ARM
+#elif defined(PLATFORM_ARCH_ARM) || defined(PLATFORM_ARCH_AARCH64)
 #    include "opal/sys/arm64/timer.h"
-#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64 || OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
+#elif defined(PLATFORM_ARCH_POWERPC)
 #    include "opal/sys/powerpc/timer.h"
 #endif