C11

.travis-install-autotools.sh

@@ -0,0 +1,139 @@
+#!/bin/sh
+
+set +e
+set -x
+
+os=`uname`
+TRAVIS_ROOT="$1"
+
+case "$os" in
+    Darwin)
+        set +e # do not fail on error
+        brew update
+        brew info autoconf automake libtool
+        brew install autoconf automake libtool
+        brew upgrade autoconf automake libtool
+        which glibtool
+        which glibtoolize
+        glibtool --version
+        ln -s `which glibtool` ${TRAVIS_ROOT}/bin/libtool
+        ln -s `which glibtoolize` ${TRAVIS_ROOT}/bin/libtoolize
+        set -e # restore fail on error
+        ;;
+    Linux)
+        MAKE_JNUM=2
+        M4_VERSION=1.4.17
+        LIBTOOL_VERSION=2.4.6
+        AUTOCONF_VERSION=2.69
+        AUTOMAKE_VERSION=1.15
+
+        cd ${TRAVIS_ROOT}
+        TOOL=m4
+        TDIR=${TOOL}-${M4_VERSION}
+        FILE=${TDIR}.tar.gz
+        BIN=${TRAVIS_ROOT}/bin/${TOOL}
+        if [ -f ${FILE} ] ; then
+          echo ${FILE} already exists! Using existing copy.
+        else
+          wget http://ftp.gnu.org/gnu/${TOOL}/${FILE}
+        fi
+        if [ -d ${TDIR} ] ; then
+          echo ${TDIR} already exists! Using existing copy.
+        else
+          echo Unpacking ${FILE}
+          tar -xzf ${FILE}
+        fi
+        if [ -f ${BIN} ] ; then
+          echo ${BIN} already exists! Skipping build.
+        else
+          cd ${TRAVIS_ROOT}/${TDIR}
+          ./configure CC=cc --prefix=${TRAVIS_ROOT} && make -j ${MAKE_JNUM} && make install
+          if [ "x$?" != "x0" ] ; then
+            echo FAILURE 1
+            exit
+          fi
+        fi
+
+        cd ${TRAVIS_ROOT}
+        TOOL=libtool
+        TDIR=${TOOL}-${LIBTOOL_VERSION}
+        FILE=${TDIR}.tar.gz
+        BIN=${TRAVIS_ROOT}/bin/${TOOL}
+        if [ ! -f ${FILE} ] ; then
+          wget http://ftp.gnu.org/gnu/${TOOL}/${FILE}
+        else
+          echo ${FILE} already exists! Using existing copy.
+        fi
+        if [ ! -d ${TDIR} ] ; then
+          echo Unpacking ${FILE}
+          tar -xzf ${FILE}
+        else
+          echo ${TDIR} already exists! Using existing copy.
+        fi
+        if [ -f ${BIN} ] ; then
+          echo ${BIN} already exists! Skipping build.
+        else
+          cd ${TRAVIS_ROOT}/${TDIR}
+          ./configure CC=cc --prefix=${TRAVIS_ROOT} M4=${TRAVIS_ROOT}/bin/m4 && make -j ${MAKE_JNUM} && make install
+          if [ "x$?" != "x0" ] ; then
+            echo FAILURE 2
+            exit
+          fi
+        fi
+
+        cd ${TRAVIS_ROOT}
+        TOOL=autoconf
+        TDIR=${TOOL}-${AUTOCONF_VERSION}
+        FILE=${TDIR}.tar.gz
+        BIN=${TRAVIS_ROOT}/bin/${TOOL}
+        if [ ! -f ${FILE} ] ; then
+          wget http://ftp.gnu.org/gnu/${TOOL}/${FILE}
+        else
+          echo ${FILE} already exists! Using existing copy.
+        fi
+        if [ ! -d ${TDIR} ] ; then
+          echo Unpacking ${FILE}
+          tar -xzf ${FILE}
+        else
+          echo ${TDIR} already exists! Using existing copy.
+        fi
+        if [ -f ${BIN} ] ; then
+          echo ${BIN} already exists! Skipping build.
+        else
+          cd ${TRAVIS_ROOT}/${TDIR}
+          ./configure CC=cc --prefix=${TRAVIS_ROOT} M4=${TRAVIS_ROOT}/bin/m4 && make -j ${MAKE_JNUM} && make install
+          if [ "x$?" != "x0" ] ; then
+            echo FAILURE 3
+            exit
+          fi
+        fi
+
+        cd ${TRAVIS_ROOT}
+        TOOL=automake
+        TDIR=${TOOL}-${AUTOMAKE_VERSION}
+        FILE=${TDIR}.tar.gz
+        BIN=${TRAVIS_ROOT}/bin/${TOOL}
+        if [ ! -f ${FILE} ] ; then
+          wget http://ftp.gnu.org/gnu/${TOOL}/${FILE}
+        else
+          echo ${FILE} already exists! Using existing copy.
+        fi
+        if [ ! -d ${TDIR} ] ; then
+          echo Unpacking ${FILE}
+          tar -xzf ${FILE}
+        else
+          echo ${TDIR} already exists! Using existing copy.
+        fi
+        if [ -f ${BIN} ] ; then
+          echo ${BIN} already exists! Skipping build.
+        else
+          cd ${TRAVIS_ROOT}/${TDIR}
+          ./configure CC=cc --prefix=${TRAVIS_ROOT} M4=${TRAVIS_ROOT}/bin/m4 && make -j ${MAKE_JNUM} && make install
+          if [ "x$?" != "x0" ] ; then
+            echo FAILURE 4
+            exit
+          fi
+        fi
+        ;;
+esac
+

