From 3bb181830a5a6ee4edf9acd8a20e3209bd42f001 Mon Sep 17 00:00:00 2001 From: Joshua Hursey Date: Tue, 15 Aug 2017 10:16:38 -0500 Subject: [PATCH] opal/pmix112: Sync with PMIx v1.2.3rc1 * Sync to the [PMIx v1.2.3.rc1](https://github.com/pmix/pmix/releases/tag/v1.2.3rc1) - See link for complete change log. * Note that this removes the hand coded ASM atomics for PMIx. Signed-off-by: Joshua Hursey --- opal/mca/pmix/pmix112/pmix/Makefile.am | 37 +-- opal/mca/pmix/pmix112/pmix/NEWS | 17 +- opal/mca/pmix/pmix112/pmix/VERSION | 6 +- opal/mca/pmix/pmix112/pmix/config/pmix.m4 | 1 - .../pmix112/pmix/config/pmix_config_asm.m4 | 156 ++---------- .../pmix/include/pmix/autogen/pmix_stdint.h | 1 + .../pmix112/pmix/src/atomics/asm/Makefile.am | 68 ------ .../pmix112/pmix/src/atomics/asm/asm-data.txt | 133 ---------- .../pmix/pmix112/pmix/src/atomics/asm/asm.c | 75 ------ .../pmix112/pmix/src/atomics/asm/base/ARM.asm | 153 ------------ .../pmix/src/atomics/asm/base/IA32.asm | 110 --------- .../pmix/src/atomics/asm/base/IA64.asm | 109 --------- .../pmix/src/atomics/asm/base/MIPS.asm | 196 --------------- .../pmix/src/atomics/asm/base/POWERPC32.asm | 168 ------------- .../pmix/src/atomics/asm/base/POWERPC64.asm | 157 ------------ .../pmix/src/atomics/asm/base/SPARCV9_32.asm | 171 ------------- .../pmix/src/atomics/asm/base/SPARCV9_64.asm | 111 --------- .../pmix/src/atomics/asm/base/X86_64.asm | 52 ---- .../pmix/src/atomics/asm/base/aix.conf | 44 ---- .../pmix/src/atomics/asm/base/default.conf | 34 --- .../pmix/src/atomics/asm/generate-all-asm.pl | 27 -- .../pmix/src/atomics/asm/generate-asm.pl | 123 ---------- .../asm/generated/atomic-ia32-cygwin-nongas.s | 109 --------- .../asm/generated/atomic-ia32-cygwin.s | 111 --------- .../asm/generated/atomic-ia32-linux-nongas.s | 125 ---------- .../atomics/asm/generated/atomic-ia32-linux.s | 127 ---------- .../atomics/asm/generated/atomic-ia32-osx.s | 109 --------- .../asm/generated/atomic-ia64-linux-nongas.s | 108 -------- .../atomics/asm/generated/atomic-ia64-linux.s | 110 --------- .../atomics/asm/generated/atomic-mips-irix.s | 195 --------------- .../atomics/asm/generated/atomic-mips-linux.s | 197 --------------- .../asm/generated/atomic-mips64-linux.s | 197 --------------- .../atomics/asm/generated/atomic-mips64el.s | 195 --------------- .../asm/generated/atomic-powerpc32-64-osx.s | 165 ------------- .../asm/generated/atomic-powerpc32-aix.s | 156 ------------ .../generated/atomic-powerpc32-linux-nongas.s | 118 --------- .../asm/generated/atomic-powerpc32-linux.s | 120 --------- .../asm/generated/atomic-powerpc32-osx.s | 100 -------- .../asm/generated/atomic-powerpc64-aix.s | 230 ------------------ .../generated/atomic-powerpc64-linux-nongas.s | 180 -------------- .../asm/generated/atomic-powerpc64-linux.s | 182 -------------- .../asm/generated/atomic-powerpc64-osx.s | 156 ------------ .../asm/generated/atomic-sparcv9-32-solaris.s | 190 --------------- .../asm/generated/atomic-sparcv9-64-solaris.s | 130 ---------- .../generated/atomic-x86_64-linux-nongas.s | 63 ----- .../asm/generated/atomic-x86_64-linux.s | 65 ----- .../pmix112/pmix/src/atomics/sys/arm/timer.h | 1 - .../pmix/src/atomics/sys/arm64/timer.h | 1 - .../pmix/src/atomics/sys/atomic_impl.h | 1 - .../pmix112/pmix/src/atomics/sys/ia32/timer.h | 1 - .../pmix112/pmix/src/atomics/sys/ia64/timer.h | 1 - .../pmix112/pmix/src/atomics/sys/mips/timer.h | 1 - .../pmix/src/atomics/sys/powerpc/timer.h | 1 - .../pmix/src/atomics/sys/sparcv9/timer.h | 1 - .../src/atomics/sys/sync_builtin/atomic.h | 1 - .../pmix/src/client/pmix_client_connect.c | 2 +- .../pmix/src/client/pmix_client_fence.c | 5 +- .../pmix112/pmix/src/client/pmix_client_get.c | 2 +- .../pmix112/pmix/src/client/pmix_client_pub.c | 2 +- .../pmix/src/client/pmix_client_spawn.c | 3 +- .../pmix112/pmix/src/include/pmix_globals.h | 2 +- .../pmix112/pmix/src/server/pmix_server_get.c | 3 +- .../pmix112/pmix/src/server/pmix_server_ops.c | 2 +- opal/mca/pmix/pmix112/pmix/src/usock/usock.h | 2 +- opal/mca/pmix/pmix112/pmix/test/test_common.c | 3 +- opal/mca/pmix/pmix112/pmix/test/test_common.h | 7 +- opal/mca/pmix/pmix112/pmix/test/test_fence.c | 4 +- 67 files changed, 68 insertions(+), 5365 deletions(-) delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/Makefile.am delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm-data.txt delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm.c delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/ARM.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA32.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA64.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/MIPS.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC32.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC64.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_32.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_64.asm delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/X86_64.asm delete mode 100755 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/aix.conf delete mode 100755 opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/default.conf delete mode 100755 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-all-asm.pl delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-asm.pl delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-osx.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-irix.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64el.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-64-osx.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-aix.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-osx.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-aix.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-osx.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-32-solaris.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-64-solaris.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux-nongas.s delete mode 100644 opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux.s diff --git a/opal/mca/pmix/pmix112/pmix/Makefile.am b/opal/mca/pmix/pmix112/pmix/Makefile.am index 1bfdefb1ee6..a15dad1e83f 100644 --- a/opal/mca/pmix/pmix112/pmix/Makefile.am +++ b/opal/mca/pmix/pmix112/pmix/Makefile.am @@ -60,7 +60,6 @@ include src/server/Makefile.am include src/sec/Makefile.am include src/common/Makefile.am -include src/atomics/asm/Makefile.am include src/atomics/sys/Makefile.include if WANT_DSTORE @@ -69,30 +68,18 @@ include src/dstore/Makefile.am endif if PMIX_EMBEDDED_MODE -noinst_LTLIBRARIES = libpmix.la libasm.la +noinst_LTLIBRARIES = libpmix.la libpmix_la_SOURCES = $(headers) $(sources) libpmix_la_LDFLAGS = else -lib_LTLIBRARIES = libpmix.la libasm.la +lib_LTLIBRARIES = libpmix.la libpmix_la_SOURCES = $(headers) $(sources) libpmix_la_LDFLAGS = -version-info $(libpmix_so_version) -SUBDIRS = . test examples src/atomics/asm +SUBDIRS = . test examples endif -# ASM Start -if PMIX_HAVE_ASM_FILE -nodist_libasm_la_SOURCES = src/atomics/asm/atomic-asm.S -libasm_la_DEPENDENCIES = src/atomics/asm/generated/@PMIX_ASM_FILE@ -else -nodist_libasm_la_SOURCES = -libasm_la_DEPENDENCIES = -endif - -dist_libasm_la_SOURCES = src/atomics/asm/asm.c -# ASM End - if WANT_INSTALL_HEADERS pmixdir = $(pmixincludedir)/$(subdir) nobase_pmix_HEADERS = $(headers) @@ -114,27 +101,11 @@ EXTRA_DIST += README INSTALL VERSION LICENSE autogen.sh \ test/test_common.h test/cli_stages.h \ test/server_callbacks.h test/test_fence.h \ test/test_publish.h test/test_resolve_peers.h \ - test/test_spawn.h test/utils.h test/test_cd.h \ - src/atomics/asm/asm-data.txt \ - src/atomics/asm/generate-asm.pl \ - src/atomics/asm/generate-all-asm.pl \ - src/atomics/asm/base/aix.conf \ - src/atomics/asm/base/default.conf \ - src/atomics/asm/base/X86_64.asm \ - src/atomics/asm/base/ARM.asm \ - src/atomics/asm/base/IA32.asm \ - src/atomics/asm/base/IA64.asm \ - src/atomics/asm/base/MIPS.asm \ - src/atomics/asm/base/POWERPC32.asm \ - src/atomics/asm/base/POWERPC64.asm \ - src/atomics/asm/base/SPARCV9_32.asm \ - src/atomics/asm/base/SPARCV9_64.asm + test/test_spawn.h test/utils.h test/test_cd.h # # Copy over all the generated files # dist-hook: - mkdir "${distdir}/src/atomics/asm/generated" - $(PERL) "$(top_srcdir)/src/atomics/asm/generate-all-asm.pl" "$(PERL)" "$(srcdir)/src/atomics/asm" "$(distdir)/src/atomics/asm" env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)" diff --git a/opal/mca/pmix/pmix112/pmix/NEWS b/opal/mca/pmix/pmix112/pmix/NEWS index 09944d32c85..8801b0dc8c4 100644 --- a/opal/mca/pmix/pmix112/pmix/NEWS +++ b/opal/mca/pmix/pmix112/pmix/NEWS @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +Copyright (c) 2015-2016 Intel, Inc. All rights reserved. Copyright (c) 2016-2017 IBM Corporation. All rights reserved. $COPYRIGHT$ @@ -20,10 +20,23 @@ other, a single NEWS-worthy item might apply to different series. For example, a bug might be fixed in the master, and then moved to the current release as well as the "stable" bug fix release branch. -1.2.3 -- TBD +1.2.4 -- TBD ---------------------- +1.2.3 -- 24 Aug. 2017 +---------------------- +- Resolve visibility issues for public APIs (PR #451) +- Atomics update - remove custom ASM atomics (PR #458) +- Fix job-fence test (PR #423) +- Replace stale PMIX_DECLSPEC with PMIX_EXPORT (PR #448) +- Memory barrier fixes for thread shifting (PR #387) +- Fix race condition in dmodex (PR #346) +- Allow disable backward compatability for PMI-1/2 (PR #350) +- Fix segv in PMIx_server_deregister_nspace (PR #343) +- Fix possible hang in PMIx_Abort (PR #339) + + 1.2.2 -- 21 March 2017 ---------------------- - Compiler fix for Sun/Oracle CC (PR #322) diff --git a/opal/mca/pmix/pmix112/pmix/VERSION b/opal/mca/pmix/pmix112/pmix/VERSION index fdd264d94c4..51c6c0a4a65 100644 --- a/opal/mca/pmix/pmix112/pmix/VERSION +++ b/opal/mca/pmix/pmix112/pmix/VERSION @@ -24,14 +24,14 @@ release=3 # The only requirement is that it must be entirely printable ASCII # characters and have no white space. -greek= +greek=rc1 # If repo_rev is empty, then the repository version number will be # obtained during "make dist" via the "git describe --tags --always" # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=git445f882 +repo_rev=gitb5387205 # If tarball_version is not empty, it is used as the version string in # the tarball filename, regardless of all other versions listed in @@ -45,7 +45,7 @@ tarball_version= # The date when this release was created -date="Aug 10, 2017" +date="Aug 14, 2017" # The shared library version of each of PMIx's public libraries. # These versions are maintained in accordance with the "Library diff --git a/opal/mca/pmix/pmix112/pmix/config/pmix.m4 b/opal/mca/pmix/pmix112/pmix/config/pmix.m4 index a2205c81ee0..44e4e7fa630 100644 --- a/opal/mca/pmix/pmix112/pmix/config/pmix.m4 +++ b/opal/mca/pmix/pmix112/pmix/config/pmix.m4 @@ -668,7 +668,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[ AC_CONFIG_FILES( pmix_config_prefix[Makefile] - pmix_config_prefix[src/atomics/asm/Makefile] ) # Success diff --git a/opal/mca/pmix/pmix112/pmix/config/pmix_config_asm.m4 b/opal/mca/pmix/pmix112/pmix/config/pmix_config_asm.m4 index 858e1e6309b..91f24ad1f12 100644 --- a/opal/mca/pmix/pmix112/pmix/config/pmix_config_asm.m4 +++ b/opal/mca/pmix/pmix112/pmix/config/pmix_config_asm.m4 @@ -13,7 +13,7 @@ dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. -dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights +dnl Copyright (c) 2014-2017 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights dnl reserved. @@ -194,9 +194,15 @@ AC_DEFUN([PMIX_CHECK_GCC_BUILTIN_CSWAP_INT128], [ AC_DEFUN([PMIX_CHECK_GCC_ATOMIC_BUILTINS], [ AC_MSG_CHECKING([for __atomic builtin atomics]) - AC_TRY_LINK([long tmp, old = 0;], [__atomic_thread_fence(__ATOMIC_SEQ_CST); + AC_TRY_LINK([ +#include +uint32_t tmp, old = 0; +uint64_t tmp64, old64 = 0;], [ +__atomic_thread_fence(__ATOMIC_SEQ_CST); __atomic_compare_exchange_n(&tmp, &old, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED); -__atomic_add_fetch(&tmp, 1, __ATOMIC_RELAXED);], +__atomic_add_fetch(&tmp, 1, __ATOMIC_RELAXED); +__atomic_compare_exchange_n(&tmp64, &old64, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED); +__atomic_add_fetch(&tmp64, 1, __ATOMIC_RELAXED);], [AC_MSG_RESULT([yes]) $1], [AC_MSG_RESULT([no]) @@ -879,6 +885,7 @@ return ret; if test "$asm_result" = "yes" ; then PMIX_C_GCC_INLINE_ASSEMBLY=1 + pmix_cv_asm_inline_supported="yes" else PMIX_C_GCC_INLINE_ASSEMBLY=0 fi @@ -890,70 +897,6 @@ return ret; unset PMIX_C_GCC_INLINE_ASSEMBLY assembly asm_result ])dnl - -dnl ################################################################# -dnl -dnl PMIX_CHECK_INLINE_DEC -dnl -dnl DEFINE PMIX_DEC to 0 or 1 depending on DEC -dnl support -dnl -dnl ################################################################# -AC_DEFUN([PMIX_CHECK_INLINE_C_DEC],[ - - AC_MSG_CHECKING([if $CC supports DEC inline assembly]) - - AC_LINK_IFELSE([AC_LANG_PROGRAM([ -AC_INCLUDES_DEFAULT -#include ], -[[asm(""); -return 0;]])], - [asm_result="yes"], [asm_result="no"]) - - AC_MSG_RESULT([$asm_result]) - - if test "$asm_result" = "yes" ; then - PMIX_C_DEC_INLINE_ASSEMBLY=1 - else - PMIX_C_DEC_INLINE_ASSEMBLY=0 - fi - - AC_DEFINE_UNQUOTED([PMIX_C_DEC_INLINE_ASSEMBLY], - [$PMIX_C_DEC_INLINE_ASSEMBLY], - [Whether C compiler supports DEC style inline assembly]) - - unset PMIX_C_DEC_INLINE_ASSEMBLY asm_result -])dnl - - -dnl ################################################################# -dnl -dnl PMIX_CHECK_INLINE_XLC -dnl -dnl DEFINE PMIX_XLC to 0 or 1 depending on XLC -dnl support -dnl -dnl ################################################################# -AC_DEFUN([PMIX_CHECK_INLINE_C_XLC],[ - - AC_MSG_CHECKING([if $CC supports XLC inline assembly]) - - PMIX_C_XLC_INLINE_ASSEMBLY=0 - asm_result="no" - if test "$CC" = "xlc" ; then - PMIX_XLC_INLINE_ASSEMBLY=1 - asm_result="yes" - fi - - AC_MSG_RESULT([$asm_result]) - AC_DEFINE_UNQUOTED([PMIX_C_XLC_INLINE_ASSEMBLY], - [$PMIX_C_XLC_INLINE_ASSEMBLY], - [Whether C compiler supports XLC style inline assembly]) - - unset PMIX_C_XLC_INLINE_ASSEMBLY -])dnl - - dnl ################################################################# dnl dnl PMIX_CONFIG_ASM @@ -975,12 +918,12 @@ AC_DEFUN([PMIX_CONFIG_ASM],[ [], [enable_builtin_atomics="yes"]) pmix_cv_asm_builtin="BUILTIN_NO" - if test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then - PMIX_CHECK_GCC_ATOMIC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_GCC"], []) - fi - if test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then - PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"], []) - fi + AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"], + [PMIX_CHECK_GCC_ATOMIC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_GCC"], [])]) + AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"], + [PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"], [])]) + AS_IF([test "$pmix_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes"], + [AC_MSG_WARN([__sync builtin atomics requested but not found - proceeding with inline atomics])]) PMIX_CHECK_ASM_PROC PMIX_CHECK_ASM_TEXT @@ -1084,17 +1027,19 @@ AC_DEFUN([PMIX_CONFIG_ASM],[ fi PMIX_GCC_INLINE_ASSIGN='"1: li %0,0" : "=&r"(ret)' ;; - # There is no current difference between s390 and s390x # But use two different defines in case some come later # as s390 is 31bits while s390x is 64bits s390-*) pmix_cv_asm_arch="S390" + PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"], + [AC_MSG_ERROR([No atomic primitives available for $host])]) ;; s390x-*) pmix_cv_asm_arch="S390X" + PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"], + [AC_MSG_ERROR([No atomic primitives available for $host])]) ;; - sparc*-*) # SPARC v9 (and above) are the only ones with 64bit support # if compiling 32 bit, see if we are v9 (aka v8plus) or @@ -1156,10 +1101,9 @@ AC_MSG_ERROR([Can not continue.]) ;; esac + pmix_cv_asm_inline_supported="no" # now that we know our architecture, try to inline assemble PMIX_CHECK_INLINE_C_GCC([$PMIX_GCC_INLINE_ASSIGN]) - PMIX_CHECK_INLINE_C_DEC - PMIX_CHECK_INLINE_C_XLC # format: # config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack @@ -1244,64 +1188,10 @@ AC_DEFUN([PMIX_ASM_FIND_FILE], [ AC_REQUIRE([AC_PROG_GREP]) AC_REQUIRE([AC_PROG_FGREP]) -if test "$pmix_cv_asm_arch" != "WINDOWS" && test "$pmix_cv_asm_builtin" != "BUILTIN_SYNC" && test "$pmix_cv_asm_builtin" != "BUILTIN_GCC" && test "$pmix_cv_asm_builtin" != "BUILTIN_OSX" ; then - # see if we have a pre-built one already - AC_MSG_CHECKING([for pre-built assembly file]) - pmix_cv_asm_file="" - if $GREP "$pmix_cv_asm_arch" "${PMIX_TOP_SRCDIR}/src/atomics/asm/asm-data.txt" | $FGREP "$pmix_cv_asm_format" >conftest.out 2>&1 ; then - pmix_cv_asm_file="`cut -f3 conftest.out`" - if test ! "$pmix_cv_asm_file" = "" ; then - pmix_cv_asm_file="atomic-${pmix_cv_asm_file}.s" - if test -f "${PMIX_TOP_SRCDIR}/src/atomics/asm/generated/${pmix_cv_asm_file}" ; then - AC_MSG_RESULT([yes ($pmix_cv_asm_file)]) - else - AC_MSG_RESULT([no ($pmix_cv_asm_file not found)]) - pmix_cv_asm_file="" - fi - fi - else - AC_MSG_RESULT([no (not in asm-data)]) - fi - rm -rf conftest.* - - if test "$pmix_cv_asm_file" = "" ; then - # Can we generate a file? - AC_MSG_CHECKING([whether possible to generate assembly file]) - mkdir -p pmix/asm/generated - pmix_cv_asm_file="atomic-local.s" - pmix_try='$PERL $PMIX_TOP_SRCDIR/src/atomics/asm/generate-asm.pl $pmix_cv_asm_arch "$pmix_cv_asm_format" $PMIX_TOP_SRCDIR/src/atomics/asm/base $PMIX_TOP_BUILDDIR/src/atomics/asm/generated/$pmix_cv_asm_file >conftest.out 2>&1' - if AC_TRY_EVAL(pmix_try) ; then - # save the warnings - cat conftest.out >&AC_FD_CC - AC_MSG_RESULT([yes]) - else - # save output - cat conftest.out >&AC_FD_CC - pmix_cv_asm_file="" - AC_MSG_RESULT([failed]) - AC_MSG_WARN([Could not build atomic operations assembly file.]) - AC_MSG_WARN([There will be no atomic operations for this build.]) - fi - fi - rm -rf conftest.* +if test "$pmix_cv_asm_arch" != "WINDOWS" && test "$pmix_cv_asm_builtin" != "BUILTIN_SYNC" && test "$pmix_cv_asm_builtin" != "BUILTIN_GCC" && test "$pmix_cv_asm_builtin" != "BUILTIN_OSX" && test "$pmix_cv_asm_inline_arch" = "no" ; then + AC_MSG_ERROR([no atomic support available. exiting]) else # On windows with VC++, atomics are done with compiler primitives pmix_cv_asm_file="" fi - - AC_MSG_CHECKING([for atomic assembly filename]) - if test "$pmix_cv_asm_file" = "" ; then - AC_MSG_RESULT([none]) - result=0 - else - AC_MSG_RESULT([$pmix_cv_asm_file]) - result=1 - fi - - AC_DEFINE_UNQUOTED([PMIX_HAVE_ASM_FILE], [$result], - [Whether there is an atomic assembly file available]) - AM_CONDITIONAL([PMIX_HAVE_ASM_FILE], [test "$result" = "1"]) - - PMIX_ASM_FILE=$pmix_cv_asm_file - AC_SUBST(PMIX_ASM_FILE) ])dnl diff --git a/opal/mca/pmix/pmix112/pmix/include/pmix/autogen/pmix_stdint.h b/opal/mca/pmix/pmix112/pmix/include/pmix/autogen/pmix_stdint.h index fa52b79c04f..2695c774f47 100644 --- a/opal/mca/pmix/pmix112/pmix/include/pmix/autogen/pmix_stdint.h +++ b/opal/mca/pmix/pmix112/pmix/include/pmix/autogen/pmix_stdint.h @@ -126,3 +126,4 @@ typedef unsigned long long uintptr_t; #endif #endif /* PMIX_STDINT_H */ + diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/Makefile.am b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/Makefile.am deleted file mode 100644 index 9e3111de183..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -###################################################################### -# -# This is a bit complicated. If there is anything in the library, -# it will always be atomic-asm.S. We just symlink atomic-asm.S to -# the best atomic operations available (as determined at configure -# time) -# -###################################################################### -generated/@PMIX_ASM_FILE@: base/@PMIX_ASSEMBLY_ARCH@.asm - @ if test ! -f "$(top_srcdir)/src/atomics/asm/$@" ; then \ - cmd="$(PERL) '$(top_srcdir)/src/atomics/asm/generate-asm.pl' '@PMIX_ASSEMBLY_ARCH@' '@PMIX_ASSEMBLY_FORMAT@' '$(top_srcdir)/src/atomics/asm/base' '$(top_builddir)/src/atomics/asm/generated/@PMIX_ASM_FILE@'" ; \ - echo "$$cmd" ; \ - eval $$cmd ; \ - fi - -atomic-asm.S: generated/@PMIX_ASM_FILE@ - rm -f atomic-asm.S - @ if test -f "$(top_builddir)/src/atomics/asm/generated/@PMIX_ASM_FILE@" ; then \ - cmd="ln -s \"$(top_builddir)/src/atomics/asm/generated/@PMIX_ASM_FILE@\" atomic-asm.S" ; \ - echo "$$cmd" ; \ - eval $$cmd ; \ - else \ - cmd="ln -s \"$(top_srcdir)/src/atomics/asm/generated/@PMIX_ASM_FILE@\" atomic-asm.S" ; \ - echo "$$cmd" ; \ - eval $$cmd ; \ - fi - -# if PMIX_HAVE_ASM_FILE -# nodist_libasm_la_SOURCES = atomic-asm.S -# libasm_la_DEPENDENCIES = generated/@PMIX_ASM_FILE@ -# else -# nodist_libasm_la_SOURCES = -# libasm_la_DEPENDENCIES = -# endif - -# dist_libasm_la_SOURCES = asm.c - -###################################################################### - -clean-local: - rm -f atomic-asm.S - -distclean-local: - rm -f generated/atomic-local.s - -###################################################################### diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm-data.txt b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm-data.txt deleted file mode 100644 index 55360354fb2..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm-data.txt +++ /dev/null @@ -1,133 +0,0 @@ -# -*- sh -*- -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. -# Copyright (c) 2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -# -# Database for mapping architecture and assembly format to prebuilt -# assembly files. For explination of the assembly operations, see -# the inline assembly header files in src/include/sys/. -# -# FORMAT: -# ARCHITECTURE ASSEMBLY FORMAT BASE FILENAME -# -# Assembly Format field: -# config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack - -###################################################################### -# -# AMD Opteron / Intel EM64T -# -###################################################################### - -X86_64 default-.text-.globl-:--.L-@-1-0-1-1-1 x86_64-linux -X86_64 default-.text-.globl-:--.L-@-1-0-1-1-0 x86_64-linux-nongas - - -###################################################################### -# -# ARM (ARMv7 and later) -# -###################################################################### - -ARM default-.text-.globl-:--.L-#-1-1-1-1-1 arm-linux - - -###################################################################### -# -# Intel Pentium Class -# -###################################################################### - -IA32 default-.text-.globl-:--.L-@-1-0-1-1-1 ia32-linux -IA32 default-.text-.globl-:--.L-@-1-0-1-1-0 ia32-linux-nongas -IA32 default-.text-.globl-:-_-L--0-1-1-1-0 ia32-osx -IA32 default-.text-.globl-:-_-L--0-0-1-1-1 ia32-cygwin -IA32 default-.text-.globl-:-_-L--0-0-1-1-0 ia32-cygwin-nongas - - -###################################################################### -# -# IA64 (Intel Itanium) -# -###################################################################### - -IA64 default-.text-.globl-:--.L-@-1-0-1-1-1 ia64-linux -IA64 default-.text-.globl-:--.L-@-1-0-1-1-0 ia64-linux-nongas - - -###################################################################### -# -# PowerPC / POWER -# -###################################################################### - -# standard ppc instruction set (AIX calls it ppc). This is not the -# true intersection of all the POWER / PowerPC machines, but works -# on PowerPCs since the 601 and on at least POWER 3 and above. -POWERPC32 default-.text-.globl-:-_-L--0-1-1-0-0 powerpc32-osx -POWERPC32 default-.text-.globl-:--.L-@-1-1-0-0-1 powerpc32-linux -POWERPC32 default-.text-.globl-:--.L-@-1-1-0-0-0 powerpc32-linux-nongas -POWERPC32 aix-.csect .text[PR]-.globl-:-.-L--0-1-0-0-0 powerpc32-aix - -# The ppc code above, plus support for the 64 bit operations. This -# mode is really only available on OS X when using the OS X 10.3 -# compiler chain with the -mcpu=970 option. -POWERPC32 default-.text-.globl-:-_-L--0-1-1-1-0 powerpc32-64-osx - -# PowerPC / POWER 64bit machines. sizeof(void*) == 8. -POWERPC64 default-.text-.globl-:-_-L--0-1-1-1-0 powerpc64-osx -POWERPC64 default-.text-.globl-:-.-.L-@-1-1-0-1-1 powerpc64-linux -POWERPC64 default-.text-.globl-:-.-.L-@-1-1-0-1-0 powerpc64-linux-nongas -POWERPC64 aix-.csect .text[PR]-.globl-:-.-L--0-1-0-1-0 powerpc64-aix - - -###################################################################### -# -# SPARC / UltraSPARC (Scalalable Processor ARChitecture) -# -###################################################################### - -# Usually compiled with -xarch=v8plus. Basically Sparc V9, but with -# sizeof(void*) == 4 instead of 8. Different from V9_64 because still -# uses 2 registers to pass in a 64bit integer -SPARCV9_32 default-.text-.globl-:--.L-#-1-0-1-1-0 sparcv9-32-solaris - -# The Sparc v9 (aka Ultra Sparc). Sizeof(void*) == 8. -SPARCV9_64 default-.text-.globl-:--.L-#-1-0-1-1-0 sparcv9-64-solaris - - -###################################################################### -# -# MIPS III (Microprocessor without Interlocked Pipeline Stages) -# R4000 and above -# -###################################################################### - -# So MIPS, in it's infinite wisdom (thank you!) decided that when -# compiling in 32bit mode and passing in a 64bit integer, it is done -# in one register (instead of SPARC and POWER, who use two). Which -# means that we can use the same code either way. Woo hoo! - -MIPS default-.text-.globl-:--L--1-1-1-1-0 mips-irix -MIPS default-.text-.globl-:--L--1-1-1-1-0 mips64el -MIPS default-.text-.globl-:--L-@-1-1-1-1-1 mips64-linux - -# However, this doesn't hold true for 32-bit MIPS as used on Linux. -MIPS default-.text-.globl-:--L-@-1-1-1-0-1 mips-linux diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm.c b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm.c deleted file mode 100644 index 35811b37604..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/asm.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "src/include/pmix_config.h" - -#include "src/atomics/sys/atomic.h" -#include "src/atomics/sys/architecture.h" - -#if PMIX_ASSEMBLY_ARCH == PMIX_SPARC - -#define LOCKS_TABLE_SIZE 8 -/* make sure to get into reasonably useful bits (so shift at least 5) */ -#define FIND_LOCK(addr) (&(locks_table[(((unsigned long) addr) >> 8) & \ - (LOCKS_TABLE_SIZE - 1)])) - -/* have to fix if you change LOCKS_TABLE_SIZE */ -static pmix_atomic_lock_t locks_table[LOCKS_TABLE_SIZE] = { - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } }, - { { PMIX_ATOMIC_UNLOCKED } } -}; - - -int32_t -pmix_atomic_add_32(volatile int32_t *addr, int delta) -{ - int32_t ret; - - pmix_atomic_lock(FIND_LOCK(addr)); - - ret = (*addr += delta); - - pmix_atomic_unlock(FIND_LOCK(addr)); - - return ret; -} - - -int32_t -pmix_atomic_sub_32(volatile int32_t *addr, int delta) -{ - int32_t ret; - - pmix_atomic_lock(FIND_LOCK(addr)); - - ret = (*addr -= delta); - - pmix_atomic_unlock(FIND_LOCK(addr)); - - return ret; -} - - -#endif /* PMIX_ASSEMBLY_ARCH == PMIX_SPARC32 */ diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/ARM.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/ARM.asm deleted file mode 100644 index e3720299f77..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/ARM.asm +++ /dev/null @@ -1,153 +0,0 @@ -START_FILE - TEXT - - ALIGN(4) -START_FUNC(pmix_atomic_mb) - dmb - bx lr -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - dmb - bx lr -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - dmb - bx lr -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - LSYM(1) - ldrex r3, [r0] - cmp r1, r3 - bne REFLSYM(2) - strex r12, r2, [r0] - cmp r12, #0 - bne REFLSYM(1) - mov r0, #1 - LSYM(2) - movne r0, #0 - bx lr -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_acq_32) - LSYM(3) - ldrex r3, [r0] - cmp r1, r3 - bne REFLSYM(4) - strex r12, r2, [r0] - cmp r12, #0 - bne REFLSYM(3) - dmb - mov r0, #1 - LSYM(4) - movne r0, #0 - bx lr -END_FUNC(pmix_atomic_cmpset_acq_32) - - -START_FUNC(pmix_atomic_cmpset_rel_32) - LSYM(5) - ldrex r3, [r0] - cmp r1, r3 - bne REFLSYM(6) - dmb - strex r12, r2, [r0] - cmp r12, #0 - bne REFLSYM(4) - mov r0, #1 - LSYM(6) - movne r0, #0 - bx lr -END_FUNC(pmix_atomic_cmpset_rel_32) - -#START_64BIT -START_FUNC(pmix_atomic_cmpset_64) - push {r4-r7} - ldrd r6, r7, [sp, #16] - LSYM(7) - ldrexd r4, r5, [r0] - cmp r4, r2 - it eq - cmpeq r5, r3 - bne REFLSYM(8) - strexd r1, r6, r7, [r0] - cmp r1, #0 - bne REFLSYM(7) - mov r0, #1 - LSYM(8) - movne r0, #0 - pop {r4-r7} - bx lr -END_FUNC(pmix_atomic_cmpset_64) - -START_FUNC(pmix_atomic_cmpset_acq_64) - push {r4-r7} - ldrd r6, r7, [sp, #16] - LSYM(9) - ldrexd r4, r5, [r0] - cmp r4, r2 - it eq - cmpeq r5, r3 - bne REFLSYM(10) - strexd r1, r6, r7, [r0] - cmp r1, #0 - bne REFLSYM(9) - dmb - mov r0, #1 - LSYM(10) - movne r0, #0 - pop {r4-r7} - bx lr -END_FUNC(pmix_atomic_cmpset_acq_64) - - -START_FUNC(pmix_atomic_cmpset_rel_64) - push {r4-r7} - ldrd r6, r7, [sp, #16] - LSYM(11) - ldrexd r4, r5, [r0] - cmp r4, r2 - it eq - cmpeq r5, r3 - bne REFLSYM(12) - dmb - strexd r1, r6, r7, [r0] - cmp r1, #0 - bne REFLSYM(11) - mov r0, #1 - LSYM(12) - movne r0, #0 - pop {r4-r7} - bx lr -END_FUNC(pmix_atomic_cmpset_rel_64) -#END_64BIT - - -START_FUNC(pmix_atomic_add_32) - LSYM(13) - ldrex r2, [r0] - add r2, r2, r1 - strex r3, r2, [r0] - cmp r3, #0 - bne REFLSYM(13) - mov r0, r2 - bx lr -END_FUNC(pmix_atomic_add_32) - - -START_FUNC(pmix_atomic_sub_32) - LSYM(14) - ldrex r2, [r0] - sub r2, r2, r1 - strex r3, r2, [r0] - cmp r3, #0 - bne REFLSYM(14) - mov r0, r2 - bx lr -END_FUNC(pmix_atomic_sub_32) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA32.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA32.asm deleted file mode 100644 index d145aa237e5..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA32.asm +++ /dev/null @@ -1,110 +0,0 @@ -START_FILE - TEXT - -START_FUNC(pmix_atomic_mb) - pushl %ebp - movl %esp, %ebp - leave - ret -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - pushl %ebp - movl %esp, %ebp - leave - ret -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - pushl %ebp - movl %esp, %ebp - leave - ret -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_64) - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_atomic_add_32) - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret -END_FUNC(pmix_atomic_add_32) - - -START_FUNC(pmix_atomic_sub_32) - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret -END_FUNC(pmix_atomic_sub_32) - - -START_FUNC(pmix_sys_timer_get_cycles) - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA64.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA64.asm deleted file mode 100644 index a7287a8ffce..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/IA64.asm +++ /dev/null @@ -1,109 +0,0 @@ -START_FILE - - .pred.safe_across_calls p1-p5,p16-p63 - .text - .align 16 - .global pmix_atomic_mb# - .proc pmix_atomic_mb# -pmix_atomic_mb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_mb# - .align 16 - .global pmix_atomic_rmb# - .proc pmix_atomic_rmb# -pmix_atomic_rmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_rmb# - .align 16 - .global pmix_atomic_wmb# - .proc pmix_atomic_wmb# -pmix_atomic_wmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_wmb# - .align 16 - .global pmix_atomic_cmpset_acq_32# - .proc pmix_atomic_cmpset_acq_32# -pmix_atomic_cmpset_acq_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.acq r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_32# - .align 16 - .global pmix_atomic_cmpset_rel_32# - .proc pmix_atomic_cmpset_rel_32# -pmix_atomic_cmpset_rel_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.rel r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_32# - .align 16 - .global pmix_atomic_cmpset_acq_64# - .proc pmix_atomic_cmpset_acq_64# -pmix_atomic_cmpset_acq_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.acq r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_64# - .align 16 - .global pmix_atomic_cmpset_rel_64# - .proc pmix_atomic_cmpset_rel_64# -pmix_atomic_cmpset_rel_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.rel r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_64# - .align 16 - .global pmix_sys_timer_get_cycles# - .proc pmix_sys_timer_get_cycles# -pmix_sys_timer_get_cycles: - .prologue - .body - mov r8=ar.itc - br.ret.sptk.many b0 - ;; - .endp pmix_sys_timer_get_cycles# - .ident "GCC: (GNU) 3.2.3 20030502 (Red Hat Linux 3.2.3-49)" diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/MIPS.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/MIPS.asm deleted file mode 100644 index a30ac9f9b52..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/MIPS.asm +++ /dev/null @@ -1,196 +0,0 @@ -START_FILE - -#ifdef __linux__ -#include -#else -#include -#endif -#include - - TEXT - - ALIGN(8) -LEAF(pmix_atomic_mb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_mb) - - - ALIGN(8) -LEAF(pmix_atomic_rmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_rmb) - - -LEAF(pmix_atomic_wmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_wmb) - - -LEAF(pmix_atomic_cmpset_32) - .set noreorder -retry1: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done1 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry1 -done1: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_32) - - -LEAF(pmix_atomic_cmpset_acq_32) - .set noreorder -retry2: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done2 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry2 -done2: -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_32) - - -LEAF(pmix_atomic_cmpset_rel_32) - .set noreorder -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif -retry3: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done3 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry3 -done3: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_32) - -#ifdef __mips64 -LEAF(pmix_atomic_cmpset_64) - .set noreorder -retry4: - lld $3, 0($4) - bne $3, $5, done4 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry4 -done4: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_64) - - -LEAF(pmix_atomic_cmpset_acq_64) - .set noreorder -retry5: - lld $3, 0($4) - bne $3, $5, done5 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry5 -done5: - sync - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_64) - - -LEAF(pmix_atomic_cmpset_rel_64) - .set noreorder - sync -retry6: - lld $3, 0($4) - bne $3, $5, done6 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry6 -done6: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_64) -#endif /* __mips64 */ diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC32.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC32.asm deleted file mode 100644 index f341367806e..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC32.asm +++ /dev/null @@ -1,168 +0,0 @@ -START_FILE - TEXT - - ALIGN(4) -START_FUNC(pmix_atomic_mb) - sync - blr -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - lwsync - blr -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - eieio - blr -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - LSYM(1) lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- REFLSYM(2) - stwcx. r5, 0, r3 - bne- REFLSYM(1) - LSYM(2) - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_acq_32) - LSYM(3) lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- REFLSYM(4) - stwcx. r5, 0, r3 - bne- REFLSYM(3) - sync - LSYM(4) - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - lwsync - blr -END_FUNC(pmix_atomic_cmpset_acq_32) - - -START_FUNC(pmix_atomic_cmpset_rel_32) - eieio - LSYM(5) lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- REFLSYM(6) - stwcx. r5, 0, r3 - bne- REFLSYM(5) - sync - LSYM(6) - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_rel_32) - -#START_64BIT -START_FUNC(pmix_atomic_cmpset_64) - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - LSYM(7) ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- REFLSYM(8) - stdcx. r7, 0, r3 - bne- REFLSYM(7) - LSYM(8) - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_atomic_cmpset_acq_64) - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - - LSYM(9) ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- REFLSYM(10) - stdcx. r7, 0, r3 - bne- REFLSYM(9) - LSYM(10) - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr - lwsync - blr -END_FUNC(pmix_atomic_cmpset_acq_64) - - -START_FUNC(pmix_atomic_cmpset_rel_64) - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - - eieio - LSYM(11) ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- REFLSYM(12) - stdcx. r7, 0, r3 - bne- REFLSYM(11) - LSYM(12) - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr - lwsync - blr -END_FUNC(pmix_atomic_cmpset_rel_64) -#END_64BIT - - -START_FUNC(pmix_atomic_add_32) - LSYM(13) lwarx r0, 0, r3 - add r0, r4, r0 - stwcx. r0, 0, r3 - bne- REFLSYM(13) - mr r3,r0 - blr -END_FUNC(pmix_atomic_add_32) - - -START_FUNC(pmix_atomic_sub_32) - LSYM(14) lwarx r0,0,r3 - subf r0,r4,r0 - stwcx. r0,0,r3 - bne- REFLSYM(14) - mr r3,r0 - blr -END_FUNC(pmix_atomic_sub_32) - -START_FUNC(pmix_sys_timer_get_cycles) - LSYM(15) - mftbu r0 - mftb r11 - mftbu r2 - cmpw cr7,r2,r0 - bne+ cr7,REFLSYM(15) - li r4,0 - li r9,0 - or r3,r2,r9 - or r4,r4,r11 - blr -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC64.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC64.asm deleted file mode 100644 index 6fc4ad717c7..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/POWERPC64.asm +++ /dev/null @@ -1,157 +0,0 @@ -START_FILE - TEXT - - ALIGN(4) -START_FUNC(pmix_atomic_mb) - sync - blr -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - lwsync - blr -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - eieio - blr -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - LSYM(1) lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- REFLSYM(2) - stwcx. r5, 0, r3 - bne- REFLSYM(1) - LSYM(2) - cmpw cr7,r0,r4 - mfcr r3 - rlwinm r3,r3,31,1 - blr -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_acq_32) - mflr r0 - std r29,-24(r1) - std r0,16(r1) - stdu r1,-144(r1) - bl REFGSYM(pmix_atomic_cmpset_32) - mr r29,r3 - bl REFGSYM(pmix_atomic_rmb) - mr r3,r29 - addi r1,r1,144 - ld r0,16(r1) - mtlr r0 - ld r29,-24(r1) - blr -END_FUNC(pmix_atomic_cmpset_acq_32) - - -START_FUNC(pmix_atomic_cmpset_rel_32) - mflr r0 - std r27,-40(r1) - std r28,-32(r1) - std r29,-24(r1) - std r0,16(r1) - stdu r1,-160(r1) - mr r29,r3 - mr r28,r4 - mr r27,r5 - bl REFGSYM(pmix_atomic_wmb) - mr r3,r29 - mr r4,r28 - mr r5,r27 - bl REFGSYM(pmix_atomic_cmpset_32) - addi r1,r1,160 - ld r0,16(r1) - mtlr r0 - ld r27,-40(r1) - ld r28,-32(r1) - ld r29,-24(r1) - blr -END_FUNC(pmix_atomic_cmpset_rel_32) - - -START_FUNC(pmix_atomic_cmpset_64) - LSYM(3) ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- REFLSYM(4) - stdcx. r5, 0, r3 - bne- REFLSYM(3) - LSYM(4) - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_atomic_cmpset_acq_64) - LSYM(7) ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- REFLSYM(8) - stdcx. r5, 0, r3 - bne- REFLSYM(7) - LSYM(8) - lwsync - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_acq_64) - - -START_FUNC(pmix_atomic_cmpset_rel_64) - eieio - LSYM(9) ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- REFLSYM(10) - stdcx. r5, 0, r3 - bne- REFLSYM(9) - LSYM(10) - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr -END_FUNC(pmix_atomic_cmpset_rel_64) - - -START_FUNC(pmix_atomic_add_32) - LSYM(5) lwarx r0, 0, r3 - add r0, r4, r0 - stwcx. r0, 0, r3 - bne- REFLSYM(5) - - mr r3,r0 - blr -END_FUNC(pmix_atomic_add_32) - - -START_FUNC(pmix_atomic_sub_32) - LSYM(6) lwarx r0,0,r3 - subf r0,r4,r0 - stwcx. r0,0,r3 - bne- REFLSYM(6) - - mr r3,r0 - blr -END_FUNC(pmix_atomic_sub_32) - -START_FUNC(pmix_sys_timer_get_cycles) - LSYM(11) - mftbu r2 - rldicl r2,r2,0,32 - mftb r0 - rldicl r9,r0,0,32 - mftbu r0 - rldicl r0,r0,0,32 - cmpw cr7,r0,r2 - bne cr7,REFLSYM(11) - sldi r3,r0,32 - or r3,r3,r9 - blr -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_32.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_32.asm deleted file mode 100644 index 1ec34125a05..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_32.asm +++ /dev/null @@ -1,171 +0,0 @@ -START_FILE - TEXT - - ALIGN(4) - - -START_FUNC(pmix_atomic_mb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad - retl - nop -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad - retl - nop -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - retl - nop -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_acq_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - subx %g0, -1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 -END_FUNC(pmix_atomic_cmpset_acq_32) - - -START_FUNC(pmix_atomic_cmpset_rel_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 -END_FUNC(pmix_atomic_cmpset_rel_32) - - -START_FUNC(pmix_atomic_cmpset_64) - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i3, %o4 - mov %i4, %o5 - st %i1, [%fp-32] - st %i2, [%fp-28] - std %o4, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne REFLSYM(12) - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a REFLSYM(12) - mov 1, %i0 -LSYM(12) - ret - restore -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_atomic_cmpset_acq_64) - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i1, %o4 - mov %i2, %o5 - mov %i3, %o2 - mov %i4, %o3 - std %o4, [%fp-32] - std %o2, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne REFLSYM(16) - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a REFLSYM(16) - mov 1, %i0 -LSYM(16) - membar #LoadLoad - ret - restore -END_FUNC(pmix_atomic_cmpset_acq_64) - - -START_FUNC(pmix_atomic_cmpset_rel_64) - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i1, %o4 - mov %i2, %o5 - mov %i3, %o2 - mov %i4, %o3 - membar #StoreStore - std %o4, [%fp-32] - std %o2, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne REFLSYM(21) - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a REFLSYM(21) - mov 1, %i0 -LSYM(21) - ret - restore -END_FUNC(pmix_atomic_cmpset_rel_64) - - -START_FUNC(pmix_sys_timer_get_cycles) - save %sp,-96,%sp - rd %tick,%o0 - srlx %o0,32,%o1 - or %g0,%o1,%i0 - ret ! Result = %i0 - restore %o0,0,%o1 -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_64.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_64.asm deleted file mode 100644 index 85825577db7..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/SPARCV9_64.asm +++ /dev/null @@ -1,111 +0,0 @@ -START_FILE - TEXT - - ALIGN(4) - - -START_FUNC(pmix_atomic_mb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad - retl - nop -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad - retl - nop -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - retl - nop -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_acq_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - subx %g0, -1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 -END_FUNC(pmix_atomic_cmpset_acq_32) - - -START_FUNC(pmix_atomic_cmpset_rel_32) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 -END_FUNC(pmix_atomic_cmpset_rel_32) - - -START_FUNC(pmix_atomic_cmpset_64) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - retl - movre %o2, 1, %o0 -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_atomic_cmpset_acq_64) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - movre %o2, 1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 -END_FUNC(pmix_atomic_cmpset_acq_64) - - -START_FUNC(pmix_atomic_cmpset_rel_64) - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - retl - movre %o2, 1, %o0 -END_FUNC(pmix_atomic_cmpset_rel_64) - - -START_FUNC(pmix_sys_timer_get_cycles) - save %sp,-176,%sp - rd %tick,%o0 - ret ! Result = %i0 - restore %o0,0,%o0 -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/X86_64.asm b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/X86_64.asm deleted file mode 100644 index 042c07109ec..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/X86_64.asm +++ /dev/null @@ -1,52 +0,0 @@ -START_FILE - TEXT - -START_FUNC(pmix_atomic_mb) - pushq %rbp - movq %rsp, %rbp - leave - ret -END_FUNC(pmix_atomic_mb) - - -START_FUNC(pmix_atomic_rmb) - pushq %rbp - movq %rsp, %rbp - leave - ret -END_FUNC(pmix_atomic_rmb) - - -START_FUNC(pmix_atomic_wmb) - pushq %rbp - movq %rsp, %rbp - leave - ret -END_FUNC(pmix_atomic_wmb) - - -START_FUNC(pmix_atomic_cmpset_32) - movl %esi, %eax - lock; cmpxchgl %edx,(%rdi) - sete %dl - movzbl %dl, %eax - ret -END_FUNC(pmix_atomic_cmpset_32) - - -START_FUNC(pmix_atomic_cmpset_64) - movq %rsi, %rax - lock; cmpxchgq %rdx,(%rdi) - sete %dl - movzbl %dl, %eax - ret -END_FUNC(pmix_atomic_cmpset_64) - - -START_FUNC(pmix_sys_timer_get_cycles) - rdtsc - salq $32, %rdx - mov %eax, %eax - orq %rdx, %rax - ret -END_FUNC(pmix_sys_timer_get_cycles) diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/aix.conf b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/aix.conf deleted file mode 100755 index 482aabdd418..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/aix.conf +++ /dev/null @@ -1,44 +0,0 @@ -sub start_file() -{ - my $ret = ""; - if ($IS64BIT == 1) { - $ret .= "\t.machine \"ppc64\"\n"; - } else { - $ret .= "\t.machine \"ppc\"\n"; - } - $ret .= "\t.toc\n"; - return $ret; -} - - -sub start_func($) -{ - my $func_name = shift; - my $ret = ""; - - $ret = "\t$GLOBAL $func_name\n"; - $ret .= "\t$GLOBAL $GSYM$func_name\n"; - $ret .= "\t.csect [DS],3\n"; - - $ret .= "$func_name$SUFFIX\n"; - - if ($IS64BIT == 1) { - $ret .= "\t.llong .$func_name, TOC[tc0], 0\n"; - } else { - $ret .= "\t.long .$func_name, TOC[tc0], 0\n"; - } - $ret .= "\t.csect [PR]\n"; - - $ret .= "\t.align 2\n"; - $ret .= "$GSYM$func_name$SUFFIX\n"; - - return $ret; -} - - -sub end_func($) -{ - return ""; -} - -1 diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/default.conf b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/default.conf deleted file mode 100755 index c54f085cf99..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/base/default.conf +++ /dev/null @@ -1,34 +0,0 @@ -sub start_file -{ - return ""; -} - - -sub start_func($) -{ - my $func_name = shift; - my $ret = ""; - - $ret = "\t$GLOBAL $GSYM$func_name\n"; - if (! $TYPE eq "") { - $ret .= "\t.type $GSYM$func_name, $TYPE" . "function\n"; - } - $ret .= "$GSYM$func_name$SUFFIX\n"; - - return $ret; -} - - -sub end_func($) -{ - my $func_name = shift; - my $ret = ""; - - if ($SIZE != 0) { - $ret = "\t.size $GSYM$func_name, .-$GSYM$func_name\n"; - } - - return $ret; -} - -1 diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-all-asm.pl b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-all-asm.pl deleted file mode 100755 index e452cbeaf2e..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-all-asm.pl +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/perl -w - -my $perl = shift; -my $srcdir = shift; -my $destdir = shift; - -if (! $perl || ! $srcdir || ! $destdir) { - print "ERROR: invalid argument to generate-all-asm.pl\n"; - print "usage: generate-all-asm.pl [PERL] [SRCDIR] [DESTDIR]\n"; - exit 1; -} - -open(DATAFILE, "$srcdir/asm-data.txt") || die "Could not open data file: $!\n"; - -my $ASMARCH = ""; -my $ASMFORMAT = ""; -my $ASMFILE = ""; - -while() { - if (/^#/) { next; } - ($ASMARCH, $ASMFORMAT, $ASMFILE) = /(.*)\t(.*)\t(.*)/; - if (! $ASMARCH || ! $ASMFORMAT) { next; } - - print "--> Generating assembly for \"$ASMARCH\" \"$ASMFORMAT\"\n"; - system("$perl \'$srcdir/generate-asm.pl\' \'$ASMARCH\' \'$ASMFORMAT\' \'$srcdir/base\' \'$destdir/generated/atomic-$ASMFILE.s\'"); - -} diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-asm.pl b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-asm.pl deleted file mode 100644 index 167a2a6e5e5..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generate-asm.pl +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/perl -w -# -# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - - -my $asmarch = shift; -my $asmformat = shift; -my $basedir = shift; -my $output = shift; - -if ( ! $asmarch) { - print "usage: generate-asm.pl [ASMARCH] [ASMFORMAT] [BASEDIR] [OUTPUT NAME]\n"; - exit(1); -} - -open(INPUT, "$basedir/$asmarch.asm") || - die "Could not open $basedir/$asmarch.asm: $!\n"; -open(OUTPUT, ">$output") || die "Could not open $output: $!\n"; - -$CONFIG = "default"; -$TEXT = ""; -$GLOBAL = ""; -$SUFFIX = ""; -$GSYM = ""; -$LSYM = ""; -$TYPE = ""; -$SIZE = 0; -$ALIGN_LOG = 0; -$DEL_R_REG = 0; -$IS64BIT = 0; - -($CONFIG, $TEXT, $GLOBAL, $SUFFIX, $GSYM, $LSYM, $TYPE, $SIZE, $ALIGN_LOG, $DEL_R_REG, $IS64BIT, $GNU_STACK) = ( - $asmformat =~ /(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)\-(.*)/); - -if (0) { -print "$asmformat\n"; -print "CONFIG: $CONFIG\n"; -print "TEXT: $TEXT\n"; -print "GLOBAL: $GLOBAL\n"; -print "SUFFIX: $SUFFIX\n"; -print "GSYM: $GSYM\n"; -print "LSYM: $LSYM\n"; -print "GNU_STACK: $GNU_STACK\n"; -} - -my $current_func = ""; -my $delete = 0; - -# load our configuration -do "$basedir/$CONFIG.conf" or die "Could not open config file $basedir/$CONFIG.conf: $!\n"; - -while () { - s/TEXT/$TEXT/g; - s/GLOBAL/$GLOBAL/g; - s/REFGSYM\((.*)\)/$GSYM$1/g; - s/REFLSYM\((.*)\)/$LSYM$1/g; - s/GSYM\((.*)\)/$GSYM$1$SUFFIX/g; - s/LSYM\((.*)\)/$LSYM$1$SUFFIX/g; - - if ($DEL_R_REG == 0) { - s/cr([0-9][0-9]?)/$1/g; - s/r([0-9][0-9]?)/$1/g; - } - - if (/START_FILE/) { - $_ = start_file(); - } - - if (/START_FUNC\((.*)\)/) { - $current_func = $1; - $_ = start_func($current_func); - } - - if (/END_FUNC\((.*)\)/) { - $current_func = $1; - $_ = end_func($current_func); - } - - if ($ALIGN_LOG == 0) { - s/ALIGN\((\d*)\)/.align $1/g; - } else { - # Ugh... - if (m/ALIGN\((\d*)\)/) { - $val = $1; - $result = 0; - while ($val > 1) { $val /= 2; $result++ } - s/ALIGN\((\d*)\)/.align $result/; - } - } - - if (/^\#START_64BIT/) { - $_ = ""; - if ($IS64BIT == 0) { - $delete = 1; - } - } - if (/^\#END_64BIT/) { - $_ = ""; - $delete = 0; - } - - if ($delete == 0) { - print OUTPUT $_; - } -} - -if ($GNU_STACK == 1) { - if ($asmarch eq "ARM") { - print OUTPUT "\n\t.section\t.note.GNU-stack,\"\",\%progbits\n"; - } else { - print OUTPUT "\n\t.section\t.note.GNU-stack,\"\",\@progbits\n"; - } -} - -close(INPUT); -close(OUTPUT); diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin-nongas.s deleted file mode 100644 index 0eabeddf488..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin-nongas.s +++ /dev/null @@ -1,109 +0,0 @@ - .text - - .globl _pmix_atomic_mb -_pmix_atomic_mb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret - - - .globl _pmix_atomic_cmpset_64 -_pmix_atomic_cmpset_64: - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin.s deleted file mode 100644 index 9ffab89085f..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-cygwin.s +++ /dev/null @@ -1,111 +0,0 @@ - .text - - .globl _pmix_atomic_mb -_pmix_atomic_mb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret - - - .globl _pmix_atomic_cmpset_64 -_pmix_atomic_cmpset_64: - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux-nongas.s deleted file mode 100644 index 99971a156e7..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux-nongas.s +++ /dev/null @@ -1,125 +0,0 @@ - .text - - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, @function -pmix_atomic_cmpset_64: - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_atomic_add_32 - .type pmix_atomic_add_32, @function -pmix_atomic_add_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret - .size pmix_atomic_add_32, .-pmix_atomic_add_32 - - - .globl pmix_atomic_sub_32 - .type pmix_atomic_sub_32, @function -pmix_atomic_sub_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret - .size pmix_atomic_sub_32, .-pmix_atomic_sub_32 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux.s deleted file mode 100644 index a1f639ea514..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-linux.s +++ /dev/null @@ -1,127 +0,0 @@ - .text - - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - pushl %ebp - movl %esp, %ebp - leave - ret - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, @function -pmix_atomic_cmpset_64: - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_atomic_add_32 - .type pmix_atomic_add_32, @function -pmix_atomic_add_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret - .size pmix_atomic_add_32, .-pmix_atomic_add_32 - - - .globl pmix_atomic_sub_32 - .type pmix_atomic_sub_32, @function -pmix_atomic_sub_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret - .size pmix_atomic_sub_32, .-pmix_atomic_sub_32 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-osx.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-osx.s deleted file mode 100644 index 0eabeddf488..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia32-osx.s +++ /dev/null @@ -1,109 +0,0 @@ - .text - - .globl _pmix_atomic_mb -_pmix_atomic_mb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - pushl %ebp - movl %esp, %ebp - leave - ret - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %edx - movl 16(%ebp), %ecx - movl 12(%ebp), %eax - lock; cmpxchgl %ecx,(%edx) - sete %dl - - movzbl %dl, %eax - leave - ret - - - .globl _pmix_atomic_cmpset_64 -_pmix_atomic_cmpset_64: - pushl %ebp - movl %esp, %ebp - subl $32, %esp - movl %ebx, -12(%ebp) - movl %esi, -8(%ebp) - movl %edi, -4(%ebp) - movl 8(%ebp), %edi - movl 12(%ebp), %eax - movl 16(%ebp), %edx - movl %eax, -24(%ebp) - movl %edx, -20(%ebp) - movl 20(%ebp), %eax - movl 24(%ebp), %edx - movl %eax, -32(%ebp) - movl %edx, -28(%ebp) - movl -24(%ebp), %ebx - movl -20(%ebp), %edx - movl -32(%ebp), %esi - movl -28(%ebp), %ecx - movl %ebx, %eax - push %ebx - movl %esi, %ebx - lock; cmpxchg8b (%edi) - sete %dl - pop %ebx - - movzbl %dl, %eax - movl -12(%ebp), %ebx - movl -8(%ebp), %esi - movl -4(%ebp), %edi - movl %ebp, %esp - popl %ebp - ret - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; addl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - pushl %ebp - movl %esp, %ebp - movl 8(%ebp), %eax - movl 12(%ebp), %edx - lock; subl %edx,(%eax) - movl (%eax), %eax - leave - ret - - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - pushl %ebp - movl %esp, %ebp - rdtsc - popl %ebp - ret diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux-nongas.s deleted file mode 100644 index 9e13953f4bd..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux-nongas.s +++ /dev/null @@ -1,108 +0,0 @@ - - .pred.safe_across_calls p1-p5,p16-p63 - .text - .align 16 - .global pmix_atomic_mb# - .proc pmix_atomic_mb# -pmix_atomic_mb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_mb# - .align 16 - .global pmix_atomic_rmb# - .proc pmix_atomic_rmb# -pmix_atomic_rmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_rmb# - .align 16 - .global pmix_atomic_wmb# - .proc pmix_atomic_wmb# -pmix_atomic_wmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_wmb# - .align 16 - .global pmix_atomic_cmpset_acq_32# - .proc pmix_atomic_cmpset_acq_32# -pmix_atomic_cmpset_acq_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.acq r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_32# - .align 16 - .global pmix_atomic_cmpset_rel_32# - .proc pmix_atomic_cmpset_rel_32# -pmix_atomic_cmpset_rel_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.rel r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_32# - .align 16 - .global pmix_atomic_cmpset_acq_64# - .proc pmix_atomic_cmpset_acq_64# -pmix_atomic_cmpset_acq_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.acq r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_64# - .align 16 - .global pmix_atomic_cmpset_rel_64# - .proc pmix_atomic_cmpset_rel_64# -pmix_atomic_cmpset_rel_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.rel r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_64# - .align 16 - .global pmix_sys_timer_get_cycles# - .proc pmix_sys_timer_get_cycles# -pmix_sys_timer_get_cycles: - .prologue - .body - mov r8=ar.itc - br.ret.sptk.many b0 - ;; - .endp pmix_sys_timer_get_cycles# - .ident "GCC: (GNU) 3.2.3 20030502 (Red Hat Linux 3.2.3-49)" diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux.s deleted file mode 100644 index 2bc097f2af1..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-ia64-linux.s +++ /dev/null @@ -1,110 +0,0 @@ - - .pred.safe_across_calls p1-p5,p16-p63 - .text - .align 16 - .global pmix_atomic_mb# - .proc pmix_atomic_mb# -pmix_atomic_mb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_mb# - .align 16 - .global pmix_atomic_rmb# - .proc pmix_atomic_rmb# -pmix_atomic_rmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_rmb# - .align 16 - .global pmix_atomic_wmb# - .proc pmix_atomic_wmb# -pmix_atomic_wmb: - .prologue - .body - mf - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_wmb# - .align 16 - .global pmix_atomic_cmpset_acq_32# - .proc pmix_atomic_cmpset_acq_32# -pmix_atomic_cmpset_acq_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.acq r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_32# - .align 16 - .global pmix_atomic_cmpset_rel_32# - .proc pmix_atomic_cmpset_rel_32# -pmix_atomic_cmpset_rel_32: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg4.rel r32=[r32],r34,ar.ccv - ;; - cmp4.eq p6, p7 = r32, r33 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_32# - .align 16 - .global pmix_atomic_cmpset_acq_64# - .proc pmix_atomic_cmpset_acq_64# -pmix_atomic_cmpset_acq_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.acq r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_acq_64# - .align 16 - .global pmix_atomic_cmpset_rel_64# - .proc pmix_atomic_cmpset_rel_64# -pmix_atomic_cmpset_rel_64: - .prologue - .body - mov ar.ccv=r33;; - cmpxchg8.rel r32=[r32],r34,ar.ccv - ;; - cmp.eq p6, p7 = r33, r32 - ;; - (p6) addl r8 = 1, r0 - (p7) mov r8 = r0 - br.ret.sptk.many b0 - ;; - .endp pmix_atomic_cmpset_rel_64# - .align 16 - .global pmix_sys_timer_get_cycles# - .proc pmix_sys_timer_get_cycles# -pmix_sys_timer_get_cycles: - .prologue - .body - mov r8=ar.itc - br.ret.sptk.many b0 - ;; - .endp pmix_sys_timer_get_cycles# - .ident "GCC: (GNU) 3.2.3 20030502 (Red Hat Linux 3.2.3-49)" - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-irix.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-irix.s deleted file mode 100644 index 27d4ae3d87b..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-irix.s +++ /dev/null @@ -1,195 +0,0 @@ - -#ifdef __linux__ -#include -#else -#include -#endif -#include - - .text - - .align 3 -LEAF(pmix_atomic_mb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_mb) - - - .align 3 -LEAF(pmix_atomic_rmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_rmb) - - -LEAF(pmix_atomic_wmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_wmb) - - -LEAF(pmix_atomic_cmpset_32) - .set noreorder -retry1: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done1 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry1 -done1: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_32) - - -LEAF(pmix_atomic_cmpset_acq_32) - .set noreorder -retry2: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done2 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry2 -done2: -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_32) - - -LEAF(pmix_atomic_cmpset_rel_32) - .set noreorder -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif -retry3: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done3 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry3 -done3: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_32) - -#ifdef __mips64 -LEAF(pmix_atomic_cmpset_64) - .set noreorder -retry4: - lld $3, 0($4) - bne $3, $5, done4 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry4 -done4: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_64) - - -LEAF(pmix_atomic_cmpset_acq_64) - .set noreorder -retry5: - lld $3, 0($4) - bne $3, $5, done5 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry5 -done5: - sync - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_64) - - -LEAF(pmix_atomic_cmpset_rel_64) - .set noreorder - sync -retry6: - lld $3, 0($4) - bne $3, $5, done6 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry6 -done6: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_64) -#endif /* __mips64 */ diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-linux.s deleted file mode 100644 index 9339285f890..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips-linux.s +++ /dev/null @@ -1,197 +0,0 @@ - -#ifdef __linux__ -#include -#else -#include -#endif -#include - - .text - - .align 3 -LEAF(pmix_atomic_mb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_mb) - - - .align 3 -LEAF(pmix_atomic_rmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_rmb) - - -LEAF(pmix_atomic_wmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_wmb) - - -LEAF(pmix_atomic_cmpset_32) - .set noreorder -retry1: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done1 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry1 -done1: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_32) - - -LEAF(pmix_atomic_cmpset_acq_32) - .set noreorder -retry2: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done2 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry2 -done2: -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_32) - - -LEAF(pmix_atomic_cmpset_rel_32) - .set noreorder -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif -retry3: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done3 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry3 -done3: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_32) - -#ifdef __mips64 -LEAF(pmix_atomic_cmpset_64) - .set noreorder -retry4: - lld $3, 0($4) - bne $3, $5, done4 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry4 -done4: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_64) - - -LEAF(pmix_atomic_cmpset_acq_64) - .set noreorder -retry5: - lld $3, 0($4) - bne $3, $5, done5 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry5 -done5: - sync - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_64) - - -LEAF(pmix_atomic_cmpset_rel_64) - .set noreorder - sync -retry6: - lld $3, 0($4) - bne $3, $5, done6 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry6 -done6: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_64) -#endif /* __mips64 */ - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64-linux.s deleted file mode 100644 index 9339285f890..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64-linux.s +++ /dev/null @@ -1,197 +0,0 @@ - -#ifdef __linux__ -#include -#else -#include -#endif -#include - - .text - - .align 3 -LEAF(pmix_atomic_mb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_mb) - - - .align 3 -LEAF(pmix_atomic_rmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_rmb) - - -LEAF(pmix_atomic_wmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_wmb) - - -LEAF(pmix_atomic_cmpset_32) - .set noreorder -retry1: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done1 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry1 -done1: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_32) - - -LEAF(pmix_atomic_cmpset_acq_32) - .set noreorder -retry2: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done2 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry2 -done2: -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_32) - - -LEAF(pmix_atomic_cmpset_rel_32) - .set noreorder -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif -retry3: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done3 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry3 -done3: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_32) - -#ifdef __mips64 -LEAF(pmix_atomic_cmpset_64) - .set noreorder -retry4: - lld $3, 0($4) - bne $3, $5, done4 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry4 -done4: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_64) - - -LEAF(pmix_atomic_cmpset_acq_64) - .set noreorder -retry5: - lld $3, 0($4) - bne $3, $5, done5 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry5 -done5: - sync - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_64) - - -LEAF(pmix_atomic_cmpset_rel_64) - .set noreorder - sync -retry6: - lld $3, 0($4) - bne $3, $5, done6 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry6 -done6: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_64) -#endif /* __mips64 */ - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64el.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64el.s deleted file mode 100644 index 27d4ae3d87b..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-mips64el.s +++ /dev/null @@ -1,195 +0,0 @@ - -#ifdef __linux__ -#include -#else -#include -#endif -#include - - .text - - .align 3 -LEAF(pmix_atomic_mb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_mb) - - - .align 3 -LEAF(pmix_atomic_rmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_rmb) - - -LEAF(pmix_atomic_wmb) -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - j ra -END(pmix_atomic_wmb) - - -LEAF(pmix_atomic_cmpset_32) - .set noreorder -retry1: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done1 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry1 -done1: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_32) - - -LEAF(pmix_atomic_cmpset_acq_32) - .set noreorder -retry2: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done2 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry2 -done2: -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_32) - - -LEAF(pmix_atomic_cmpset_rel_32) - .set noreorder -#ifdef __linux__ - .set mips2 -#endif - sync -#ifdef __linux__ - .set mips0 -#endif -retry3: -#ifdef __linux__ - .set mips2 -#endif - ll $3, 0($4) -#ifdef __linux__ - .set mips0 -#endif - bne $3, $5, done3 - or $2, $6, 0 -#ifdef __linux__ - .set mips2 -#endif - sc $2, 0($4) -#ifdef __linux__ - .set mips0 -#endif - beqz $2, retry3 -done3: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_32) - -#ifdef __mips64 -LEAF(pmix_atomic_cmpset_64) - .set noreorder -retry4: - lld $3, 0($4) - bne $3, $5, done4 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry4 -done4: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_64) - - -LEAF(pmix_atomic_cmpset_acq_64) - .set noreorder -retry5: - lld $3, 0($4) - bne $3, $5, done5 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry5 -done5: - sync - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_acq_64) - - -LEAF(pmix_atomic_cmpset_rel_64) - .set noreorder - sync -retry6: - lld $3, 0($4) - bne $3, $5, done6 - or $2, $6, 0 - scd $2, 0($4) - beqz $2, retry6 -done6: - xor $3,$3,$5 - j ra - sltu $2,$3,1 - .set reorder -END(pmix_atomic_cmpset_rel_64) -#endif /* __mips64 */ diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-64-osx.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-64-osx.s deleted file mode 100644 index ebe9d8ad2bb..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-64-osx.s +++ /dev/null @@ -1,165 +0,0 @@ - .text - - .align 2 - .globl _pmix_atomic_mb -_pmix_atomic_mb: - sync - blr - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - lwsync - blr - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - eieio - blr - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - L1: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L2 - stwcx. r5, 0, r3 - bne- L1 - L2: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_cmpset_acq_32 -_pmix_atomic_cmpset_acq_32: - L3: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L4 - stwcx. r5, 0, r3 - bne- L3 - sync - L4: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - lwsync - blr - - - .globl _pmix_atomic_cmpset_rel_32 -_pmix_atomic_cmpset_rel_32: - eieio - L5: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L6 - stwcx. r5, 0, r3 - bne- L5 - sync - L6: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - .globl _pmix_atomic_cmpset_64 -_pmix_atomic_cmpset_64: - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - L7: ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- L8 - stdcx. r7, 0, r3 - bne- L7 - L8: - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_cmpset_acq_64 -_pmix_atomic_cmpset_acq_64: - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - - L9: ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- L10 - stdcx. r7, 0, r3 - bne- L9 - L10: - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr - lwsync - blr - - - .globl _pmix_atomic_cmpset_rel_64 -_pmix_atomic_cmpset_rel_64: - stw r4,-32(r1) - stw r5,-28(r1) - stw r6,-24(r1) - stw r7,-20(r1) - ld r5,-32(r1) - ld r7,-24(r1) - - eieio - L11: ldarx r9, 0, r3 - cmpd 0, r9, r5 - bne- L12 - stdcx. r7, 0, r3 - bne- L11 - L12: - xor r3,r5,r9 - subfic r5,r3,0 - adde r3,r5,r3 - blr - lwsync - blr - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - L13: lwarx r0, 0, r3 - add r0, r4, r0 - stwcx. r0, 0, r3 - bne- L13 - mr r3,r0 - blr - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - L14: lwarx r0,0,r3 - subf r0,r4,r0 - stwcx. r0,0,r3 - bne- L14 - mr r3,r0 - blr - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - L15: - mftbu r0 - mftb r11 - mftbu r2 - cmpw cr7,r2,r0 - bne+ cr7,L15 - li r4,0 - li r9,0 - or r3,r2,r9 - or r4,r4,r11 - blr diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-aix.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-aix.s deleted file mode 100644 index 7cc2ba0b9dc..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-aix.s +++ /dev/null @@ -1,156 +0,0 @@ - .machine "ppc" - .toc - .csect .text[PR] - - .align 2 - .globl pmix_atomic_mb - .globl .pmix_atomic_mb - .csect [DS],3 -pmix_atomic_mb: - .long .pmix_atomic_mb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_mb: - sync - blr - - - .globl pmix_atomic_rmb - .globl .pmix_atomic_rmb - .csect [DS],3 -pmix_atomic_rmb: - .long .pmix_atomic_rmb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_rmb: - lwsync - blr - - - .globl pmix_atomic_wmb - .globl .pmix_atomic_wmb - .csect [DS],3 -pmix_atomic_wmb: - .long .pmix_atomic_wmb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_wmb: - eieio - blr - - - .globl pmix_atomic_cmpset_32 - .globl .pmix_atomic_cmpset_32 - .csect [DS],3 -pmix_atomic_cmpset_32: - .long .pmix_atomic_cmpset_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_32: - L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- L2 - stwcx. 5, 0, 3 - bne- L1 - L2: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - - - .globl pmix_atomic_cmpset_acq_32 - .globl .pmix_atomic_cmpset_acq_32 - .csect [DS],3 -pmix_atomic_cmpset_acq_32: - .long .pmix_atomic_cmpset_acq_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_acq_32: - L3: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- L4 - stwcx. 5, 0, 3 - bne- L3 - sync - L4: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - lwsync - blr - - - .globl pmix_atomic_cmpset_rel_32 - .globl .pmix_atomic_cmpset_rel_32 - .csect [DS],3 -pmix_atomic_cmpset_rel_32: - .long .pmix_atomic_cmpset_rel_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_rel_32: - eieio - L5: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- L6 - stwcx. 5, 0, 3 - bne- L5 - sync - L6: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - - - - .globl pmix_atomic_add_32 - .globl .pmix_atomic_add_32 - .csect [DS],3 -pmix_atomic_add_32: - .long .pmix_atomic_add_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_add_32: - L13: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- L13 - mr 3,0 - blr - - - .globl pmix_atomic_sub_32 - .globl .pmix_atomic_sub_32 - .csect [DS],3 -pmix_atomic_sub_32: - .long .pmix_atomic_sub_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_sub_32: - L14: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- L14 - mr 3,0 - blr - - .globl pmix_sys_timer_get_cycles - .globl .pmix_sys_timer_get_cycles - .csect [DS],3 -pmix_sys_timer_get_cycles: - .long .pmix_sys_timer_get_cycles, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_sys_timer_get_cycles: - L15: - mftbu 0 - mftb 11 - mftbu 2 - cmpw 7,2,0 - bne+ 7,L15 - li 4,0 - li 9,0 - or 3,2,9 - or 4,4,11 - blr diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux-nongas.s deleted file mode 100644 index 37b36c22b08..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux-nongas.s +++ /dev/null @@ -1,118 +0,0 @@ - .text - - .align 2 - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - sync - blr - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - lwsync - blr - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - eieio - blr - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - .L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L2 - stwcx. 5, 0, 3 - bne- .L1 - .L2: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_acq_32 - .type pmix_atomic_cmpset_acq_32, @function -pmix_atomic_cmpset_acq_32: - .L3: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L4 - stwcx. 5, 0, 3 - bne- .L3 - sync - .L4: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - lwsync - blr - .size pmix_atomic_cmpset_acq_32, .-pmix_atomic_cmpset_acq_32 - - - .globl pmix_atomic_cmpset_rel_32 - .type pmix_atomic_cmpset_rel_32, @function -pmix_atomic_cmpset_rel_32: - eieio - .L5: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L6 - stwcx. 5, 0, 3 - bne- .L5 - sync - .L6: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - .size pmix_atomic_cmpset_rel_32, .-pmix_atomic_cmpset_rel_32 - - - - .globl pmix_atomic_add_32 - .type pmix_atomic_add_32, @function -pmix_atomic_add_32: - .L13: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- .L13 - mr 3,0 - blr - .size pmix_atomic_add_32, .-pmix_atomic_add_32 - - - .globl pmix_atomic_sub_32 - .type pmix_atomic_sub_32, @function -pmix_atomic_sub_32: - .L14: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- .L14 - mr 3,0 - blr - .size pmix_atomic_sub_32, .-pmix_atomic_sub_32 - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - .L15: - mftbu 0 - mftb 11 - mftbu 2 - cmpw 7,2,0 - bne+ 7,.L15 - li 4,0 - li 9,0 - or 3,2,9 - or 4,4,11 - blr - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux.s deleted file mode 100644 index afecd0a305a..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-linux.s +++ /dev/null @@ -1,120 +0,0 @@ - .text - - .align 2 - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - sync - blr - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - lwsync - blr - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - eieio - blr - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - .L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L2 - stwcx. 5, 0, 3 - bne- .L1 - .L2: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_acq_32 - .type pmix_atomic_cmpset_acq_32, @function -pmix_atomic_cmpset_acq_32: - .L3: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L4 - stwcx. 5, 0, 3 - bne- .L3 - sync - .L4: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - lwsync - blr - .size pmix_atomic_cmpset_acq_32, .-pmix_atomic_cmpset_acq_32 - - - .globl pmix_atomic_cmpset_rel_32 - .type pmix_atomic_cmpset_rel_32, @function -pmix_atomic_cmpset_rel_32: - eieio - .L5: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L6 - stwcx. 5, 0, 3 - bne- .L5 - sync - .L6: - xor 3,0,4 - subfic 5,3,0 - adde 3,5,3 - blr - .size pmix_atomic_cmpset_rel_32, .-pmix_atomic_cmpset_rel_32 - - - - .globl pmix_atomic_add_32 - .type pmix_atomic_add_32, @function -pmix_atomic_add_32: - .L13: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- .L13 - mr 3,0 - blr - .size pmix_atomic_add_32, .-pmix_atomic_add_32 - - - .globl pmix_atomic_sub_32 - .type pmix_atomic_sub_32, @function -pmix_atomic_sub_32: - .L14: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- .L14 - mr 3,0 - blr - .size pmix_atomic_sub_32, .-pmix_atomic_sub_32 - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - .L15: - mftbu 0 - mftb 11 - mftbu 2 - cmpw 7,2,0 - bne+ 7,.L15 - li 4,0 - li 9,0 - or 3,2,9 - or 4,4,11 - blr - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-osx.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-osx.s deleted file mode 100644 index 7d2dceb2a81..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc32-osx.s +++ /dev/null @@ -1,100 +0,0 @@ - .text - - .align 2 - .globl _pmix_atomic_mb -_pmix_atomic_mb: - sync - blr - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - lwsync - blr - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - eieio - blr - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - L1: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L2 - stwcx. r5, 0, r3 - bne- L1 - L2: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_cmpset_acq_32 -_pmix_atomic_cmpset_acq_32: - L3: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L4 - stwcx. r5, 0, r3 - bne- L3 - sync - L4: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - lwsync - blr - - - .globl _pmix_atomic_cmpset_rel_32 -_pmix_atomic_cmpset_rel_32: - eieio - L5: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L6 - stwcx. r5, 0, r3 - bne- L5 - sync - L6: - xor r3,r0,r4 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - L13: lwarx r0, 0, r3 - add r0, r4, r0 - stwcx. r0, 0, r3 - bne- L13 - mr r3,r0 - blr - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - L14: lwarx r0,0,r3 - subf r0,r4,r0 - stwcx. r0,0,r3 - bne- L14 - mr r3,r0 - blr - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - L15: - mftbu r0 - mftb r11 - mftbu r2 - cmpw cr7,r2,r0 - bne+ cr7,L15 - li r4,0 - li r9,0 - or r3,r2,r9 - or r4,r4,r11 - blr diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-aix.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-aix.s deleted file mode 100644 index 7e3995e3512..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-aix.s +++ /dev/null @@ -1,230 +0,0 @@ - .machine "ppc64" - .toc - .csect .text[PR] - - .align 2 - .globl pmix_atomic_mb - .globl .pmix_atomic_mb - .csect [DS],3 -pmix_atomic_mb: - .llong .pmix_atomic_mb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_mb: - sync - blr - - - .globl pmix_atomic_rmb - .globl .pmix_atomic_rmb - .csect [DS],3 -pmix_atomic_rmb: - .llong .pmix_atomic_rmb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_rmb: - lwsync - blr - - - .globl pmix_atomic_wmb - .globl .pmix_atomic_wmb - .csect [DS],3 -pmix_atomic_wmb: - .llong .pmix_atomic_wmb, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_wmb: - eieio - blr - - - .globl pmix_atomic_cmpset_32 - .globl .pmix_atomic_cmpset_32 - .csect [DS],3 -pmix_atomic_cmpset_32: - .llong .pmix_atomic_cmpset_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_32: - L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- L2 - stwcx. 5, 0, 3 - bne- L1 - L2: - cmpw 7,0,4 - mfcr 3 - rlwinm 3,3,31,1 - blr - - - .globl pmix_atomic_cmpset_acq_32 - .globl .pmix_atomic_cmpset_acq_32 - .csect [DS],3 -pmix_atomic_cmpset_acq_32: - .llong .pmix_atomic_cmpset_acq_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_acq_32: - mflr 0 - std 29,-24(1) - std 0,16(1) - stdu 1,-144(1) - bl .pmix_atomic_cmpset_32 - mr 29,3 - bl .pmix_atomic_rmb - mr 3,29 - addi 1,1,144 - ld 0,16(1) - mtlr 0 - ld 29,-24(1) - blr - - - .globl pmix_atomic_cmpset_rel_32 - .globl .pmix_atomic_cmpset_rel_32 - .csect [DS],3 -pmix_atomic_cmpset_rel_32: - .llong .pmix_atomic_cmpset_rel_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_rel_32: - mflr 0 - std 27,-40(1) - std 28,-32(1) - std 29,-24(1) - std 0,16(1) - stdu 1,-160(1) - mr 29,3 - mr 28,4 - mr 27,5 - bl .pmix_atomic_wmb - mr 3,29 - mr 4,28 - mr 5,27 - bl .pmix_atomic_cmpset_32 - addi 1,1,160 - ld 0,16(1) - mtlr 0 - ld 27,-40(1) - ld 28,-32(1) - ld 29,-24(1) - blr - - - .globl pmix_atomic_cmpset_64 - .globl .pmix_atomic_cmpset_64 - .csect [DS],3 -pmix_atomic_cmpset_64: - .llong .pmix_atomic_cmpset_64, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_64: - L3: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- L4 - stdcx. 5, 0, 3 - bne- L3 - L4: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - - - .globl pmix_atomic_cmpset_acq_64 - .globl .pmix_atomic_cmpset_acq_64 - .csect [DS],3 -pmix_atomic_cmpset_acq_64: - .llong .pmix_atomic_cmpset_acq_64, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_acq_64: - L7: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- L8 - stdcx. 5, 0, 3 - bne- L7 - L8: - lwsync - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - - - .globl pmix_atomic_cmpset_rel_64 - .globl .pmix_atomic_cmpset_rel_64 - .csect [DS],3 -pmix_atomic_cmpset_rel_64: - .llong .pmix_atomic_cmpset_rel_64, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_cmpset_rel_64: - eieio - L9: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- L10 - stdcx. 5, 0, 3 - bne- L9 - L10: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - - - .globl pmix_atomic_add_32 - .globl .pmix_atomic_add_32 - .csect [DS],3 -pmix_atomic_add_32: - .llong .pmix_atomic_add_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_add_32: - L5: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- L5 - - mr 3,0 - blr - - - .globl pmix_atomic_sub_32 - .globl .pmix_atomic_sub_32 - .csect [DS],3 -pmix_atomic_sub_32: - .llong .pmix_atomic_sub_32, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_atomic_sub_32: - L6: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- L6 - - mr 3,0 - blr - - .globl pmix_sys_timer_get_cycles - .globl .pmix_sys_timer_get_cycles - .csect [DS],3 -pmix_sys_timer_get_cycles: - .llong .pmix_sys_timer_get_cycles, TOC[tc0], 0 - .csect [PR] - .align 2 -.pmix_sys_timer_get_cycles: - L11: - mftbu 2 - rldicl 2,2,0,32 - mftb 0 - rldicl 9,0,0,32 - mftbu 0 - rldicl 0,0,0,32 - cmpw 7,0,2 - bne 7,L11 - sldi 3,0,32 - or 3,3,9 - blr diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux-nongas.s deleted file mode 100644 index 1bb4731ae32..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux-nongas.s +++ /dev/null @@ -1,180 +0,0 @@ - .text - - .align 2 - .globl .pmix_atomic_mb - .type .pmix_atomic_mb, @function -.pmix_atomic_mb: - sync - blr - .size .pmix_atomic_mb, .-.pmix_atomic_mb - - - .globl .pmix_atomic_rmb - .type .pmix_atomic_rmb, @function -.pmix_atomic_rmb: - lwsync - blr - .size .pmix_atomic_rmb, .-.pmix_atomic_rmb - - - .globl .pmix_atomic_wmb - .type .pmix_atomic_wmb, @function -.pmix_atomic_wmb: - eieio - blr - .size .pmix_atomic_wmb, .-.pmix_atomic_wmb - - - .globl .pmix_atomic_cmpset_32 - .type .pmix_atomic_cmpset_32, @function -.pmix_atomic_cmpset_32: - .L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L2 - stwcx. 5, 0, 3 - bne- .L1 - .L2: - cmpw 7,0,4 - mfcr 3 - rlwinm 3,3,31,1 - blr - .size .pmix_atomic_cmpset_32, .-.pmix_atomic_cmpset_32 - - - .globl .pmix_atomic_cmpset_acq_32 - .type .pmix_atomic_cmpset_acq_32, @function -.pmix_atomic_cmpset_acq_32: - mflr 0 - std 29,-24(1) - std 0,16(1) - stdu 1,-144(1) - bl .pmix_atomic_cmpset_32 - mr 29,3 - bl .pmix_atomic_rmb - mr 3,29 - addi 1,1,144 - ld 0,16(1) - mtlr 0 - ld 29,-24(1) - blr - .size .pmix_atomic_cmpset_acq_32, .-.pmix_atomic_cmpset_acq_32 - - - .globl .pmix_atomic_cmpset_rel_32 - .type .pmix_atomic_cmpset_rel_32, @function -.pmix_atomic_cmpset_rel_32: - mflr 0 - std 27,-40(1) - std 28,-32(1) - std 29,-24(1) - std 0,16(1) - stdu 1,-160(1) - mr 29,3 - mr 28,4 - mr 27,5 - bl .pmix_atomic_wmb - mr 3,29 - mr 4,28 - mr 5,27 - bl .pmix_atomic_cmpset_32 - addi 1,1,160 - ld 0,16(1) - mtlr 0 - ld 27,-40(1) - ld 28,-32(1) - ld 29,-24(1) - blr - .size .pmix_atomic_cmpset_rel_32, .-.pmix_atomic_cmpset_rel_32 - - - .globl .pmix_atomic_cmpset_64 - .type .pmix_atomic_cmpset_64, @function -.pmix_atomic_cmpset_64: - .L3: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L4 - stdcx. 5, 0, 3 - bne- .L3 - .L4: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_64, .-.pmix_atomic_cmpset_64 - - - .globl .pmix_atomic_cmpset_acq_64 - .type .pmix_atomic_cmpset_acq_64, @function -.pmix_atomic_cmpset_acq_64: - .L7: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L8 - stdcx. 5, 0, 3 - bne- .L7 - .L8: - lwsync - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_acq_64, .-.pmix_atomic_cmpset_acq_64 - - - .globl .pmix_atomic_cmpset_rel_64 - .type .pmix_atomic_cmpset_rel_64, @function -.pmix_atomic_cmpset_rel_64: - eieio - .L9: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L10 - stdcx. 5, 0, 3 - bne- .L9 - .L10: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_rel_64, .-.pmix_atomic_cmpset_rel_64 - - - .globl .pmix_atomic_add_32 - .type .pmix_atomic_add_32, @function -.pmix_atomic_add_32: - .L5: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- .L5 - - mr 3,0 - blr - .size .pmix_atomic_add_32, .-.pmix_atomic_add_32 - - - .globl .pmix_atomic_sub_32 - .type .pmix_atomic_sub_32, @function -.pmix_atomic_sub_32: - .L6: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- .L6 - - mr 3,0 - blr - .size .pmix_atomic_sub_32, .-.pmix_atomic_sub_32 - - .globl .pmix_sys_timer_get_cycles - .type .pmix_sys_timer_get_cycles, @function -.pmix_sys_timer_get_cycles: - .L11: - mftbu 2 - rldicl 2,2,0,32 - mftb 0 - rldicl 9,0,0,32 - mftbu 0 - rldicl 0,0,0,32 - cmpw 7,0,2 - bne 7,.L11 - sldi 3,0,32 - or 3,3,9 - blr - .size .pmix_sys_timer_get_cycles, .-.pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux.s deleted file mode 100644 index 300d0aa0d70..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-linux.s +++ /dev/null @@ -1,182 +0,0 @@ - .text - - .align 2 - .globl .pmix_atomic_mb - .type .pmix_atomic_mb, @function -.pmix_atomic_mb: - sync - blr - .size .pmix_atomic_mb, .-.pmix_atomic_mb - - - .globl .pmix_atomic_rmb - .type .pmix_atomic_rmb, @function -.pmix_atomic_rmb: - lwsync - blr - .size .pmix_atomic_rmb, .-.pmix_atomic_rmb - - - .globl .pmix_atomic_wmb - .type .pmix_atomic_wmb, @function -.pmix_atomic_wmb: - eieio - blr - .size .pmix_atomic_wmb, .-.pmix_atomic_wmb - - - .globl .pmix_atomic_cmpset_32 - .type .pmix_atomic_cmpset_32, @function -.pmix_atomic_cmpset_32: - .L1: lwarx 0, 0, 3 - cmpw 0, 0, 4 - bne- .L2 - stwcx. 5, 0, 3 - bne- .L1 - .L2: - cmpw 7,0,4 - mfcr 3 - rlwinm 3,3,31,1 - blr - .size .pmix_atomic_cmpset_32, .-.pmix_atomic_cmpset_32 - - - .globl .pmix_atomic_cmpset_acq_32 - .type .pmix_atomic_cmpset_acq_32, @function -.pmix_atomic_cmpset_acq_32: - mflr 0 - std 29,-24(1) - std 0,16(1) - stdu 1,-144(1) - bl .pmix_atomic_cmpset_32 - mr 29,3 - bl .pmix_atomic_rmb - mr 3,29 - addi 1,1,144 - ld 0,16(1) - mtlr 0 - ld 29,-24(1) - blr - .size .pmix_atomic_cmpset_acq_32, .-.pmix_atomic_cmpset_acq_32 - - - .globl .pmix_atomic_cmpset_rel_32 - .type .pmix_atomic_cmpset_rel_32, @function -.pmix_atomic_cmpset_rel_32: - mflr 0 - std 27,-40(1) - std 28,-32(1) - std 29,-24(1) - std 0,16(1) - stdu 1,-160(1) - mr 29,3 - mr 28,4 - mr 27,5 - bl .pmix_atomic_wmb - mr 3,29 - mr 4,28 - mr 5,27 - bl .pmix_atomic_cmpset_32 - addi 1,1,160 - ld 0,16(1) - mtlr 0 - ld 27,-40(1) - ld 28,-32(1) - ld 29,-24(1) - blr - .size .pmix_atomic_cmpset_rel_32, .-.pmix_atomic_cmpset_rel_32 - - - .globl .pmix_atomic_cmpset_64 - .type .pmix_atomic_cmpset_64, @function -.pmix_atomic_cmpset_64: - .L3: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L4 - stdcx. 5, 0, 3 - bne- .L3 - .L4: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_64, .-.pmix_atomic_cmpset_64 - - - .globl .pmix_atomic_cmpset_acq_64 - .type .pmix_atomic_cmpset_acq_64, @function -.pmix_atomic_cmpset_acq_64: - .L7: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L8 - stdcx. 5, 0, 3 - bne- .L7 - .L8: - lwsync - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_acq_64, .-.pmix_atomic_cmpset_acq_64 - - - .globl .pmix_atomic_cmpset_rel_64 - .type .pmix_atomic_cmpset_rel_64, @function -.pmix_atomic_cmpset_rel_64: - eieio - .L9: ldarx 0, 0, 3 - cmpd 0, 0, 4 - bne- .L10 - stdcx. 5, 0, 3 - bne- .L9 - .L10: - xor 3,4,0 - subfic 5,3,0 - adde 3,5,3 - blr - .size .pmix_atomic_cmpset_rel_64, .-.pmix_atomic_cmpset_rel_64 - - - .globl .pmix_atomic_add_32 - .type .pmix_atomic_add_32, @function -.pmix_atomic_add_32: - .L5: lwarx 0, 0, 3 - add 0, 4, 0 - stwcx. 0, 0, 3 - bne- .L5 - - mr 3,0 - blr - .size .pmix_atomic_add_32, .-.pmix_atomic_add_32 - - - .globl .pmix_atomic_sub_32 - .type .pmix_atomic_sub_32, @function -.pmix_atomic_sub_32: - .L6: lwarx 0,0,3 - subf 0,4,0 - stwcx. 0,0,3 - bne- .L6 - - mr 3,0 - blr - .size .pmix_atomic_sub_32, .-.pmix_atomic_sub_32 - - .globl .pmix_sys_timer_get_cycles - .type .pmix_sys_timer_get_cycles, @function -.pmix_sys_timer_get_cycles: - .L11: - mftbu 2 - rldicl 2,2,0,32 - mftb 0 - rldicl 9,0,0,32 - mftbu 0 - rldicl 0,0,0,32 - cmpw 7,0,2 - bne 7,.L11 - sldi 3,0,32 - or 3,3,9 - blr - .size .pmix_sys_timer_get_cycles, .-.pmix_sys_timer_get_cycles - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-osx.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-osx.s deleted file mode 100644 index 3a29e67e018..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-powerpc64-osx.s +++ /dev/null @@ -1,156 +0,0 @@ - .text - - .align 2 - .globl _pmix_atomic_mb -_pmix_atomic_mb: - sync - blr - - - .globl _pmix_atomic_rmb -_pmix_atomic_rmb: - lwsync - blr - - - .globl _pmix_atomic_wmb -_pmix_atomic_wmb: - eieio - blr - - - .globl _pmix_atomic_cmpset_32 -_pmix_atomic_cmpset_32: - L1: lwarx r0, 0, r3 - cmpw 0, r0, r4 - bne- L2 - stwcx. r5, 0, r3 - bne- L1 - L2: - cmpw cr7,r0,r4 - mfcr r3 - rlwinm r3,r3,31,1 - blr - - - .globl _pmix_atomic_cmpset_acq_32 -_pmix_atomic_cmpset_acq_32: - mflr r0 - std r29,-24(r1) - std r0,16(r1) - stdu r1,-144(r1) - bl _pmix_atomic_cmpset_32 - mr r29,r3 - bl _pmix_atomic_rmb - mr r3,r29 - addi r1,r1,144 - ld r0,16(r1) - mtlr r0 - ld r29,-24(r1) - blr - - - .globl _pmix_atomic_cmpset_rel_32 -_pmix_atomic_cmpset_rel_32: - mflr r0 - std r27,-40(r1) - std r28,-32(r1) - std r29,-24(r1) - std r0,16(r1) - stdu r1,-160(r1) - mr r29,r3 - mr r28,r4 - mr r27,r5 - bl _pmix_atomic_wmb - mr r3,r29 - mr r4,r28 - mr r5,r27 - bl _pmix_atomic_cmpset_32 - addi r1,r1,160 - ld r0,16(r1) - mtlr r0 - ld r27,-40(r1) - ld r28,-32(r1) - ld r29,-24(r1) - blr - - - .globl _pmix_atomic_cmpset_64 -_pmix_atomic_cmpset_64: - L3: ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- L4 - stdcx. r5, 0, r3 - bne- L3 - L4: - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_cmpset_acq_64 -_pmix_atomic_cmpset_acq_64: - L7: ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- L8 - stdcx. r5, 0, r3 - bne- L7 - L8: - lwsync - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_cmpset_rel_64 -_pmix_atomic_cmpset_rel_64: - eieio - L9: ldarx r0, 0, r3 - cmpd 0, r0, r4 - bne- L10 - stdcx. r5, 0, r3 - bne- L9 - L10: - xor r3,r4,r0 - subfic r5,r3,0 - adde r3,r5,r3 - blr - - - .globl _pmix_atomic_add_32 -_pmix_atomic_add_32: - L5: lwarx r0, 0, r3 - add r0, r4, r0 - stwcx. r0, 0, r3 - bne- L5 - - mr r3,r0 - blr - - - .globl _pmix_atomic_sub_32 -_pmix_atomic_sub_32: - L6: lwarx r0,0,r3 - subf r0,r4,r0 - stwcx. r0,0,r3 - bne- L6 - - mr r3,r0 - blr - - .globl _pmix_sys_timer_get_cycles -_pmix_sys_timer_get_cycles: - L11: - mftbu r2 - rldicl r2,r2,0,32 - mftb r0 - rldicl r9,r0,0,32 - mftbu r0 - rldicl r0,r0,0,32 - cmpw cr7,r0,r2 - bne cr7,L11 - sldi r3,r0,32 - or r3,r3,r9 - blr diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-32-solaris.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-32-solaris.s deleted file mode 100644 index 3fb48494f6e..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-32-solaris.s +++ /dev/null @@ -1,190 +0,0 @@ - .text - - .align 4 - - - .globl pmix_atomic_mb - .type pmix_atomic_mb, #function -pmix_atomic_mb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad - retl - nop - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, #function -pmix_atomic_rmb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad - retl - nop - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, #function -pmix_atomic_wmb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - retl - nop - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, #function -pmix_atomic_cmpset_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_acq_32 - .type pmix_atomic_cmpset_acq_32, #function -pmix_atomic_cmpset_acq_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - subx %g0, -1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 - .size pmix_atomic_cmpset_acq_32, .-pmix_atomic_cmpset_acq_32 - - - .globl pmix_atomic_cmpset_rel_32 - .type pmix_atomic_cmpset_rel_32, #function -pmix_atomic_cmpset_rel_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 - .size pmix_atomic_cmpset_rel_32, .-pmix_atomic_cmpset_rel_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, #function -pmix_atomic_cmpset_64: - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i3, %o4 - mov %i4, %o5 - st %i1, [%fp-32] - st %i2, [%fp-28] - std %o4, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne .L12 - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a .L12 - mov 1, %i0 -.L12: - ret - restore - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_atomic_cmpset_acq_64 - .type pmix_atomic_cmpset_acq_64, #function -pmix_atomic_cmpset_acq_64: - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i1, %o4 - mov %i2, %o5 - mov %i3, %o2 - mov %i4, %o3 - std %o4, [%fp-32] - std %o2, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne .L16 - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a .L16 - mov 1, %i0 -.L16: - membar #LoadLoad - ret - restore - .size pmix_atomic_cmpset_acq_64, .-pmix_atomic_cmpset_acq_64 - - - .globl pmix_atomic_cmpset_rel_64 - .type pmix_atomic_cmpset_rel_64, #function -pmix_atomic_cmpset_rel_64: - !#PROLOGUE# 0 - save %sp, -128, %sp - !#PROLOGUE# 1 - mov %i1, %o4 - mov %i2, %o5 - mov %i3, %o2 - mov %i4, %o3 - membar #StoreStore - std %o4, [%fp-32] - std %o2, [%fp-24] - ldx [%fp-24], %g1 - ldx [%fp-32], %g2 - casxa [%i0] 0x80, %g2, %g1 - stx %g1, [%fp-24] - - ld [%fp-24], %i5 - ld [%fp-32], %g1 - cmp %i5, %g1 - bne .L21 - mov 0, %i0 - ld [%fp-20], %i2 - ld [%fp-28], %i1 - cmp %i2, %i1 - be,a .L21 - mov 1, %i0 -.L21: - ret - restore - .size pmix_atomic_cmpset_rel_64, .-pmix_atomic_cmpset_rel_64 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, #function -pmix_sys_timer_get_cycles: - save %sp,-96,%sp - rd %tick,%o0 - srlx %o0,32,%o1 - or %g0,%o1,%i0 - ret ! Result = %i0 - restore %o0,0,%o1 - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-64-solaris.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-64-solaris.s deleted file mode 100644 index 7aae1cb8ed3..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-sparcv9-64-solaris.s +++ /dev/null @@ -1,130 +0,0 @@ - .text - - .align 4 - - - .globl pmix_atomic_mb - .type pmix_atomic_mb, #function -pmix_atomic_mb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad - retl - nop - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, #function -pmix_atomic_rmb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #LoadLoad - retl - nop - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, #function -pmix_atomic_wmb: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - retl - nop - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, #function -pmix_atomic_cmpset_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_acq_32 - .type pmix_atomic_cmpset_acq_32, #function -pmix_atomic_cmpset_acq_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - subx %g0, -1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 - .size pmix_atomic_cmpset_acq_32, .-pmix_atomic_cmpset_acq_32 - - - .globl pmix_atomic_cmpset_rel_32 - .type pmix_atomic_cmpset_rel_32, #function -pmix_atomic_cmpset_rel_32: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casa [%o0] 0x80, %o1, %o2 - xor %o2, %o1, %o2 - subcc %g0, %o2, %g0 - retl - subx %g0, -1, %o0 - .size pmix_atomic_cmpset_rel_32, .-pmix_atomic_cmpset_rel_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, #function -pmix_atomic_cmpset_64: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - retl - movre %o2, 1, %o0 - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_atomic_cmpset_acq_64 - .type pmix_atomic_cmpset_acq_64, #function -pmix_atomic_cmpset_acq_64: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - movre %o2, 1, %o0 - membar #LoadLoad - retl - sra %o0, 0, %o0 - .size pmix_atomic_cmpset_acq_64, .-pmix_atomic_cmpset_acq_64 - - - .globl pmix_atomic_cmpset_rel_64 - .type pmix_atomic_cmpset_rel_64, #function -pmix_atomic_cmpset_rel_64: - !#PROLOGUE# 0 - !#PROLOGUE# 1 - membar #StoreStore - casxa [%o0] 0x80, %o1, %o2 - mov 0, %o0 - xor %o2, %o1, %o2 - retl - movre %o2, 1, %o0 - .size pmix_atomic_cmpset_rel_64, .-pmix_atomic_cmpset_rel_64 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, #function -pmix_sys_timer_get_cycles: - save %sp,-176,%sp - rd %tick,%o0 - ret ! Result = %i0 - restore %o0,0,%o0 - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux-nongas.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux-nongas.s deleted file mode 100644 index 85d19d9b1e2..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux-nongas.s +++ /dev/null @@ -1,63 +0,0 @@ - .text - - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - movl %esi, %eax - lock; cmpxchgl %edx,(%rdi) - sete %dl - movzbl %dl, %eax - ret - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, @function -pmix_atomic_cmpset_64: - movq %rsi, %rax - lock; cmpxchgq %rdx,(%rdi) - sete %dl - movzbl %dl, %eax - ret - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - rdtsc - salq $32, %rdx - mov %eax, %eax - orq %rdx, %rax - ret - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux.s b/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux.s deleted file mode 100644 index f60867c1ab8..00000000000 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/asm/generated/atomic-x86_64-linux.s +++ /dev/null @@ -1,65 +0,0 @@ - .text - - .globl pmix_atomic_mb - .type pmix_atomic_mb, @function -pmix_atomic_mb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_mb, .-pmix_atomic_mb - - - .globl pmix_atomic_rmb - .type pmix_atomic_rmb, @function -pmix_atomic_rmb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_rmb, .-pmix_atomic_rmb - - - .globl pmix_atomic_wmb - .type pmix_atomic_wmb, @function -pmix_atomic_wmb: - pushq %rbp - movq %rsp, %rbp - leave - ret - .size pmix_atomic_wmb, .-pmix_atomic_wmb - - - .globl pmix_atomic_cmpset_32 - .type pmix_atomic_cmpset_32, @function -pmix_atomic_cmpset_32: - movl %esi, %eax - lock; cmpxchgl %edx,(%rdi) - sete %dl - movzbl %dl, %eax - ret - .size pmix_atomic_cmpset_32, .-pmix_atomic_cmpset_32 - - - .globl pmix_atomic_cmpset_64 - .type pmix_atomic_cmpset_64, @function -pmix_atomic_cmpset_64: - movq %rsi, %rax - lock; cmpxchgq %rdx,(%rdi) - sete %dl - movzbl %dl, %eax - ret - .size pmix_atomic_cmpset_64, .-pmix_atomic_cmpset_64 - - - .globl pmix_sys_timer_get_cycles - .type pmix_sys_timer_get_cycles, @function -pmix_sys_timer_get_cycles: - rdtsc - salq $32, %rdx - mov %eax, %eax - orq %rdx, %rax - ret - .size pmix_sys_timer_get_cycles, .-pmix_sys_timer_get_cycles - - .section .note.GNU-stack,"",@progbits diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm/timer.h index 65532ac8a77..fd280cc2215 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm/timer.h @@ -2,7 +2,6 @@ * Copyright (c) 2008 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm64/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm64/timer.h index bacc4b919eb..b6bfe2abd68 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm64/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/arm64/timer.h @@ -6,7 +6,6 @@ * Copyright (c) 2016 Broadcom Limited. All rights reserved. * Copyright (c) 2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/atomic_impl.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/atomic_impl.h index 62213e3a508..e1fb810f781 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/atomic_impl.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/atomic_impl.h @@ -13,7 +13,6 @@ * Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia32/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia32/timer.h index 5be92d4902d..9f9a80d684d 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia32/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia32/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia64/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia64/timer.h index 5a33236592d..65a9bef3169 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia64/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/ia64/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/mips/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/mips/timer.h index 65532ac8a77..fd280cc2215 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/mips/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/mips/timer.h @@ -2,7 +2,6 @@ * Copyright (c) 2008 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/powerpc/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/powerpc/timer.h index dd8c3ffe1b6..0d557e875e1 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/powerpc/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/powerpc/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sparcv9/timer.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sparcv9/timer.h index 395ea986014..354babad46e 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sparcv9/timer.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sparcv9/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sync_builtin/atomic.h b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sync_builtin/atomic.h index 51a9a1409b7..24e740f9a98 100644 --- a/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sync_builtin/atomic.h +++ b/opal/mca/pmix/pmix112/pmix/src/atomics/sys/sync_builtin/atomic.h @@ -13,7 +13,6 @@ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_connect.c b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_connect.c index e286627f24a..9bab09dea04 100644 --- a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_connect.c +++ b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_connect.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . diff --git a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_fence.c b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_fence.c index 036ceca874b..a388fadf109 100644 --- a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_fence.c +++ b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_fence.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . @@ -183,7 +183,7 @@ static pmix_status_t unpack_return(pmix_buffer_t *data) } pmix_output_verbose(2, pmix_globals.debug_output, "client:unpack fence received status %d", ret); - return PMIX_SUCCESS; + return ret; } static pmix_status_t pack_fence(pmix_buffer_t *msg, pmix_cmd_t cmd, @@ -255,3 +255,4 @@ static void op_cbfunc(pmix_status_t status, void *cbdata) PMIX_POST_OBJECT(cb); cb->active = false; } + diff --git a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_get.c b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_get.c index 1f506b177b1..74586ceecdc 100644 --- a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_get.c +++ b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_get.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . diff --git a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_pub.c b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_pub.c index 95a48833e7c..7e0c4c06fb2 100644 --- a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_pub.c +++ b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_pub.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . diff --git a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_spawn.c b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_spawn.c index 633fda21d09..4f2da5e6071 100644 --- a/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_spawn.c +++ b/opal/mca/pmix/pmix112/pmix/src/client/pmix_client_spawn.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . @@ -236,3 +236,4 @@ static void spawn_cbfunc(pmix_status_t status, char nspace[], void *cbdata) PMIX_POST_OBJECT(cb); cb->active = false; } + diff --git a/opal/mca/pmix/pmix112/pmix/src/include/pmix_globals.h b/opal/mca/pmix/pmix112/pmix/src/include/pmix_globals.h index 3e5c1ac4a6f..0ea18f1294d 100644 --- a/opal/mca/pmix/pmix112/pmix/src/include/pmix_globals.h +++ b/opal/mca/pmix/pmix112/pmix/src/include/pmix_globals.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2017 IBM Corporation. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_get.c b/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_get.c index 5f411ee0a65..066ffdf4c50 100644 --- a/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_get.c +++ b/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_get.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . @@ -609,3 +609,4 @@ static void dmdx_cbfunc(pmix_status_t status, caddy->lcd->proc.nspace, caddy->lcd->proc.rank); PMIX_THREADSHIFT(caddy, _process_dmdx_reply); } + diff --git a/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_ops.c b/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_ops.c index 4f7895fd456..39fae9e01f2 100644 --- a/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_ops.c +++ b/opal/mca/pmix/pmix112/pmix/src/server/pmix_server_ops.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . diff --git a/opal/mca/pmix/pmix112/pmix/src/usock/usock.h b/opal/mca/pmix/pmix112/pmix/src/usock/usock.h index 678883a82dc..6f4faca8552 100644 --- a/opal/mca/pmix/pmix112/pmix/src/usock/usock.h +++ b/opal/mca/pmix/pmix112/pmix/src/usock/usock.h @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science diff --git a/opal/mca/pmix/pmix112/pmix/test/test_common.c b/opal/mca/pmix/pmix112/pmix/test/test_common.c index 48a7c523062..0963912eb56 100644 --- a/opal/mca/pmix/pmix112/pmix/test/test_common.c +++ b/opal/mca/pmix/pmix112/pmix/test/test_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. @@ -631,3 +631,4 @@ int get_all_ranks_from_namespace(test_params params, char *nspace, pmix_proc_t * } return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix112/pmix/test/test_common.h b/opal/mca/pmix/pmix112/pmix/test/test_common.h index a55bc90254f..e73285acef0 100644 --- a/opal/mca/pmix/pmix112/pmix/test/test_common.h +++ b/opal/mca/pmix/pmix112/pmix/test/test_common.h @@ -271,12 +271,13 @@ typedef struct { nanosleep(&ts,NULL); \ count++; \ } \ + PMIX_ACQUIRE_OBJECT(&cbdata); \ } \ } \ if (PMIX_SUCCESS == rc) { \ if( PMIX_SUCCESS != cbdata.status ){ \ - if( !( rc == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){ \ - TEST_VERBOSE(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s", \ + if( !( cbdata.status == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){ \ + TEST_ERROR(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s", \ my_nspace, my_rank, rc, my_nspace, r)); \ } \ rc = PMIX_ERROR; \ @@ -285,7 +286,7 @@ typedef struct { rc = PMIX_ERROR; \ } \ else if (val->type != PMIX_VAL_TYPE_ ## dtype || PMIX_VAL_CMP(dtype, PMIX_VAL_FIELD_ ## dtype((val)), data)) { \ - TEST_VERBOSE(("%s:%u: from %s:%d Key %s value or type mismatch," \ + TEST_ERROR(("%s:%u: from %s:%d Key %s value or type mismatch," \ " want type %d get type %d", \ my_nspace, my_rank, ns, r, key, PMIX_VAL_TYPE_ ## dtype, val->type)); \ rc = PMIX_ERROR; \ diff --git a/opal/mca/pmix/pmix112/pmix/test/test_fence.c b/opal/mca/pmix/pmix112/pmix/test/test_fence.c index 37315f99b55..e57a81b36bc 100644 --- a/opal/mca/pmix/pmix112/pmix/test/test_fence.c +++ b/opal/mca/pmix/pmix112/pmix/test/test_fence.c @@ -16,11 +16,13 @@ static void get_cb(pmix_status_t status, pmix_value_t *kv, void *cbdata) { get_cbdata *cb = (get_cbdata*)cbdata; + PMIX_ACQUIRE_OBJECT(cb); if (PMIX_SUCCESS == status) { pmix_value_xfer(cb->kv, kv); } - cb->in_progress = 0; cb->status = status; + PMIX_POST_OBJECT(cb); + cb->in_progress = 0; } static void add_noise(char *noise_param, char *my_nspace, int my_rank)