Ivan Maidanski [Mon, 8 Oct 2012 11:04:01 +0000 (15:04 +0400)]
Remove generalized compare_double_and_swap_double from gcc/x86.h
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full,
AO_HAVE_compare_double_and_swap_double_full): Remove already defined
in generalize.h file; remove TODO item.
Ivan Maidanski [Mon, 8 Oct 2012 10:51:30 +0000 (14:51 +0400)]
Properly fix compare_double_and_swap_double for gcc/x32 (use built-in CAS)
* src/atomic_ops/sysdeps/gcc/x86.h (AO_double_compare_and_swap_full):
New function (only if __x86_64__) implemented using GCC built-in
__sync CAS primitive available for x32.
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_HAVE_double_compare_and_swap_full): New macro (for x32 only).
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full): Implement using
double_compare_and_swap_full instead of cmpxchg8b for x32 (since
x86_64 has available cmpxchg and cmpxchg16b but not cmpxchg8b).
Ivan Maidanski [Mon, 1 Oct 2012 10:48:43 +0000 (14:48 +0400)]
Fix double_ptr_storage definition for gcc/x32
* src/atomic_ops/sysdeps/standard_ao_double_t.h (double_ptr_storage):
Define as "unsigned long long" instead of __m128 for gcc/x32 (i.e.,
ILP32 on x86_64); update and reformat comment.
Ivan Maidanski [Tue, 18 Sep 2012 16:48:08 +0000 (20:48 +0400)]
Fix compare_double_and_swap_double_full for gcc/x32
* src/atomic_ops.h: Include gcc/x86.h instead of gcc/x86_64.h if
gcc/x32 (i.e., GCC (or Intel compiler), __x86_64__ is defined, and
__ILP32__ is defined) to have AO_compare_double_and_swap_double_full
defined properly (based on cmpxchg8b); explicitly define
AO_USE_PENTIUM4_INSTRS for gcc/x32.
* src/atomic_ops/sysdeps/gcc/x86_64.h: Remove ILP32-specific code
(AO_T_IS_INT definition).
Ivan Maidanski [Mon, 8 Oct 2012 09:08:19 +0000 (13:08 +0400)]
Adjust quotes in echo command of Makefile.msft (Win32)
* src/Makefile.msft (check): Use '@' for "echo" command (not to print
the echo command itself); put echo messages into double quotes;
replace incorrectly escaped double quotes (inside echo messages) with
single quotes.
Ivan Maidanski [Mon, 8 Oct 2012 08:15:48 +0000 (12:15 +0400)]
Enable Makefile.msft for Win64
* src/Makefile.msft (libatomic_ops_gpl.lib): Do not pass
"/MACHINE:i386" option to "lib" tool (to select the proper target
architecture automatically).
Ivan Maidanski [Sun, 7 Oct 2012 21:00:08 +0000 (01:00 +0400)]
Enable test_stack for Win32 (with native threads)
* tests/test_stack.c (main): Do not skip for Win32 (i.e., skip test
only on VxWorks).
* tests/test_stack.c (USE_WINTHREADS): Define new macro for Win32 but
not Cygwin or pthreads-w32.
* tests/test_stack.c: Include windows.h (instead of pthread.h) if
USE_WINTHREADS.
* tests/test_stack.c: Include sys/timeb.h (instead of
[sys/]time.h) if USE_WINTHREADS or AO_USE_WIN32_PTHREADS.
* tests/test_stack.c (get_msecs): Implement for Win32 (except for
Cygwin) using ftime() (unless NO_TIME).
* tests/test_stack.c (run_one_test): Use DWORD return type and WINAPI
calling conventions if USE_WINTHREADS.
* tests/test_stack.c (main): Declare "thread_id" local variable if
USE_WINTHREADS; declare threads[] local variable of HANDLE type
(instead of pthread_t) if USE_WINTHREADS; use CreateThread/GetLastError
and WaitForSingleObject (instead of pthread_create and pthread_join)
if USE_WINTHREADS; cast between integer value and pointer (passed to
pthread_create) via size_t.
* tests/test_stack.c (main): Print pushes/pops/threads summary even if
NO_TIMES.
Ivan Maidanski [Sun, 7 Oct 2012 13:06:15 +0000 (17:06 +0400)]
Eliminate 64-bit compiler warnings in atomic_ops_malloc
* src/atomic_ops_malloc.c (add_chunk_as): Cast shifted value to size_t
(the type of assigned variable, at least to eliminate compiler warning
for 64-bit targets).
* src/atomic_ops_malloc.c (AO_free): Cast (*base) to int (the type of
assigned variable) to eliminate MS VC compiler warning.
Ivan Maidanski [Sun, 7 Oct 2012 12:54:02 +0000 (16:54 +0400)]
Fix double old/new_w local variables declaration in test_atomic_include
* tests/test_atomic_include.template (test_atomicXX): Move old_w and
new_w local variables declaration up to precede the first statement
(only if AO_HAVE_double_compare_and_swapXX).
Ivan Maidanski [Fri, 5 Oct 2012 17:41:19 +0000 (21:41 +0400)]
Generalize compare_double_and_swap_double using double_compare_and_swap
* src/atomic_ops/generalize.h (AO_compare_double_and_swap_double,
AO_compare_double_and_swap_double_full): New inline function (move
code from gcc/arm.h and msftc/x86.h) based on the corresponding
double_compare_and_swap (only if AO_HAVE_DOUBLE_PTR_STORAGE and
AO_HAVE_double_compare_and_swap[_full] defined but not
AO_HAVE_compare_double_and_swap_double[_full]).
* src/atomic_ops/generalize.h (AO_HAVE_compare_double_and_swap_double,
AO_HAVE_compare_double_and_swap_double_full): New macro (moved
from gcc/arm.h and msftc/x86.h, respectively).
* src/atomic_ops/sysdeps/gcc/arm.h
(AO_compare_double_and_swap_double): Remove definition from this file;
remove TODO item.
* src/atomic_ops/sysdeps/msftc/x86.h
(AO_compare_double_and_swap_double_full): Likewise.
Ivan Maidanski [Fri, 5 Oct 2012 11:10:40 +0000 (15:10 +0400)]
Eliminate arithmetic shifts in double-CAS (gcc/arm, msftc/x86)
* src/atomic_ops/sysdeps/gcc/arm.h
(AO_compare_double_and_swap_double): Make double values by setting
their AO_val1/2 parts instead of using arithmetic shifts; replace
old/new_val with old/new_w.AO_whole.
* src/atomic_ops/sysdeps/msftc/x86.h
(AO_compare_double_and_swap_double_full): Likewise.
* src/atomic_ops/sysdeps/msftc/x86.h
(AO_double_compare_and_swap_full): Add comment.
* src/atomic_ops/sysdeps/msftc/x86.h (AO_double_compare_and_swap_full,
AO_compare_double_and_swap_double_full): Cast result of
_InterlockedCompareExchange64 to double_ptr_storage (to eliminate
signed/unsigned values comparison mismatch compiler warning).
Ivan Maidanski [Fri, 5 Oct 2012 09:59:01 +0000 (13:59 +0400)]
Enable double_compare_and_swap for non-cpp code (msftc/x86.h)
* src/atomic_ops/sysdeps/msftc/x86.h (AO_double_compare_and_swap_full,
AO_HAVE_double_compare_and_swap_full): Define even if no __cplusplus;
define before compare_double_and_swap_double.
Ivan Maidanski [Fri, 5 Oct 2012 07:37:57 +0000 (11:37 +0400)]
Include proper files in atomic_ops_malloc (code refactoring)
* src/atomic_ops_malloc.c: Include atomic_ops_malloc.h instead of
atomic_ops_stack.h (to verify function definitions match prototypes).
* src/atomic_ops_malloc.c: Include assert.h (since assert() is used).
* src/atomic_ops_malloc.h: Include stddef.h instead of stdlib.h for
size_t definition.
Ivan Maidanski [Thu, 4 Oct 2012 11:14:10 +0000 (15:14 +0400)]
Enable test_stack for pthreads-w32
* tests/test_stack.c: Do not skip this test if AO_USE_WIN32_PTHREADS.
* tests/test_stack.c (main): Report (to stdout) if the test skipped;
always include stdio.h.
* tests/test_stack.c (LIMIT): Allow to specify alternate value from
command line; use smaller value (by 50 times) if AO_USE_PTHREAD_DEFS.
Ivan Maidanski [Wed, 3 Oct 2012 14:02:03 +0000 (18:02 +0400)]
Fix AO_pause sleep delay for particular argument values (Win32)
* src/atomic_ops.c (AO_pause): Fix millis value (passed to Win32
Sleep) for the case of 'n' argument in range between 12 and 21,
inclusive if AO_USE_WIN32_PTHREADS (sleep for 1 ms in this case).
* src/atomic_ops_stack.c (AO_pause): Evaluate 'msecs' value using the
same algorithm as in atomic_ops.c (Win32 only).
Ivan Maidanski [Wed, 3 Oct 2012 07:59:33 +0000 (11:59 +0400)]
Fix visibility and initial value of 'dummy' variable in atomic_ops_stack
* src/atomic_ops_stack.c (dummy): Define as static (to make symbol
without AO_ prefix visible only within this file); initialize to 1
(same as in atomic_ops.c, so that AO_spin would never really alter
its value).
Ivan Maidanski [Tue, 2 Oct 2012 20:08:23 +0000 (00:08 +0400)]
Do not include standard_ao_double_t.h where double-CAS is unimplemented
* src/atomic_ops/sysdeps/gcc/mips.h: Comment out include
standard_ao_double_t.h (since double-CAS is not implemented).
* src/atomic_ops/sysdeps/msftc/arm.h: Likewise.
* src/atomic_ops/sysdeps/gcc/mips.h: Add TODO item for
AO_compare_double_and_swap_double.
* src/atomic_ops/sysdeps/gcc/x86_64.h: Include standard_ao_double_t.h
only if AO_compare_double_and_swap_double_full defined.
* src/atomic_ops/sysdeps/msftc/x86_64.h: Likewise.
* src/atomic_ops/sysdeps/sunc/x86.h: Likewise.
Ivan Maidanski [Tue, 2 Oct 2012 12:02:17 +0000 (16:02 +0400)]
Do not report absence of meaningless nop, load and store in test_atomic
* tests/test_atomic_include.template (test_atomicXX): Do not report
missing useless AO_nop_acquire[_read]/release[_write],
AO_[char/short/int_]store_read/acquire[_read] and
AO_[char/short/int_]load_write/release[_write] primitives (by checking
the presence of all the meaningful primitives of the same group).
Ivan Maidanski [Tue, 2 Oct 2012 09:43:35 +0000 (13:43 +0400)]
Add double_compare_and_swap_read/write to generalization
* src/atomic_ops/generalize.h (AO_double_compare_and_swap_read,
AO_double_compare_and_swap_write,
AO_double_compare_and_swap_release_write,
AO_double_compare_and_swap_acquire_read): New function (only if
corresponding AO_HAVE_compare_double_and_swap_double_XXX and not
AO_HAVE_double_compare_and_swap_XXX) completing double-CAS family;
add accompanying AO_HAVE_double_compare_and_swap_XXX macro.
Ivan Maidanski [Tue, 2 Oct 2012 09:25:01 +0000 (13:25 +0400)]
Test double_compare_and_swap in test_atomic
* tests/test_atomic_include.template (test_atomicXX): Define old_w
and new_w local variables (only if AO_HAVE_double_compare_and_swapXX);
add tests for AO_double_compare_and_swapXX if available.
Ivan Maidanski [Tue, 2 Oct 2012 08:25:11 +0000 (12:25 +0400)]
Add negative double-CAS test cases to test_atomic_include
* tests/test_atomic_include.template (test_atomicXX): Add more negative
tests for compare_double_and_swap_double and compare_and_swap_double;
restore zero 'w' value using double-CAS.
Ivan Maidanski [Tue, 2 Oct 2012 07:24:16 +0000 (11:24 +0400)]
Add no-barrier double_compare_and_swap to generalization
* src/atomic_ops/generalize.h (AO_double_compare_and_swap):
New function (only if AO_HAVE_compare_double_and_swap_double and
not AO_HAVE_double_compare_and_swap) completing double-CAS family;
reformat comment.
* src/atomic_ops/generalize.h (AO_HAVE_double_compare_and_swap):
Define macro (accompanying AO_double_compare_and_swap).
Ivan Maidanski [Sat, 29 Sep 2012 18:28:45 +0000 (22:28 +0400)]
Remove unsafe emulation-based implementation of double CAS (SunCC/x86)
* src/atomic_ops/sysdeps/sunc/x86.h
(AO_compare_double_and_swap_double_full): Do not test
AO_WEAK_DOUBLE_CAS_EMULATION and remove emulation-based implementation
since it is unsafe (not atomic with respect to other kinds of updates)
leading to test_stack failure.
* configure.ac (AO_WEAK_DOUBLE_CAS_EMULATION): Update and refine
documentation.
* src/atomic_ops/sysdeps/sunc/x86.h
(AO_compare_double_and_swap_double_full): Likewise.
Ivan Maidanski [Tue, 18 Sep 2012 17:55:36 +0000 (21:55 +0400)]
Remove sunc/x86_64.h to eliminate sunc/x86.h code duplication
* src/Makefile.am (nobase_private_HEADERS): Remove reference to
sunc/x86_64.h.
* src/atomic_ops.h: Include sunc/x86.h both for x86 and x86_64 (if
__sun defined but not GCC).
* src/atomic_ops/sysdeps/sunc/x86.h (AO_USE_PENTIUM4_INSTRS):
Explicitly define for x86_64 chips.
* src/atomic_ops/sysdeps/sunc/x86.h (AO_fetch_and_add_full,
AO_and_full, AO_or_full, AO_xor_full, AO_compare_and_swap_full,
AO_fetch_compare_and_swap_full): Remove "l" suffix (the size is
properly determined by operands).
* src/atomic_ops/sysdeps/sunc/x86.h
(AO_compare_double_and_swap_double_full): Use cmpxchg8b instruction
only in 32-bit mode (if __i386 defined) if avaialble, otherwise use
either cmpxchg16b (if AO_CMPXCHG16B_AVAILABLE) or emulation (if
AO_WEAK_DOUBLE_CAS_EMULATION).
* src/atomic_ops/sysdeps/sunc/x86.h (AO_T_IS_INT): Define only for
32-bit mode.
* src/atomic_ops/sysdeps/sunc/x86.h (AO_int_fetch_and_add_full,
AO_HAVE_int_fetch_and_add_full): Move definition from sunc/x86_64.h;
define only for 64-bit mode.
* src/atomic_ops/sysdeps/sunc/x86_64.h: Delete this file.
Ivan Maidanski [Tue, 18 Sep 2012 15:03:19 +0000 (19:03 +0400)]
Fix cmpxchg16b-based compare_double_and_swap_double for SunCC/x86_64
* src/atomic_ops/sysdeps/sunc/x86_64.h
(AO_compare_double_and_swap_double_full): Fix inline assembly
arguments commenting out "m"(*addr) one (similar to that in
sunc/x86.h) if AO_CMPXCHG16B_AVAILABLE defined.
Ivan Maidanski [Wed, 19 Sep 2012 16:29:25 +0000 (20:29 +0400)]
Fix AO_DOUBLE_T_INITIALIZER definition (x86_64)
* src/atomic_ops/sysdeps/standard_ao_double_t.h
(AO_DOUBLE_T_INITIALIZER): Fix definition for x86_64 (remove cast of
zero since __m128 type is a vector).
Ivan Maidanski [Tue, 18 Sep 2012 20:28:36 +0000 (00:28 +0400)]
Eliminate 'missing initializer' warning for AO_stack_t value initializer
* src/atomic_ops/sysdeps/generic_pthread.h (AO_DOUBLE_T_INITIALIZER):
New API macro definition.
* src/atomic_ops/sysdeps/standard_ao_double_t.h
(AO_DOUBLE_T_INITIALIZER): Likewise.
* src/atomic_ops_stack.h (AO_STACK_INITIALIZER): Define using
AO_DOUBLE_T_INITIALIZER (only if not AO_USE_ALMOST_LOCK_FREE).
Ivan Maidanski [Wed, 5 Sep 2012 04:55:04 +0000 (08:55 +0400)]
Implement compare_double_and_swap_double for SunCC/x86
(Tested only with Sun C 5.11 SunOS_i386.)
* src/atomic_ops/sysdeps/sunc/x86.h
(AO_compare_double_and_swap_double_full): Implement (define only if
AO_NO_CMPXCHG8B unset) using same algorithm as for gcc/x86 non-PIC.
Ivan Maidanski [Wed, 5 Sep 2012 04:25:24 +0000 (08:25 +0400)]
Fix compare_double_and_swap_double for clang/x86 in PIC mode
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full): Re-implement for PIC mode
saving EBX to a local variable (instead of pushing it to stack) and
saving memory operand address to a register (edi which is manually
preserved), so that the whole code could also work even if EBX points
to memory operand (e.g., in Clang); test __PIC__ using ifdef (instead
of "if"); update comments; reformat code.
Ivan Maidanski [Wed, 4 Jul 2012 04:32:03 +0000 (08:32 +0400)]
Fix AO_compare_double_and_swap_double_full for gcc-4.2.1/x86 in PIC mode
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full): Use EDI register for
"new_val1" argument in PIC mode only for GCC 4.3+ to workaround
a problem with older compiler versions (e.g., GCC 4.2.1 [FreeBSD])
that do not recognize 'D' as a valid register specification; update
comment.
* src/atomic_ops/generalize-small.template
(AO_XSIZE_compare_and_swap_full, AO_XSIZE_compare_and_swap_acquire,
AO_XSIZE_compare_and_swap_release, AO_XSIZE_fetch_and_add_full,
AO_XSIZE_fetch_and_add_acquire, AO_XSIZE_fetch_and_add_release):
Fix type of function arguments (or local variables) by adding
'unsigned' to XCTYPE.
* src/atomic_ops/generalize-small.h: Regenerate.
H.J. Lu [Tue, 1 May 2012 10:31:30 +0000 (14:31 +0400)]
Fix for x32 by removing 'q' suffix in x86-64 instructions
We do not need the 'q' suffix on x86_64 atomic instructions for AO_t
which is defined as "unsigned long"; the later is 32-bit for x32
and 64-bit for x86-64; the register operand in x86-64 atomic
instructions is sufficient to properly determine the register size.
Ivan Maidanski [Wed, 28 Mar 2012 03:59:09 +0000 (07:59 +0400)]
Fix configure to define __PIC__ macro explicitly only if not done by GCC
* configure.ac (PICFLAG): Adjust AC_MSG_CHECKING message; report
"none" result if no -fPIC is needed (for Cygwin/MinGW); determine
whether GCC -fPIC option causes __PIC__ macro definition; pass
-D __PIC__ to PICFLAG (instead of CFLAGS) only if not defined
automatically in case -fPIC specified; update comment.
Ivan Maidanski [Mon, 26 Mar 2012 04:34:27 +0000 (08:34 +0400)]
Fix double_ptr_storage definition for GCC pre-v4 (x86_64)
* src/atomic_ops/sysdeps/standard_ao_double_t.h: Do not use __m128
if GCC pre-v4 (at least, xmmintrin.h is missing in gcc-3.4.3-x86_64
included in Solaris 10 distribution).
Ivan Maidanski [Wed, 7 Mar 2012 15:12:49 +0000 (19:12 +0400)]
Fix AO_compare_double_and_swap_double_full for gcc/x86 (PIC mode)
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full): Use EDI register for
"new_val1" argument instead of a memory operand and use XCHG assembler
instruction instead of push/pop in case of PIC mode (to workaround
a bug in GCC 4.6.1); update the comment.
Ivan Maidanski [Wed, 7 Mar 2012 03:31:55 +0000 (07:31 +0400)]
Fix a typo in comment
* src/atomic_ops/sysdeps/gcc/x86.h
(AO_compare_double_and_swap_double_full): Fix argument name in the
comment.
* src/atomic_ops/sysdeps/sunc/x86.h
(AO_compare_double_and_swap_double_full): Likewise.
Ivan Maidanski [Sun, 4 Mar 2012 18:21:40 +0000 (22:21 +0400)]
Replace pointer relational comparisons with non-pointer ones
* src/atomic_ops_malloc.c (initial_heap_lim): Remove static variable
(which holds a constant).
* src/atomic_ops_malloc.c (get_chunk): Replace "goto" with for/break;
remove "my_lim" local variable; cast AO_compare_and_swap_acquire()
unused result to void; replace less-or-equal comparison of pointers
with comparison of ptrdiff_t value.
* src/atomic_ops_malloc.c (add_chunk_as): Update comment; remove "sz"
argument; replace "first", "limit", "p", "next" pointer local variable
with "ofs", "limit" and "sz" variables of size_t; add assertion on
"sz" value; replace less-or-equal comparison of pointers with
comparison of size_t values.
* src/atomic_ops_malloc.c (AO_malloc): Remove "adj_sz" local variable;
do not pass adj_sz argument to add_chunk_as.
projects / libatomic_ops / log