Author: Armin Rigo <[email protected]>
Branch: stmgc-c8-gcc
Changeset: r78414:62f881a8b44d
Date: 2015-07-02 15:35 +0100
http://bitbucket.org/pypy/pypy/changeset/62f881a8b44d/
Log: Import the 'use-gcc' branch of stmgc
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -440,7 +440,7 @@
exe_name = targetdir.join(exe_name)
kwds = {}
if self.config.translation.stm:
- kwds['cc'] = 'clang' # force the use of clang
+ kwds['cc'] = 'gcc-seg-gs' # use the custom patched version of gcc
mk = self.translator.platform.gen_makefile(
cfiles, self.eci,
path=targetdir, exe_name=exe_name,
diff --git a/rpython/translator/stm/src_stm/revision
b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-9f966d34d3be
+8fc3a9b12b15
diff --git a/rpython/translator/stm/src_stm/stm/core.c
b/rpython/translator/stm/src_stm/stm/core.c
--- a/rpython/translator/stm/src_stm/stm/core.c
+++ b/rpython/translator/stm/src_stm/stm/core.c
@@ -868,7 +868,6 @@
_cards_cleared_in_object(get_priv_segment(STM_SEGMENT->segment_num), obj,
false);
}
-__attribute__((always_inline))
static void write_slowpath_overflow_obj(object_t *obj, bool mark_card)
{
assert(obj->stm_flags & GCFLAG_WRITE_BARRIER);
@@ -927,7 +926,6 @@
release_privatization_lock(STM_SEGMENT->segment_num);
}
-__attribute__((always_inline))
static void write_slowpath_common(object_t *obj, bool mark_card)
{
assert(_seems_to_be_running_transaction());
@@ -1070,6 +1068,7 @@
obj, index, get_index_to_card_index(index), CARD_MARKED));
}
+__attribute__((flatten))
void _stm_write_slowpath(object_t *obj) {
write_slowpath_common(obj, /* mark_card */ false);
}
diff --git a/rpython/translator/stm/src_stm/stm/core.h
b/rpython/translator/stm/src_stm/stm/core.h
--- a/rpython/translator/stm/src_stm/stm/core.h
+++ b/rpython/translator/stm/src_stm/stm/core.h
@@ -151,8 +151,10 @@
/* The sync queue used to synchronize newly allocated objs to
other segments */
- stm_char *sq_fragments[SYNC_QUEUE_SIZE];
- int sq_fragsizes[SYNC_QUEUE_SIZE];
+ stm_char *_sq_fragments[SYNC_QUEUE_SIZE];
+ int _sq_fragsizes[SYNC_QUEUE_SIZE];
+ stm_char **sq_fragments; /* indirection to work around a gcc issue */
+ int *sq_fragsizes;
int sq_len;
/* For nursery_mark */
diff --git a/rpython/translator/stm/src_stm/stm/fprintcolor.c
b/rpython/translator/stm/src_stm/stm/fprintcolor.c
--- a/rpython/translator/stm/src_stm/stm/fprintcolor.c
+++ b/rpython/translator/stm/src_stm/stm/fprintcolor.c
@@ -1,8 +1,10 @@
/* Imported by rpython/translator/stm/import_stmgc.py */
+#include <stdarg.h>
/* ------------------------------------------------------------ */
#ifdef STM_DEBUGPRINT
/* ------------------------------------------------------------ */
+
static int threadcolor_printf(const char *format, ...)
{
char buffer[2048];
diff --git a/rpython/translator/stm/src_stm/stm/locks.h
b/rpython/translator/stm/src_stm/stm/locks.h
--- a/rpython/translator/stm/src_stm/stm/locks.h
+++ b/rpython/translator/stm/src_stm/stm/locks.h
@@ -10,11 +10,14 @@
of modification locks!
*/
-typedef struct {
- pthread_rwlock_t lock;
+typedef union {
+ struct {
+ pthread_rwlock_t lock;
#ifndef NDEBUG
- volatile bool write_locked;
+ volatile bool write_locked;
#endif
+ };
+ char _pad[64];
} modification_lock_t __attribute__((aligned(64)));
static modification_lock_t _modlocks[NB_SEGMENTS - 1];
diff --git a/rpython/translator/stm/src_stm/stm/nursery.c
b/rpython/translator/stm/src_stm/stm/nursery.c
--- a/rpython/translator/stm/src_stm/stm/nursery.c
+++ b/rpython/translator/stm/src_stm/stm/nursery.c
@@ -477,6 +477,7 @@
/* reset the nursery by zeroing it */
char *realnursery;
realnursery = REAL_ADDRESS(pseg->pub.segment_base, _stm_nursery_start);
+ (void)realnursery;
#if _STM_NURSERY_ZEROED
memset(realnursery, 0, nursery_used);
diff --git a/rpython/translator/stm/src_stm/stm/queue.c
b/rpython/translator/stm/src_stm/stm/queue.c
--- a/rpython/translator/stm/src_stm/stm/queue.c
+++ b/rpython/translator/stm/src_stm/stm/queue.c
@@ -52,7 +52,7 @@
stm_queue_t *stm_queue_create(void)
{
- void *mem;
+ void *mem = NULL;
int result = posix_memalign(&mem, 64, sizeof(stm_queue_t));
assert(result == 0);
(void)result;
diff --git a/rpython/translator/stm/src_stm/stm/setup.c
b/rpython/translator/stm/src_stm/stm/setup.c
--- a/rpython/translator/stm/src_stm/stm/setup.c
+++ b/rpython/translator/stm/src_stm/stm/setup.c
@@ -116,6 +116,9 @@
pr->overflow_number = GCFLAG_OVERFLOW_NUMBER_bit0 * i;
highest_overflow_number = pr->overflow_number;
pr->pub.transaction_read_version = 0xff;
+
+ pr->sq_fragments = pr->_sq_fragments;
+ pr->sq_fragsizes = pr->_sq_fragsizes;
}
/* The pages are shared lazily, as remap_file_pages() takes a relatively
diff --git a/rpython/translator/stm/src_stm/stmgc.h
b/rpython/translator/stm/src_stm/stmgc.h
--- a/rpython/translator/stm/src_stm/stmgc.h
+++ b/rpython/translator/stm/src_stm/stmgc.h
@@ -21,7 +21,15 @@
#endif
-#define TLPREFIX __attribute__((address_space(256)))
+#ifdef __SEG_GS /* on a custom patched gcc */
+# define TLPREFIX __seg_gs
+# define _STM_RM_SUFFIX :8
+#elif defined(__clang__) /* on a clang, hopefully made bug-free */
+# define TLPREFIX __attribute__((address_space(256)))
+# define _STM_RM_SUFFIX /* nothing */
+#else
+# error "needs either a GCC with __seg_gs support, or a bug-freed clang"
+#endif
typedef TLPREFIX struct object_s object_t;
typedef TLPREFIX struct stm_segment_info_s stm_segment_info_t;
@@ -35,18 +43,18 @@
'STM_SEGMENT->transaction_read_version' if and only if the
object was read in the current transaction. The nurseries
also have corresponding read markers, but they are never used. */
- uint8_t rm;
+ unsigned char rm _STM_RM_SUFFIX;
};
struct stm_segment_info_s {
- uint8_t transaction_read_version;
- uint8_t no_safe_point_here; /* set from outside, triggers an assert */
+ unsigned int transaction_read_version;
int segment_num;
char *segment_base;
stm_char *nursery_current;
stm_char *nursery_mark;
uintptr_t nursery_end;
struct stm_thread_local_s *running_thread;
+ uint8_t no_safe_point_here; /* set from outside, triggers an assert */
};
#define STM_SEGMENT ((stm_segment_info_t *)4352)
@@ -357,6 +365,7 @@
#define STM_PUSH_ROOT(tl, p) ((tl).shadowstack++->ss = (object_t *)(p))
#define STM_POP_ROOT(tl, p) ((p) = (typeof(p))((--(tl).shadowstack)->ss))
#define STM_POP_ROOT_RET(tl) ((--(tl).shadowstack)->ss)
+#define STM_POP_ROOT_DROP(tl) ((void)(--(tl).shadowstack))
/* Every thread needs to have a corresponding stm_thread_local_t
structure. It may be a "__thread" global variable or something else.
@@ -370,7 +379,12 @@
/* At some key places, like the entry point of the thread and in the
function with the interpreter's dispatch loop, you need to declare
- a local variable of type 'rewind_jmp_buf' and call these macros. */
+ a local variable of type 'rewind_jmp_buf' and call these macros.
+ IMPORTANT: a function in which you call stm_rewind_jmp_enterframe()
+ must never change the value of its own arguments! If they are
+ passed on the stack, gcc can change the value directly there, but
+ we're missing the logic to save/restore this part!
+*/
#define stm_rewind_jmp_enterprepframe(tl, rjbuf) \
rewind_jmp_enterprepframe(&(tl)->rjthread, rjbuf, (tl)->shadowstack)
#define stm_rewind_jmp_enterframe(tl, rjbuf) \
@@ -657,7 +671,7 @@
#define STM_POP_MARKER(tl) ({ \
object_t *_popped = STM_POP_ROOT_RET(tl); \
- STM_POP_ROOT_RET(tl); \
+ STM_POP_ROOT_DROP(tl); \
_popped; \
})
@@ -760,11 +774,11 @@
/* ==================== END ==================== */
-static void (*stmcb_expand_marker)(char *segment_base, uintptr_t odd_number,
+extern void (*stmcb_expand_marker)(char *segment_base, uintptr_t odd_number,
object_t *following_object,
char *outputbuf, size_t outputbufsize);
-static void (*stmcb_debug_print)(const char *cause, double time,
+extern void (*stmcb_debug_print)(const char *cause, double time,
const char *marker);
#endif
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
