RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

correct memory model in smpatomic test case

Browse Source
This commit is contained in:
WeiY
2013-08-05 02:56:00 +08:00
committed by Sebastian Huber
parent 01b0755035
commit 6931037e1d
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testsuites/smptests/smpatomic02/tasks.c
View File

@@ -29,7 +29,7 @@
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
b = (R_TYPE)rand(); \ b = (R_TYPE)rand(); \
_Atomic_Store_##NAME(&t, b, mem_bar); \ _Atomic_Store_##NAME(&t, b, mem_bar); \
a = _Atomic_Load_##NAME(&t, mem_bar); \ a = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
rtems_test_assert(a == b); \ rtems_test_assert(a == b); \
} \ } \
locked_printf("\nCPU%d Atomic_Store_" #NAME ": SUCCESS\n", cpuid); \ locked_printf("\nCPU%d Atomic_Store_" #NAME ": SUCCESS\n", cpuid); \

4
testsuites/smptests/smpatomic03/tasks.c
View File

@@ -30,9 +30,9 @@
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
_Atomic_Fetch_add_##NAME(&t, b, mem_bar); \ _Atomic_Fetch_add_##NAME(&t, b, mem_bar); \
c = _Atomic_Load_##NAME(&t, mem_bar); \ c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
rtems_test_assert(c == (R_TYPE)(a + b)); \ rtems_test_assert(c == (R_TYPE)(a + b)); \
} \ } \
locked_printf("\nCPU%d Atomic_Fetch_add_" #NAME ": SUCCESS\n", cpuid); \ locked_printf("\nCPU%d Atomic_Fetch_add_" #NAME ": SUCCESS\n", cpuid); \

4
testsuites/smptests/smpatomic04/tasks.c
View File

@@ -30,9 +30,9 @@
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
_Atomic_Fetch_sub_##NAME(&t, b, mem_bar); \ _Atomic_Fetch_sub_##NAME(&t, b, mem_bar); \
c = _Atomic_Load_##NAME(&t, mem_bar); \ c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
rtems_test_assert(c == (R_TYPE)(a - b)); \ rtems_test_assert(c == (R_TYPE)(a - b)); \
} \ } \
locked_printf("\nCPU%d Atomic_Fetch_sub_" #NAME ": SUCCESS\n", cpuid); \ locked_printf("\nCPU%d Atomic_Fetch_sub_" #NAME ": SUCCESS\n", cpuid); \

4
testsuites/smptests/smpatomic05/tasks.c
View File

@@ -30,9 +30,9 @@
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
_Atomic_Fetch_and_##NAME(&t, b, mem_bar); \ _Atomic_Fetch_and_##NAME(&t, b, mem_bar); \
c = _Atomic_Load_##NAME(&t, mem_bar); \ c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
rtems_test_assert(c == (R_TYPE)(a & b)); \ rtems_test_assert(c == (R_TYPE)(a & b)); \
} \ } \
locked_printf("\nCPU%d Atomic_Fetch_and_" #NAME ": SUCCESS\n", cpuid); \ locked_printf("\nCPU%d Atomic_Fetch_and_" #NAME ": SUCCESS\n", cpuid); \

4
testsuites/smptests/smpatomic06/tasks.c
View File

@@ -30,9 +30,9 @@
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ a = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \ b = (R_TYPE)(rand() % ((R_TYPE)-1 / 2)); \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
_Atomic_Fetch_or_##NAME(&t, b, mem_bar); \ _Atomic_Fetch_or_##NAME(&t, b, mem_bar); \
c = _Atomic_Load_##NAME(&t, mem_bar); \ c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
rtems_test_assert(c == (R_TYPE)(a | b)); \ rtems_test_assert(c == (R_TYPE)(a | b)); \
} \ } \
locked_printf("\nCPU%d Atomic_Fetch_or_" #NAME ": SUCCESS\n", cpuid); \ locked_printf("\nCPU%d Atomic_Fetch_or_" #NAME ": SUCCESS\n", cpuid); \

8
testsuites/smptests/smpatomic07/tasks.c
View File

@@ -29,21 +29,21 @@
int r; \ int r; \
for (i = 0; i < TEST_REPEAT; i++){ \ for (i = 0; i < TEST_REPEAT; i++){ \
a = rand() % (R_TYPE)-1; \ a = rand() % (R_TYPE)-1; \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
b = a + 1; \ b = a + 1; \
r = _Atomic_Compare_exchange_##NAME(&t, &b, a - 1, mem_bar, memory_order_relaxed);\ r = _Atomic_Compare_exchange_##NAME(&t, &b, a - 1, mem_bar, memory_order_relaxed);\
if(r != 0){ \ if(r != 0){ \
locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \ locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \
rtems_test_exit( 0 ); \ rtems_test_exit( 0 ); \
} \ } \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
r = _Atomic_Compare_exchange_##NAME(&t, &a, a - 1, mem_bar, memory_order_relaxed);\ r = _Atomic_Compare_exchange_##NAME(&t, &a, a - 1, mem_bar, memory_order_relaxed);\
b = _Atomic_Load_##NAME(&t, mem_bar); \ b = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \
if((r == 0) ||((r != 0) && ((a - 1) != b))){ \ if((r == 0) ||((r != 0) && ((a - 1) != b))){ \
locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \ locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \
rtems_test_exit( 0 ); \ rtems_test_exit( 0 ); \
} \ } \
_Atomic_Store_##NAME(&t, a, mem_bar); \ _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \
b = a + 1; \ b = a + 1; \
r = _Atomic_Compare_exchange_##NAME(&t, &b, a, mem_bar, memory_order_relaxed); \ r = _Atomic_Compare_exchange_##NAME(&t, &b, a, mem_bar, memory_order_relaxed); \
if(r != 0){ \ if(r != 0){ \