.travis.yml

@@ -0,0 +1,49 @@
+sudo: false
+language: c
+os:
+- linux
+- osx
+compiler:
+- gcc
+- clang
+env:
+  matrix:
+  - OPA_CFLAGS=-std=c89
+  - OPA_CFLAGS=-std=c99
+  - OPA_CFLAGS=-std=c11
+  - OPA_CFLAGS=-std=gnu89
+  - OPA_CFLAGS=-std=gnu99
+  - OPA_CFLAGS=-std=gnu11
+matrix:
+  allow_failures:
+  - os: linux
+    compiler: gcc
+    env: OPA_CFLAGS=-std=c11
+  - os: linux
+    compiler: gcc
+    env: OPA_CFLAGS=-std=gnu11
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    # clang-3.8 comes from this
+    - llvm-toolchain-precise
+    packages:
+    - gcc-4.9
+    - gcc-5
+    - gcc-6
+    - clang-3.8
+install:
+- export WORKING_DIRECTORY=$PWD
+- mkdir -p $WORKING_DIRECTORY/deps
+- export PATH=$WORKING_DIRECTORY/deps/bin:$PATH
+- sh .travis-install-autotools.sh $WORKING_DIRECTORY/deps
+before_script:
+- ./autogen.sh
+script:
+- ./configure CFLAGS=$OPA_CFLAGS
+- make
+- make check
+after_failure:
+- echo "Sad panda"
+- find . -name config.log -exec cat {} ";"

COPYRIGHT

@@ -12,10 +12,9 @@ Permission is hereby granted to use, reproduce, prepare derivative works, and
 to redistribute to others.  This software was authored by:
 
 Argonne National Laboratory Group
-D. Goodell:  (630) 252-6082; FAX: (630) 252-5986; e-mail: [email protected]
-D. Buntinas: (630) 252-7928; FAX: (630) 252-5986; e-mail: [email protected]
 Mathematics and Computer Science Division
 Argonne National Laboratory, Argonne IL 60439
+Contact: [email protected]
 
 
                               GOVERNMENT LICENSE

README

@@ -10,7 +10,7 @@ derived from work on the MPICH2 project.
 
 Project documentation and bug tracking can be found at:
 
-  https://trac.mcs.anl.gov/projects/openpa/
+  https://trac.mpich.org/projects/openpa/
 
 If you would like to email questions or discuss topics related to OpenPA
 you can send mail to [email protected].

configure.ac

@@ -6,7 +6,7 @@
 
 AC_PREREQ(2.62)
 
