Update to 0.7.0
This commit is contained in:
parent
b8a2d7216e
commit
e08de46527
|
@ -1,2 +1,3 @@
|
|||
/ck-0.5.2.tar.gz
|
||||
/ck-0.6.0.tar.gz
|
||||
/ck-0.7.0.tar.gz
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
commit d93d550aaeb8a15de7f27a27bdab946df04ac6d5
|
||||
Author: Kevin Bowling <kevin.bowling@kev009.com>
|
||||
Date: Sat Aug 4 00:22:08 2018 -0700
|
||||
|
||||
ck_barrier_combining: switch to seq_cst semantics.
|
||||
|
||||
diff --git a/src/ck_barrier_combining.c b/src/ck_barrier_combining.c
|
||||
index 3ee72fd..ed1960c 100644
|
||||
--- a/src/ck_barrier_combining.c
|
||||
+++ b/src/ck_barrier_combining.c
|
||||
@@ -35,7 +35,7 @@ struct ck_barrier_combining_queue {
|
||||
struct ck_barrier_combining_group *tail;
|
||||
};
|
||||
|
||||
-CK_CC_INLINE static struct ck_barrier_combining_group *
|
||||
+static struct ck_barrier_combining_group *
|
||||
ck_barrier_combining_queue_dequeue(struct ck_barrier_combining_queue *queue)
|
||||
{
|
||||
struct ck_barrier_combining_group *front = NULL;
|
||||
@@ -48,7 +48,7 @@ ck_barrier_combining_queue_dequeue(struct ck_barrier_combining_queue *queue)
|
||||
return front;
|
||||
}
|
||||
|
||||
-CK_CC_INLINE static void
|
||||
+static void
|
||||
ck_barrier_combining_insert(struct ck_barrier_combining_group *parent,
|
||||
struct ck_barrier_combining_group *tnode,
|
||||
struct ck_barrier_combining_group **child)
|
||||
@@ -72,7 +72,7 @@ ck_barrier_combining_insert(struct ck_barrier_combining_group *parent,
|
||||
* into the barrier's tree. We use a queue to implement this
|
||||
* traversal.
|
||||
*/
|
||||
-CK_CC_INLINE static void
|
||||
+static void
|
||||
ck_barrier_combining_queue_enqueue(struct ck_barrier_combining_queue *queue,
|
||||
struct ck_barrier_combining_group *node_value)
|
||||
{
|
||||
@@ -185,10 +185,10 @@ ck_barrier_combining_aux(struct ck_barrier_combining *barrier,
|
||||
ck_pr_fence_store();
|
||||
ck_pr_store_uint(&tnode->sense, ~tnode->sense);
|
||||
} else {
|
||||
- ck_pr_fence_memory();
|
||||
while (sense != ck_pr_load_uint(&tnode->sense))
|
||||
ck_pr_stall();
|
||||
}
|
||||
+ ck_pr_fence_memory();
|
||||
|
||||
return;
|
||||
}
|
|
@ -1,548 +0,0 @@
|
|||
This is a combination of two upstream commits to support building on s390x:
|
||||
|
||||
commit 2c01ecec641eb7b4a23d7c0620589ca49bd41697
|
||||
Author: Neale Ferguson <neale@sinenomine.net>
|
||||
Date: Mon May 15 16:25:47 2017 -0400
|
||||
|
||||
Add s390x support
|
||||
|
||||
commit a6861b6adde4d0f5c0c2f9eae87758a348a44419
|
||||
Author: Samy Al Bahra <sbahra@backtrace.io>
|
||||
Date: Sat Jun 10 15:36:04 2017 -0400
|
||||
|
||||
build/ck.build.s390x: Explicitly define s390x.
|
||||
|
||||
This is sticking to the idiom in Concurrency Kit, to safe-guard against
|
||||
freestanding (or non-Linux) targets with different conventions.
|
||||
|
||||
diff -up ck-0.6.0/build/ck.build.s390x.s390fix ck-0.6.0/build/ck.build.s390x
|
||||
--- ck-0.6.0/build/ck.build.s390x.s390fix 2018-07-17 08:30:09.263803192 +0200
|
||||
+++ ck-0.6.0/build/ck.build.s390x 2018-07-17 08:32:16.442797601 +0200
|
||||
@@ -0,0 +1,2 @@
|
||||
+CFLAGS+=-m64 -O0 -g -D__s390x__
|
||||
+LDFLAGS+=-m64
|
||||
diff -up ck-0.6.0/configure.s390fix ck-0.6.0/configure
|
||||
--- ck-0.6.0/configure.s390fix 2017-02-27 21:50:14.000000000 +0100
|
||||
+++ ck-0.6.0/configure 2018-07-17 08:30:09.263803192 +0200
|
||||
@@ -482,6 +482,13 @@ case $PLATFORM in
|
||||
PLATFORM=aarch64
|
||||
ENVIRONMENT=64
|
||||
;;
|
||||
+ "s390x")
|
||||
+ RTM_ENABLE="CK_MD_RTM_DISABLE"
|
||||
+ LSE_ENABLE="CK_MD_LSE_DISABLE"
|
||||
+ MM="${MM:-"CK_MD_RMO"}"
|
||||
+ PLATFORM=s390x
|
||||
+ ENVIRONMENT=64
|
||||
+ ;;
|
||||
*)
|
||||
RTM_ENABLE="CK_MD_RTM_DISABLE"
|
||||
LSE_ENABLE="CK_MD_LSE_DISABLE"
|
||||
diff -up ck-0.6.0/include/ck_pr.h.s390fix ck-0.6.0/include/ck_pr.h
|
||||
--- ck-0.6.0/include/ck_pr.h.s390fix 2017-02-27 21:50:14.000000000 +0100
|
||||
+++ ck-0.6.0/include/ck_pr.h 2018-07-17 08:30:09.263803192 +0200
|
||||
@@ -43,6 +43,8 @@
|
||||
#include "gcc/sparcv9/ck_pr.h"
|
||||
#elif defined(__ppc64__)
|
||||
#include "gcc/ppc64/ck_pr.h"
|
||||
+#elif defined(__s390x__)
|
||||
+#include "gcc/s390x/ck_pr.h"
|
||||
#elif defined(__ppc__)
|
||||
#include "gcc/ppc/ck_pr.h"
|
||||
#elif defined(__arm__)
|
||||
diff -up ck-0.6.0/include/gcc/s390x/ck_f_pr.h.s390fix ck-0.6.0/include/gcc/s390x/ck_f_pr.h
|
||||
--- ck-0.6.0/include/gcc/s390x/ck_f_pr.h.s390fix 2018-07-17 08:30:09.263803192 +0200
|
||||
+++ ck-0.6.0/include/gcc/s390x/ck_f_pr.h 2018-07-17 08:30:09.263803192 +0200
|
||||
@@ -0,0 +1,97 @@
|
||||
+/* DO NOT EDIT. This is auto-generated from feature.sh */
|
||||
+#define CK_F_PR_ADD_32
|
||||
+#define CK_F_PR_ADD_64
|
||||
+#define CK_F_PR_ADD_INT
|
||||
+#define CK_F_PR_ADD_PTR
|
||||
+#define CK_F_PR_ADD_UINT
|
||||
+#define CK_F_PR_AND_32
|
||||
+#define CK_F_PR_AND_64
|
||||
+#define CK_F_PR_AND_INT
|
||||
+#define CK_F_PR_AND_PTR
|
||||
+#define CK_F_PR_AND_UINT
|
||||
+#define CK_F_PR_CAS_32
|
||||
+#define CK_F_PR_CAS_32_VALUE
|
||||
+#define CK_F_PR_CAS_64
|
||||
+#define CK_F_PR_CAS_64_VALUE
|
||||
+#define CK_F_PR_CAS_INT
|
||||
+#define CK_F_PR_CAS_INT_VALUE
|
||||
+#define CK_F_PR_CAS_PTR
|
||||
+#define CK_F_PR_CAS_PTR_VALUE
|
||||
+#define CK_F_PR_CAS_UINT
|
||||
+#define CK_F_PR_CAS_UINT_VALUE
|
||||
+#define CK_F_PR_DEC_32
|
||||
+#define CK_F_PR_DEC_64
|
||||
+#define CK_F_PR_DEC_INT
|
||||
+#define CK_F_PR_DEC_PTR
|
||||
+#define CK_F_PR_DEC_UINT
|
||||
+#define CK_F_PR_FAA_32
|
||||
+#define CK_F_PR_FAA_64
|
||||
+#define CK_F_PR_FAA_INT
|
||||
+#define CK_F_PR_FAA_PTR
|
||||
+#define CK_F_PR_FAA_UINT
|
||||
+#define CK_F_PR_FAS_32
|
||||
+#define CK_F_PR_FAS_64
|
||||
+#define CK_F_PR_FAS_INT
|
||||
+#define CK_F_PR_FAS_PTR
|
||||
+#define CK_F_PR_FAS_UINT
|
||||
+#define CK_F_PR_FAS_DOUBLE
|
||||
+#define CK_F_PR_FENCE_LOAD
|
||||
+#define CK_F_PR_FENCE_LOAD_DEPENDS
|
||||
+#define CK_F_PR_FENCE_MEMORY
|
||||
+#define CK_F_PR_FENCE_STORE
|
||||
+#define CK_F_PR_FENCE_STRICT_LOAD
|
||||
+#define CK_F_PR_FENCE_STRICT_LOAD_DEPENDS
|
||||
+#define CK_F_PR_FENCE_STRICT_MEMORY
|
||||
+#define CK_F_PR_FENCE_STRICT_STORE
|
||||
+#define CK_F_PR_INC_32
|
||||
+#define CK_F_PR_INC_64
|
||||
+#define CK_F_PR_INC_INT
|
||||
+#define CK_F_PR_INC_PTR
|
||||
+#define CK_F_PR_INC_UINT
|
||||
+#define CK_F_PR_LOAD_16
|
||||
+#define CK_F_PR_LOAD_32
|
||||
+#define CK_F_PR_LOAD_64
|
||||
+#define CK_F_PR_LOAD_8
|
||||
+#define CK_F_PR_LOAD_CHAR
|
||||
+#define CK_F_PR_LOAD_DOUBLE
|
||||
+#define CK_F_PR_LOAD_INT
|
||||
+#define CK_F_PR_LOAD_PTR
|
||||
+#define CK_F_PR_LOAD_SHORT
|
||||
+#define CK_F_PR_LOAD_UINT
|
||||
+#define CK_F_PR_NEG_32
|
||||
+#define CK_F_PR_NEG_64
|
||||
+#define CK_F_PR_NEG_INT
|
||||
+#define CK_F_PR_NEG_PTR
|
||||
+#define CK_F_PR_NEG_UINT
|
||||
+#define CK_F_PR_NOT_32
|
||||
+#define CK_F_PR_NOT_64
|
||||
+#define CK_F_PR_NOT_INT
|
||||
+#define CK_F_PR_NOT_PTR
|
||||
+#define CK_F_PR_NOT_UINT
|
||||
+#define CK_F_PR_OR_32
|
||||
+#define CK_F_PR_OR_64
|
||||
+#define CK_F_PR_OR_INT
|
||||
+#define CK_F_PR_OR_PTR
|
||||
+#define CK_F_PR_OR_UINT
|
||||
+#define CK_F_PR_STALL
|
||||
+#define CK_F_PR_STORE_16
|
||||
+#define CK_F_PR_STORE_32
|
||||
+#define CK_F_PR_STORE_64
|
||||
+#define CK_F_PR_STORE_8
|
||||
+#define CK_F_PR_STORE_CHAR
|
||||
+#define CK_F_PR_STORE_DOUBLE
|
||||
+#define CK_F_PR_STORE_INT
|
||||
+#define CK_F_PR_STORE_PTR
|
||||
+#define CK_F_PR_STORE_SHORT
|
||||
+#define CK_F_PR_STORE_UINT
|
||||
+#define CK_F_PR_SUB_32
|
||||
+#define CK_F_PR_SUB_64
|
||||
+#define CK_F_PR_SUB_INT
|
||||
+#define CK_F_PR_SUB_PTR
|
||||
+#define CK_F_PR_SUB_UINT
|
||||
+#define CK_F_PR_XOR_32
|
||||
+#define CK_F_PR_XOR_64
|
||||
+#define CK_F_PR_XOR_INT
|
||||
+#define CK_F_PR_XOR_PTR
|
||||
+#define CK_F_PR_XOR_UINT
|
||||
+
|
||||
diff -up ck-0.6.0/include/gcc/s390x/ck_pr.h.s390fix ck-0.6.0/include/gcc/s390x/ck_pr.h
|
||||
--- ck-0.6.0/include/gcc/s390x/ck_pr.h.s390fix 2018-07-17 08:30:09.264803200 +0200
|
||||
+++ ck-0.6.0/include/gcc/s390x/ck_pr.h 2018-07-17 08:30:09.263803192 +0200
|
||||
@@ -0,0 +1,372 @@
|
||||
+/*
|
||||
+ * Copyright 2009-2015 Samy Al Bahra.
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
||||
+ * modification, are permitted provided that the following conditions
|
||||
+ * are met:
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer in the
|
||||
+ * documentation and/or other materials provided with the distribution.
|
||||
+ *
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
+ * SUCH DAMAGE.
|
||||
+ */
|
||||
+
|
||||
+#ifndef CK_PR_S390X_H
|
||||
+#define CK_PR_S390X_H
|
||||
+
|
||||
+#ifndef CK_PR_H
|
||||
+#error Do not include this file directly, use ck_pr.h
|
||||
+#endif
|
||||
+
|
||||
+#include <ck_cc.h>
|
||||
+#include <ck_md.h>
|
||||
+
|
||||
+/*
|
||||
+ * The following represent supported atomic operations.
|
||||
+ * These operations may be emulated.
|
||||
+ */
|
||||
+#include "ck_f_pr.h"
|
||||
+
|
||||
+/*
|
||||
+ * Minimum interface requirement met.
|
||||
+ */
|
||||
+#define CK_F_PR
|
||||
+
|
||||
+/*
|
||||
+ * This bounces the hardware thread from low to medium
|
||||
+ * priority. I am unsure of the benefits of this approach
|
||||
+ * but it is used by the Linux kernel.
|
||||
+ */
|
||||
+CK_CC_INLINE static void
|
||||
+ck_pr_stall(void)
|
||||
+{
|
||||
+ __sync_synchronize();
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
+#define CK_PR_FENCE(T) \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_fence_strict_##T(void) \
|
||||
+ { \
|
||||
+ __sync_synchronize(); \
|
||||
+ }
|
||||
+
|
||||
+/*
|
||||
+ * These are derived from:
|
||||
+ * http://www.ibm.com/developerworks/systems/articles/powerpc.html
|
||||
+ */
|
||||
+CK_PR_FENCE(atomic)
|
||||
+CK_PR_FENCE(atomic_store)
|
||||
+CK_PR_FENCE(atomic_load)
|
||||
+CK_PR_FENCE(store_atomic)
|
||||
+CK_PR_FENCE(load_atomic)
|
||||
+CK_PR_FENCE(store)
|
||||
+CK_PR_FENCE(store_load)
|
||||
+CK_PR_FENCE(load)
|
||||
+CK_PR_FENCE(load_store)
|
||||
+CK_PR_FENCE(memory)
|
||||
+CK_PR_FENCE(acquire)
|
||||
+CK_PR_FENCE(release)
|
||||
+CK_PR_FENCE(acqrel)
|
||||
+CK_PR_FENCE(lock)
|
||||
+CK_PR_FENCE(unlock)
|
||||
+
|
||||
+#undef CK_PR_FENCE
|
||||
+
|
||||
+#define CK_PR_LOAD(S, M, T, C, I) \
|
||||
+ CK_CC_INLINE static T \
|
||||
+ ck_pr_md_load_##S(const M *target) \
|
||||
+ { \
|
||||
+ T r; \
|
||||
+ __asm__ __volatile__(I "\t%0, %1\n" \
|
||||
+ : "=r" (r) \
|
||||
+ : "Q" (*(const C *)target) \
|
||||
+ : "memory"); \
|
||||
+ return (r); \
|
||||
+ }
|
||||
+
|
||||
+CK_PR_LOAD(ptr, void, void *, uint64_t, "lg")
|
||||
+
|
||||
+#define CK_PR_LOAD_S(S, T, I) CK_PR_LOAD(S, T, T, T, I)
|
||||
+
|
||||
+CK_PR_LOAD_S(64, uint64_t, "lg")
|
||||
+CK_PR_LOAD_S(32, uint32_t, "llgf")
|
||||
+CK_PR_LOAD_S(16, uint16_t, "llgh")
|
||||
+CK_PR_LOAD_S(8, uint8_t, "llgc")
|
||||
+CK_PR_LOAD_S(uint, unsigned int, "llgf")
|
||||
+CK_PR_LOAD_S(int, int, "llgf")
|
||||
+CK_PR_LOAD_S(short, short, "lgh")
|
||||
+CK_PR_LOAD_S(char, char, "lgb")
|
||||
+#ifndef CK_PR_DISABLE_DOUBLE
|
||||
+CK_CC_INLINE static double
|
||||
+ck_pr_md_load_double(const double *target)
|
||||
+{
|
||||
+ double r;
|
||||
+ __asm__ __volatile__("ld %0, %1\n"
|
||||
+ : "=f" (r)
|
||||
+ : "Q" (*(const double *)target)
|
||||
+ : "memory");
|
||||
+ return (r);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#undef CK_PR_LOAD_S
|
||||
+#undef CK_PR_LOAD
|
||||
+
|
||||
+#define CK_PR_STORE(S, M, T, C, I) \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_md_store_##S(M *target, T v) \
|
||||
+ { \
|
||||
+ __asm__ __volatile__(I "\t%1, %0\n" \
|
||||
+ : "=Q" (*(C *)target) \
|
||||
+ : "r" (v) \
|
||||
+ : "memory"); \
|
||||
+ return; \
|
||||
+ }
|
||||
+
|
||||
+CK_PR_STORE(ptr, void, const void *, uint64_t, "stg")
|
||||
+
|
||||
+#define CK_PR_STORE_S(S, T, I) CK_PR_STORE(S, T, T, T, I)
|
||||
+
|
||||
+CK_PR_STORE_S(64, uint64_t, "stg")
|
||||
+CK_PR_STORE_S(32, uint32_t, "st")
|
||||
+CK_PR_STORE_S(16, uint16_t, "sth")
|
||||
+CK_PR_STORE_S(8, uint8_t, "stc")
|
||||
+CK_PR_STORE_S(uint, unsigned int, "st")
|
||||
+CK_PR_STORE_S(int, int, "st")
|
||||
+CK_PR_STORE_S(short, short, "sth")
|
||||
+CK_PR_STORE_S(char, char, "stc")
|
||||
+#ifndef CK_PR_DISABLE_DOUBLE
|
||||
+CK_CC_INLINE static void
|
||||
+ck_pr_md_store_double(double *target, double v)
|
||||
+{
|
||||
+ __asm__ __volatile__(" std %1, %0\n"
|
||||
+ : "=Q" (*(double *)target)
|
||||
+ : "f" (v)
|
||||
+ : "0", "memory");
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#undef CK_PR_STORE_S
|
||||
+#undef CK_PR_STORE
|
||||
+
|
||||
+CK_CC_INLINE static bool
|
||||
+ck_pr_cas_64_value(uint64_t *target, uint64_t compare, uint64_t set, uint64_t *value)
|
||||
+{
|
||||
+ *value = __sync_val_compare_and_swap(target,compare,set);
|
||||
+ return (*value == compare);
|
||||
+}
|
||||
+
|
||||
+CK_CC_INLINE static bool
|
||||
+ck_pr_cas_ptr_value(void *target, void *compare, void *set, void *value)
|
||||
+{
|
||||
+ uintptr_t previous;
|
||||
+
|
||||
+ previous = __sync_val_compare_and_swap((uintptr_t *) target,
|
||||
+ (uintptr_t) compare,
|
||||
+ (uintptr_t) set);
|
||||
+ *((uintptr_t *) value) = previous;
|
||||
+ return (previous == (uintptr_t) compare);
|
||||
+}
|
||||
+
|
||||
+CK_CC_INLINE static bool
|
||||
+ck_pr_cas_64(uint64_t *target, uint64_t compare, uint64_t set)
|
||||
+{
|
||||
+ return(__sync_bool_compare_and_swap(target,compare,set));
|
||||
+}
|
||||
+
|
||||
+CK_CC_INLINE static bool
|
||||
+ck_pr_cas_ptr(void *target, void *compare, void *set)
|
||||
+{
|
||||
+ return(__sync_bool_compare_and_swap((uintptr_t *) target,
|
||||
+ (uintptr_t) compare,
|
||||
+ (uintptr_t) set));
|
||||
+}
|
||||
+
|
||||
+#define CK_PR_CAS(N, T) \
|
||||
+ CK_CC_INLINE static bool \
|
||||
+ ck_pr_cas_##N##_value(T *target, T compare, T set, T *value) \
|
||||
+ { \
|
||||
+ *value = __sync_val_compare_and_swap(target, \
|
||||
+ compare, \
|
||||
+ set); \
|
||||
+ return(*value == compare); \
|
||||
+ } \
|
||||
+ CK_CC_INLINE static bool \
|
||||
+ ck_pr_cas_##N(T *target, T compare, T set) \
|
||||
+ { \
|
||||
+ return(__sync_bool_compare_and_swap(target, \
|
||||
+ compare, \
|
||||
+ set)); \
|
||||
+ }
|
||||
+
|
||||
+CK_PR_CAS(32, uint32_t)
|
||||
+CK_PR_CAS(uint, unsigned int)
|
||||
+CK_PR_CAS(int, int)
|
||||
+
|
||||
+#undef CK_PR_CAS
|
||||
+
|
||||
+CK_CC_INLINE static void *
|
||||
+ck_pr_fas_ptr(void *target, void *v)
|
||||
+{
|
||||
+ return((void *)__atomic_exchange_n((uintptr_t *) target, (uintptr_t) v, __ATOMIC_ACQUIRE));
|
||||
+}
|
||||
+
|
||||
+#define CK_PR_FAS(N, M, T) \
|
||||
+ CK_CC_INLINE static T \
|
||||
+ ck_pr_fas_##N(M *target, T v) \
|
||||
+ { \
|
||||
+ return(__atomic_exchange_n(target, v, __ATOMIC_ACQUIRE)); \
|
||||
+ }
|
||||
+
|
||||
+CK_PR_FAS(64, uint64_t, uint64_t)
|
||||
+CK_PR_FAS(32, uint32_t, uint32_t)
|
||||
+CK_PR_FAS(int, int, int)
|
||||
+CK_PR_FAS(uint, unsigned int, unsigned int)
|
||||
+
|
||||
+#ifndef CK_PR_DISABLE_DOUBLE
|
||||
+CK_CC_INLINE static double
|
||||
+ck_pr_fas_double(double *target, double *v)
|
||||
+{
|
||||
+ double previous;
|
||||
+
|
||||
+ __asm__ __volatile__ (" lg 1,%2\n"
|
||||
+ "0: lg 0,%1\n"
|
||||
+ " csg 0,1,%1\n"
|
||||
+ " jnz 0b\n"
|
||||
+ " ldgr %0,0\n"
|
||||
+ : "=f" (previous)
|
||||
+ : "Q" (target), "Q" (v)
|
||||
+ : "0", "1", "cc", "memory");
|
||||
+ return (previous);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#undef CK_PR_FAS
|
||||
+
|
||||
+/*
|
||||
+ * Atomic store-only binary operations.
|
||||
+ */
|
||||
+#define CK_PR_BINARY(K, S, M, T) \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_##K##_##S(M *target, T d) \
|
||||
+ { \
|
||||
+ d = __sync_fetch_and_##K((T *)target, d); \
|
||||
+ return; \
|
||||
+ }
|
||||
+
|
||||
+#define CK_PR_BINARY_S(K, S, T) CK_PR_BINARY(K, S, T, T)
|
||||
+
|
||||
+#define CK_PR_GENERATE(K) \
|
||||
+ CK_PR_BINARY(K, ptr, void, void *) \
|
||||
+ CK_PR_BINARY_S(K, char, char) \
|
||||
+ CK_PR_BINARY_S(K, int, int) \
|
||||
+ CK_PR_BINARY_S(K, uint, unsigned int) \
|
||||
+ CK_PR_BINARY_S(K, 64, uint64_t) \
|
||||
+ CK_PR_BINARY_S(K, 32, uint32_t) \
|
||||
+ CK_PR_BINARY_S(K, 16, uint16_t) \
|
||||
+ CK_PR_BINARY_S(K, 8, uint8_t)
|
||||
+
|
||||
+CK_PR_GENERATE(add)
|
||||
+CK_PR_GENERATE(sub)
|
||||
+CK_PR_GENERATE(and)
|
||||
+CK_PR_GENERATE(or)
|
||||
+CK_PR_GENERATE(xor)
|
||||
+
|
||||
+#undef CK_PR_GENERATE
|
||||
+#undef CK_PR_BINARY_S
|
||||
+#undef CK_PR_BINARY
|
||||
+
|
||||
+#define CK_PR_UNARY(S, M, T) \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_inc_##S(M *target) \
|
||||
+ { \
|
||||
+ ck_pr_add_##S(target, (T)1); \
|
||||
+ return; \
|
||||
+ } \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_dec_##S(M *target) \
|
||||
+ { \
|
||||
+ ck_pr_sub_##S(target, (T)1); \
|
||||
+ return; \
|
||||
+ }
|
||||
+
|
||||
+#define CK_PR_UNARY_X(S, M) \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_not_##S(M *target) \
|
||||
+ { \
|
||||
+ M newval; \
|
||||
+ do { \
|
||||
+ newval = ~(*target); \
|
||||
+ } while (!__sync_bool_compare_and_swap(target, \
|
||||
+ *target, \
|
||||
+ newval)); \
|
||||
+ } \
|
||||
+ CK_CC_INLINE static void \
|
||||
+ ck_pr_neg_##S(M *target) \
|
||||
+ { \
|
||||
+ M newval; \
|
||||
+ do { \
|
||||
+ newval = -(*target); \
|
||||
+ } while (!__sync_bool_compare_and_swap(target, \
|
||||
+ *target, \
|
||||
+ newval)); \
|
||||
+ }
|
||||
+
|
||||
+#define CK_PR_UNARY_S(S, M) CK_PR_UNARY(S, M, M) \
|
||||
+ CK_PR_UNARY_X(S, M)
|
||||
+
|
||||
+CK_PR_UNARY(ptr, void, void *)
|
||||
+CK_PR_UNARY_S(char, char)
|
||||
+CK_PR_UNARY_S(int, int)
|
||||
+CK_PR_UNARY_S(uint, unsigned int)
|
||||
+CK_PR_UNARY_S(64, uint64_t)
|
||||
+CK_PR_UNARY_S(32, uint32_t)
|
||||
+CK_PR_UNARY_S(16, uint16_t)
|
||||
+CK_PR_UNARY_S(8, uint8_t)
|
||||
+
|
||||
+#undef CK_PR_UNARY_S
|
||||
+#undef CK_PR_UNARY
|
||||
+
|
||||
+CK_CC_INLINE static void *
|
||||
+ck_pr_faa_ptr(void *target, uintptr_t delta)
|
||||
+{
|
||||
+ uintptr_t previous;
|
||||
+
|
||||
+ previous = __sync_fetch_and_add((uintptr_t *) target, delta);
|
||||
+
|
||||
+ return (void *)(previous);
|
||||
+}
|
||||
+
|
||||
+#define CK_PR_FAA(S, T) \
|
||||
+ CK_CC_INLINE static T \
|
||||
+ ck_pr_faa_##S(T *target, T delta) \
|
||||
+ { \
|
||||
+ T previous; \
|
||||
+ \
|
||||
+ previous = __sync_fetch_and_add(target, delta); \
|
||||
+ \
|
||||
+ return (previous); \
|
||||
+ }
|
||||
+
|
||||
+CK_PR_FAA(64, uint64_t)
|
||||
+CK_PR_FAA(32, uint32_t)
|
||||
+CK_PR_FAA(uint, unsigned int)
|
||||
+CK_PR_FAA(int, int)
|
||||
+
|
||||
+#undef CK_PR_FAA
|
||||
+
|
||||
+#endif /* CK_PR_S390X_H */
|
||||
diff -up ck-0.6.0/src/ck_ht_hash.h.s390fix ck-0.6.0/src/ck_ht_hash.h
|
||||
--- ck-0.6.0/src/ck_ht_hash.h.s390fix 2017-02-27 21:50:14.000000000 +0100
|
||||
+++ ck-0.6.0/src/ck_ht_hash.h 2018-07-17 08:30:09.264803200 +0200
|
||||
@@ -88,7 +88,15 @@ static inline uint64_t rotl64 ( uint64_t
|
||||
|
||||
FORCE_INLINE static uint32_t getblock ( const uint32_t * p, int i )
|
||||
{
|
||||
+#if __s390x__
|
||||
+ uint32_t res;
|
||||
+
|
||||
+ __asm__ (" lrv %0,%1\n"
|
||||
+ : "=r" (res) : "Q" (p[i]) : "cc", "mem");
|
||||
+ return res;
|
||||
+#else
|
||||
return p[i];
|
||||
+#endif
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
|
@ -0,0 +1,33 @@
|
|||
commit b02bb2b805c970e6ef90e8e15daafa5d78cb195f
|
||||
Author: Paul Khuong <pvk@google.com>
|
||||
Date: Wed Aug 21 10:08:10 2019 -0400
|
||||
|
||||
x86/ck_pr: fix register constraint for ck_pr_foo_is_zero
|
||||
|
||||
setcc works with byte registers, so we want `q` to ensure
|
||||
the low byte register is encodable, not the general `r`.
|
||||
|
||||
Fixes https://github.com/concurrencykit/ck/issues/142.
|
||||
|
||||
diff --git a/include/gcc/x86/ck_pr.h b/include/gcc/x86/ck_pr.h
|
||||
index e678e83..8ef8864 100644
|
||||
--- a/include/gcc/x86/ck_pr.h
|
||||
+++ b/include/gcc/x86/ck_pr.h
|
||||
@@ -239,7 +239,7 @@ CK_PR_FAA_S(8, uint8_t, "xaddb")
|
||||
bool ret; \
|
||||
__asm__ __volatile__(CK_PR_LOCK_PREFIX I " %0; setz %1" \
|
||||
: "+m" (*(C *)target), \
|
||||
- "=rm" (ret) \
|
||||
+ "=qm" (ret) \
|
||||
: \
|
||||
: "memory", "cc"); \
|
||||
return ret; \
|
||||
@@ -354,7 +354,7 @@ CK_PR_CAS_S(8, uint8_t, "cmpxchgb")
|
||||
: "q" (set), \
|
||||
"a" (compare) \
|
||||
: "memory", "cc"); \
|
||||
- return (bool)z; \
|
||||
+ return z; \
|
||||
}
|
||||
|
||||
CK_PR_CAS_O(ptr, void, void *, char, "l", "eax")
|
11
ck.spec
11
ck.spec
|
@ -1,15 +1,14 @@
|
|||
Name: ck
|
||||
Version: 0.6.0
|
||||
Release: 11%{?dist}
|
||||
Version: 0.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for high performance concurrent programming
|
||||
|
||||
License: BSD
|
||||
URL: http://concurrencykit.org
|
||||
|
||||
Source: http://concurrencykit.org/releases/ck-%{version}.tar.gz
|
||||
Patch0: ck-config-s390x.patch
|
||||
Patch1: ck-nogettid.patch
|
||||
Patch2: ck-barrier-combining.patch
|
||||
Patch2: ck-register-constraint.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
|
||||
|
@ -38,7 +37,6 @@ resources needed for developing Concurrency Kit applications.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
|
@ -76,6 +74,9 @@ make check
|
|||
%ldconfig_scriptlets
|
||||
|
||||
%changelog
|
||||
* Thu Aug 22 2019 Honza Horak <hhorak@redhat.com> - 0.7.0-1
|
||||
- Update to 0.7.0
|
||||
|
||||
* Wed Aug 21 2019 Honza Horak <hhorak@redhat.com> - 0.6.0-11
|
||||
- Add upstream patch ck_barrier_combining: switch to seq_cst semantics to make
|
||||
ppc64le
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (ck-0.6.0.tar.gz) = 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0
|
||||
SHA512 (ck-0.7.0.tar.gz) = 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
|
||||
|
|
Loading…
Reference in New Issue