diff options
| author | WeiY <wei.a.yang@gmail.com> | 2013-08-05 02:56:00 +0800 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-08-19 14:35:38 +0200 |
| commit | 6931037e1d9327b41a6c84c946a0f45d68c1cf7d (patch) | |
| tree | c28109d7fd80b596d93704c2cae6af0dff228f7b /testsuites | |
| parent | Expose rtems_verror() (diff) | |
| download | rtems-6931037e1d9327b41a6c84c946a0f45d68c1cf7d.tar.bz2 | |
correct memory model in smpatomic test case
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/smptests/smpatomic02/tasks.c | 2 | ||||
| -rw-r--r-- | testsuites/smptests/smpatomic03/tasks.c | 4 | ||||
| -rw-r--r-- | testsuites/smptests/smpatomic04/tasks.c | 4 | ||||
| -rw-r--r-- | testsuites/smptests/smpatomic05/tasks.c | 4 | ||||
| -rw-r--r-- | testsuites/smptests/smpatomic06/tasks.c | 4 | ||||
| -rw-r--r-- | testsuites/smptests/smpatomic07/tasks.c | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/testsuites/smptests/smpatomic02/tasks.c b/testsuites/smptests/smpatomic02/tasks.c index 1017befbea..22de08cd62 100644 --- a/testsuites/smptests/smpatomic02/tasks.c +++ b/testsuites/smptests/smpatomic02/tasks.c @@ -29,7 +29,7 @@ for (i = 0; i < TEST_REPEAT; i++){ \ b = (R_TYPE)rand(); \ _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); \ } \ locked_printf("\nCPU%d Atomic_Store_" #NAME ": SUCCESS\n", cpuid); \ diff --git a/testsuites/smptests/smpatomic03/tasks.c b/testsuites/smptests/smpatomic03/tasks.c index b74bd9d247..2c45a00e24 100644 --- a/testsuites/smptests/smpatomic03/tasks.c +++ b/testsuites/smptests/smpatomic03/tasks.c @@ -30,9 +30,9 @@ for (i = 0; i < TEST_REPEAT; i++){ \ a = (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); \ - c = _Atomic_Load_##NAME(&t, mem_bar); \ + c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \ rtems_test_assert(c == (R_TYPE)(a + b)); \ } \ locked_printf("\nCPU%d Atomic_Fetch_add_" #NAME ": SUCCESS\n", cpuid); \ diff --git a/testsuites/smptests/smpatomic04/tasks.c b/testsuites/smptests/smpatomic04/tasks.c index 54f0661431..3630eb28cb 100644 --- a/testsuites/smptests/smpatomic04/tasks.c +++ b/testsuites/smptests/smpatomic04/tasks.c @@ -30,9 +30,9 @@ for (i = 0; i < TEST_REPEAT; i++){ \ a = (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); \ - c = _Atomic_Load_##NAME(&t, mem_bar); \ + c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \ rtems_test_assert(c == (R_TYPE)(a - b)); \ } \ locked_printf("\nCPU%d Atomic_Fetch_sub_" #NAME ": SUCCESS\n", cpuid); \ diff --git a/testsuites/smptests/smpatomic05/tasks.c b/testsuites/smptests/smpatomic05/tasks.c index 57a4f8c55e..5e7da77867 100644 --- a/testsuites/smptests/smpatomic05/tasks.c +++ b/testsuites/smptests/smpatomic05/tasks.c @@ -30,9 +30,9 @@ for (i = 0; i < TEST_REPEAT; i++){ \ a = (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); \ - c = _Atomic_Load_##NAME(&t, mem_bar); \ + c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \ rtems_test_assert(c == (R_TYPE)(a & b)); \ } \ locked_printf("\nCPU%d Atomic_Fetch_and_" #NAME ": SUCCESS\n", cpuid); \ diff --git a/testsuites/smptests/smpatomic06/tasks.c b/testsuites/smptests/smpatomic06/tasks.c index a28cffbe3b..772d745922 100644 --- a/testsuites/smptests/smpatomic06/tasks.c +++ b/testsuites/smptests/smpatomic06/tasks.c @@ -30,9 +30,9 @@ for (i = 0; i < TEST_REPEAT; i++){ \ a = (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); \ - c = _Atomic_Load_##NAME(&t, mem_bar); \ + c = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \ rtems_test_assert(c == (R_TYPE)(a | b)); \ } \ locked_printf("\nCPU%d Atomic_Fetch_or_" #NAME ": SUCCESS\n", cpuid); \ diff --git a/testsuites/smptests/smpatomic07/tasks.c b/testsuites/smptests/smpatomic07/tasks.c index 308498a1a4..ab1b51cec9 100644 --- a/testsuites/smptests/smpatomic07/tasks.c +++ b/testsuites/smptests/smpatomic07/tasks.c @@ -29,21 +29,21 @@ int r; \ for (i = 0; i < TEST_REPEAT; i++){ \ a = rand() % (R_TYPE)-1; \ - _Atomic_Store_##NAME(&t, a, mem_bar); \ + _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \ b = a + 1; \ r = _Atomic_Compare_exchange_##NAME(&t, &b, a - 1, mem_bar, memory_order_relaxed);\ if(r != 0){ \ locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \ 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);\ - b = _Atomic_Load_##NAME(&t, mem_bar); \ + b = _Atomic_Load_##NAME(&t, ATOMIC_ORDER_ACQUIRE); \ if((r == 0) ||((r != 0) && ((a - 1) != b))){ \ locked_printf("\ntask%d: Atomic_Compare_exchange_" #NAME ": FAILED\n", (unsigned int)cpuid); \ rtems_test_exit( 0 ); \ } \ - _Atomic_Store_##NAME(&t, a, mem_bar); \ + _Atomic_Store_##NAME(&t, a, ATOMIC_ORDER_RELEASE); \ b = a + 1; \ r = _Atomic_Compare_exchange_##NAME(&t, &b, a, mem_bar, memory_order_relaxed); \ if(r != 0){ \ |