-AC_INIT([OpenPA], [1.0.4], [https://trac.mcs.anl.gov/projects/openpa/newticket])
+AC_INIT([OpenPA], [1.0.4], [https://trac.mpich.org/projects/openpa/newticket])
 dnl Set the directory that contains support scripts such as install-sh and
 dnl config.guess.  It also contains autoconf macro files.
 AC_CONFIG_AUX_DIR(confdb)
@@ -341,6 +341,7 @@ dnl without AC_TRY_RUN().
         OPA_TRY_PRIMITIVE_HEADER([opa_gcc_sicortex.h], [GCC_AND_SICORTEX_ASM], [gcc SiCortex atomics])
     fi
 
+    OPA_TRY_PRIMITIVE_HEADER([opa_c11_atomics.h], [C11_ATOMICS], [C11 atomics])
     OPA_TRY_PRIMITIVE_HEADER([opa_gcc_intrinsics.h], [GCC_INTRINSIC_ATOMICS], [gcc atomic intrinsics])
     OPA_TRY_PRIMITIVE_HEADER([opa_nt_intrinsics.h], [NT_INTRINSICS], [Windows NT atomic intrinsics])
     OPA_TRY_PRIMITIVE_HEADER([opa_sun_atomic_ops.h], [SUN_ATOMIC_OPS], [Sun atomic operations library])

src/opa_primitives.h

@@ -98,9 +98,11 @@
 #if defined(OPA_USE_UNSAFE_PRIMITIVES)
 /* comes first to permit user overrides in the style of NDEBUG */
 #include "primitives/opa_unsafe.h"
-#elif   defined(OPA_HAVE_GCC_AND_POWERPC_ASM)
+#elif defined(OPA_HAVE_C11_ATOMICS)
+#include "primitives/opa_c11_atomics.h"
+#elif defined(OPA_HAVE_GCC_AND_POWERPC_ASM)
 #include "primitives/opa_gcc_ppc.h"
-#elif   defined(OPA_HAVE_GCC_AND_ARM_ASM)
+#elif defined(OPA_HAVE_GCC_AND_ARM_ASM)
 #include "primitives/opa_gcc_arm.h"
 #elif defined(OPA_HAVE_GCC_X86_32_64)
 #include "primitives/opa_gcc_intel_32_64.h"

src/primitives/opa_c11_atomics.h

@@ -0,0 +1,146 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
+/*  
+ *  (C) 2008 by Argonne National Laboratory.
+ *  (C) 2014 by Argonne National Laboratory, Leadership Computing Facility.
+ *      See COPYRIGHT in top-level directory.
+ */
+
+/* FIXME needs to be converted to new style functions with OPA_int_t/OPA_ptr_t-types */
+#ifndef OPA_C11_ATOMICS_H_INCLUDED
+#define OPA_C11_ATOMICS_H_INCLUDED
+
+#ifdef __STDC_NO_ATOMICS__
+#error stdatomic header is not available.
+#else
+#include <stdatomic.h>
+#endif
+
+/* Clang 3.x has a bug in stdatomic.h, wherein there is an extra _T
+ * in the following macros.  It is fixed in Clang 4.x. */
+#if !defined(ATOMIC_INT_LOCK_FREE) && !defined(ATOMIC_INT_T_LOCK_FREE)
+#error atomic_int is not lock-free.
+#else
+typedef atomic_int OPA_int_t;
+#endif
+
+#if !defined(ATOMIC_POINTER_LOCK_FREE) && !defined(ATOMIC_POINTER_T_LOCK_FREE)
+#error atomic_pointer is not lock-free.
+#else
+/* TODO Is this really the right type to use here? */
+#include <stdint.h>
+typedef atomic_intptr_t OPA_ptr_t;
+#endif
+
+#define OPA_INT_T_INITIALIZER(val_) ATOMIC_VAR_INIT(val_)
+#define OPA_PTR_T_INITIALIZER(val_) ATOMIC_VAR_INIT(val_)
+
+static _opa_inline int OPA_load_int(OPA_int_t *ptr)
+{
+    return atomic_load_explicit(ptr, memory_order_relaxed);
+}
+
+static _opa_inline void OPA_store_int(OPA_int_t *ptr, int val)
+{
+    atomic_store_explicit(ptr, val, memory_order_relaxed);
+}
+
+static _opa_inline void *OPA_load_ptr(OPA_ptr_t *ptr)
+{
+    return (void*)atomic_load_explicit(ptr, memory_order_relaxed);
+}
+
+static _opa_inline void OPA_store_ptr(OPA_ptr_t *ptr, void *val)
+{
+    atomic_store_explicit(ptr, (intptr_t)val, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_load_acquire_int(OPA_int_t *ptr)
+{
+    return atomic_load_explicit(ptr, memory_order_acquire);
+}
+
+static _opa_inline void OPA_store_release_int(OPA_int_t *ptr, int val)
+{
+    atomic_store_explicit(ptr, val, memory_order_release);
+}
+
+static _opa_inline void *OPA_load_acquire_ptr(OPA_ptr_t *ptr)
+{
+    return (void*)atomic_load_explicit(ptr, memory_order_acquire);
+}
+
+static _opa_inline void OPA_store_release_ptr(OPA_ptr_t *ptr, void *val)
+{
+    atomic_store_explicit(ptr, (intptr_t)val, memory_order_release);
+}
+
+static _opa_inline void OPA_add_int(OPA_int_t *ptr, int val)
+{
+    atomic_fetch_add_explicit(ptr, val, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_fetch_and_add_int(OPA_int_t *ptr, int val)
+{
+    return atomic_fetch_add_explicit(ptr, val, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_fetch_and_decr_int(OPA_int_t *ptr)
+{
+    return atomic_fetch_add_explicit(ptr, -1, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_fetch_and_incr_int(OPA_int_t *ptr)
+{
+    return atomic_fetch_add_explicit(ptr, 1, memory_order_relaxed);
+}
+
+static _opa_inline void OPA_incr_int(OPA_int_t *ptr)
+{
+    atomic_fetch_add_explicit(ptr, 1, memory_order_relaxed);
+}
+
+static _opa_inline void OPA_decr_int(OPA_int_t *ptr)
+{
+    atomic_fetch_add_explicit(ptr, -1, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_decr_and_test_int(OPA_int_t *ptr)
+{
+    return (1 == atomic_fetch_add_explicit(ptr, -1, memory_order_relaxed));
+}
+
+/* Dave Goodell says weak is fine.  OpenPA does not expect strong. */
+
+#include <stdbool.h>
+
+static _opa_inline void *OPA_cas_ptr(OPA_ptr_t *ptr, void *comparand, void *swaperand)
+{
+    atomic_compare_exchange_strong_explicit(ptr, (intptr_t*)&comparand, (intptr_t)swaperand, memory_order_relaxed, memory_order_relaxed);
+    return comparand;
+}
+
+static _opa_inline int OPA_cas_int(OPA_int_t *ptr, int comparand, int swaperand)
+{
+    atomic_compare_exchange_strong_explicit(ptr, &comparand, swaperand, memory_order_relaxed, memory_order_relaxed);
+    return comparand;
+}
+
+static _opa_inline void *OPA_swap_ptr(OPA_ptr_t *ptr, void *val)
+{
+    return (void*)atomic_exchange_explicit(ptr, (intptr_t)val, memory_order_relaxed);
+}
+
+static _opa_inline int OPA_swap_int(OPA_int_t *ptr, int val)
+{
+    return atomic_exchange_explicit(ptr, val, memory_order_relaxed);
+}
+
+/* Dave says that read/write don't match acq/rel perfectly so we use heavy hammer. */
+#define OPA_write_barrier()      atomic_thread_fence(memory_order_acq_rel);
+#define OPA_read_barrier()       atomic_thread_fence(memory_order_acq_rel);
+#define OPA_read_write_barrier() atomic_thread_fence(memory_order_acq_rel);
+/* FYI: According to C11 7.17.4.2 NOTE 2, atomic_signal_fence acts as
+ *      a compiler barrier.  Note sure how memory_order affects this. */
+#define OPA_compiler_barrier()   atomic_signal_fence(memory_order_acq_rel);
+
+#endif /* OPA_C11_ATOMICS_H_INCLUDED */