Skip to content

FORMUS3IC_LAS3 / embb

Go to a project
Commit 79c7b54b by Michael Schmid
Options

fixed atomics

parent 8e184f66
Inline Side-by-side
Showing with 83 additions and 61 deletions
base_c/include/embb/base/c/internal/atomic/and_assign.h
...@@ -131,14 +131,21 @@ EMBB_DEFINE_AND_ASSIGN(4, "") ...@@ -131,14 +131,21 @@ EMBB_DEFINE_AND_ASSIGN(4, "")
#define EMBB_DEFINE_AND_ASSIGN(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX)\ #define EMBB_DEFINE_AND_ASSIGN(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX)\
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_and_assign_, \ EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_and_assign_, \
EMBB_PARAMETER_SIZE_BYTE)(EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \ EMBB_PARAMETER_SIZE_BYTE)(EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) result=0; \ register uint64_t e_reg = sizeof(value) == sizeof(uint32_t) ? (uint64_t)value : 0xFFFFFFFFull; \
__asm__ __volatile__("dsync\n\t" \ register uint32_t add = ((uint32_t)pointer_to_value) & 0xFFFFFFFC; \
"ld" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[result], %[pointer_to_value]\n\t" \ uint32_t pos = ((uint32_t)pointer_to_value & 0x3) * 8; \
"and %[result], %[value]\n\t" \ uint32_t width = sizeof(value) == sizeof(uint32_t) ? 31 : sizeof(value) * 8; \
"st" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[pointer_to_value], %[result]\n\t" \ register uint64_t e_ins = ((uint64_t)width << 32) | pos; \
: [pointer_to_value]"+m" (*pointer_to_value), [result]"+d" (result) \ __asm__ __volatile__ ("dsync\n\t" \
: [value]"d" (value)\ "mov.a %[pointer_to_value], %[add]\n\t" \
: "memory"); \ "loop_:\tld.w %H0, [%2]0\n\t" \
"insert %L0, %H0, %[value], %A1\n\t" \
"and %L0, %H0\n\t" \
"cmpswap.w [%2]0, %A0\n\t" \
"jne %H0, %L0, loop_" \
: "+d"(e_reg), [e_ins]"+d"(e_ins) \
: [pointer_to_value]"a"(pointer_to_value), [value] "r" (value), [add] "d" (add) \
: "memory"); \
} }
#else #else
#error "No atomic fetch and store implementation found" #error "No atomic fetch and store implementation found"
...@@ -146,7 +153,7 @@ EMBB_DEFINE_AND_ASSIGN(4, "") ...@@ -146,7 +153,7 @@ EMBB_DEFINE_AND_ASSIGN(4, "")
EMBB_DEFINE_AND_ASSIGN(1, ".b") EMBB_DEFINE_AND_ASSIGN(1, ".b")
EMBB_DEFINE_AND_ASSIGN(2, ".h") EMBB_DEFINE_AND_ASSIGN(2, ".h")
EMBB_DEFINE_AND_ASSIGN(4, ".w") EMBB_DEFINE_AND_ASSIGN(4, "")
#else #else
#error "Unknown architecture" #error "Unknown architecture"
......
base_c/include/embb/base/c/internal/atomic/compare_and_swap.h
...@@ -132,25 +132,25 @@ EMBB_DEFINE_COMPARE_AND_SWAP(4, "") ...@@ -132,25 +132,25 @@ EMBB_DEFINE_COMPARE_AND_SWAP(4, "")
EMBB_PLATFORM_INLINE int EMBB_CAT2(embb_internal__atomic_compare_and_swap_, \ EMBB_PLATFORM_INLINE int EMBB_CAT2(embb_internal__atomic_compare_and_swap_, \
EMBB_PARAMETER_SIZE_BYTE)(EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* expected, \ EMBB_PARAMETER_SIZE_BYTE)(EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* expected, \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) desired) { \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) desired) { \
register uint64_t e_reg = ((uint64_t)*expected << 32U) | desired; \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) result; \
__asm__ __volatile__ ("cmpswap" EMBB_ATOMIC_TC_SIZE_SUFFIX " [%1]0, %A0\n\t" \ register uint64_t e_reg = desired; \
: "+d"(e_reg) \ __asm__ __volatile__ ("dsync\n\t" \
: "a"(pointer_to_value) \ "ld.w %H0, [%3]0\n\t" \
"cmpswap.w [%2]0, %A0\n\t" \
"eq %[result], %H0, %L0" \
: "+d"(e_reg), [result]"=&d" (result) \
: "a"(pointer_to_value), "a"(expected) \
: "memory"); \ : "memory"); \
__asm__ __volatile__ ("dsync" : : : "memory"); \ return result; \
if(*pointer_to_value == desired) { \
return 1; \
} else { \
return 0; \
} \
} }
#else #else
#error "No atomic fetch and store implementation found" #error "No atomic fetch and store implementation found"
#endif #endif
//TODO: CAS-byte and CAS-short not needed yet, implement if needed
EMBB_DEFINE_COMPARE_AND_SWAP(1, ".b") EMBB_DEFINE_COMPARE_AND_SWAP(1, ".b")
EMBB_DEFINE_COMPARE_AND_SWAP(2, ".h") EMBB_DEFINE_COMPARE_AND_SWAP(2, ".h")
EMBB_DEFINE_COMPARE_AND_SWAP(4, ".w") EMBB_DEFINE_COMPARE_AND_SWAP(4, "")
#else #else
#error "Unknown architecture" #error "Unknown architecture"
......
base_c/include/embb/base/c/internal/atomic/fetch_and_add.h
...@@ -123,16 +123,24 @@ EMBB_DEFINE_FETCH_AND_ADD(4, "") ...@@ -123,16 +123,24 @@ EMBB_DEFINE_FETCH_AND_ADD(4, "")
#define EMBB_DEFINE_FETCH_AND_ADD(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \ #define EMBB_DEFINE_FETCH_AND_ADD(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \
EMBB_PLATFORM_INLINE EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) EMBB_CAT2(embb_internal__atomic_fetch_and_add_, EMBB_PARAMETER_SIZE_BYTE) \ EMBB_PLATFORM_INLINE EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) EMBB_CAT2(embb_internal__atomic_fetch_and_add_, EMBB_PARAMETER_SIZE_BYTE) \
(EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) new_value) { \ (EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) new_value) { \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) result; \
result=0,tmp1=0; \ register uint64_t e_reg = sizeof(value) == sizeof(uint32_t) ? (uint64_t)value : 0ull; \
__asm__ __volatile__ ("dsync\n\t" \ register uint32_t add = (uint32_t)pointer_to_value & 0xFFFFFFFC; \
"ld" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[result], %[pointer_to_value]\n\t" \ uint32_t pos = ((uint32_t)pointer_to_value & 0x3) * 8; \
"add %[tmp1],%[new_value], %[result]\n\t" \ uint32_t width = sizeof(value) == sizeof(uint32_t) ? 31 : sizeof(value) * 8; \
"st" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[pointer_to_value], %[tmp1]\n\t" \ register uint64_t e_mask = ((uint64_t)width << 32) | pos; \
: [result] "+d" (result), [tmp1]"+d" (tmp1), [pointer_to_value]"+m" (*pointer_to_value) \ __asm__ __volatile__ ("dsync\n\t" \
: [new_value]"d" (new_value) \ "mov.a %[pointer_to_value], %[add]\n\t" \
: "memory", "cc" ); \ "loop_:\tld.w %H0, [%3]0\n\t" \
return result; \ "insert %L0, %L0, %[value], %A1\n\t" \
"add" EMBB_ATOMIC_TC_SIZE_SUFFIX " %L0, %L0, %H0\n\t" \
"cmpswap.w [%3]0, %A0\n\t" \
"jne %H0, %L0, loop_\n\t" \
"extr.u %[result], %H0, %A1" \
: "+d"(e_reg), [e_mask]"+d"(e_mask), [result] "=&d" (result) \
: [pointer_to_value]"a"(pointer_to_value), [value] "r" (value), [add] "d" (add) \
: "memory"); \
return result; \
} }
#else #else
#error "No atomic fetch and store implementation found" #error "No atomic fetch and store implementation found"
...@@ -140,7 +148,7 @@ EMBB_DEFINE_FETCH_AND_ADD(4, "") ...@@ -140,7 +148,7 @@ EMBB_DEFINE_FETCH_AND_ADD(4, "")
EMBB_DEFINE_FETCH_AND_ADD(1, ".b") EMBB_DEFINE_FETCH_AND_ADD(1, ".b")
EMBB_DEFINE_FETCH_AND_ADD(2, ".h") EMBB_DEFINE_FETCH_AND_ADD(2, ".h")
EMBB_DEFINE_FETCH_AND_ADD(4, ".w") EMBB_DEFINE_FETCH_AND_ADD(4, "")
#else #else
#error "Unknown architecture" #error "Unknown architecture"
......
base_c/include/embb/base/c/internal/atomic/or_assign.h
...@@ -116,15 +116,21 @@ EMBB_DEFINE_OR_ASSIGN(4, "") ...@@ -116,15 +116,21 @@ EMBB_DEFINE_OR_ASSIGN(4, "")
#define EMBB_DEFINE_OR_ASSIGN(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \ #define EMBB_DEFINE_OR_ASSIGN(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_or_assign_, EMBB_PARAMETER_SIZE_BYTE)(\ EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_or_assign_, EMBB_PARAMETER_SIZE_BYTE)(\
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) result=0; \ register uint64_t e_reg = sizeof(value) == sizeof(uint32_t) ? (uint64_t)value : 0ull; \
__asm__ __volatile__( \ register uint32_t add = (uint32_t)pointer_to_value & 0xFFFFFFFC; \
"dsync\n\t" \ uint32_t pos = ((uint32_t)pointer_to_value & 0x3) * 8; \
"ld" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[result], %[pointer_to_value]\n\t"\ uint32_t width = sizeof(value) == sizeof(uint32_t) ? 31 : sizeof(value) * 8; \
"or %[result], %[value]\n\t" \ register uint64_t e_ins = ((uint64_t)width << 32) | pos; \
"st" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[pointer_to_value], %[result]\n\t" \ __asm__ __volatile__ ("dsync\n\t" \
: [result]"+d" (result), [pointer_to_value]"+m" (*pointer_to_value) \ "mov.a %[pointer_to_value], %[add]\n\t" \
: [value]"d" (value) \ "loop_:\tld.w %H0, [%2]0\n\t" \
: "memory"); \ "insert %L0, %L0, %[value], %A1\n\t" \
"or %L0, %H0\n\t" \
"cmpswap.w [%2]0, %A0\n\t" \
"jne %H0, %L0, loop_" \
: "+d"(e_reg), [e_ins]"+d"(e_ins) \
: [pointer_to_value]"a"(pointer_to_value), [value] "r" (value), [add] "d" (add) \
: "memory"); \
} }
#else #else
...@@ -133,7 +139,7 @@ EMBB_DEFINE_OR_ASSIGN(4, "") ...@@ -133,7 +139,7 @@ EMBB_DEFINE_OR_ASSIGN(4, "")
EMBB_DEFINE_OR_ASSIGN(1, ".b") EMBB_DEFINE_OR_ASSIGN(1, ".b")
EMBB_DEFINE_OR_ASSIGN(2, ".h") EMBB_DEFINE_OR_ASSIGN(2, ".h")
EMBB_DEFINE_OR_ASSIGN(4, ".w") EMBB_DEFINE_OR_ASSIGN(4, "")
#else #else
#error "Unknown architecture" #error "Unknown architecture"
......
base_c/include/embb/base/c/internal/atomic/swap.h
...@@ -118,17 +118,12 @@ EMBB_DEFINE_SWAP(4, "") ...@@ -118,17 +118,12 @@ EMBB_DEFINE_SWAP(4, "")
#if defined(EMBB_PLATFORM_COMPILER_GNUC) #if defined(EMBB_PLATFORM_COMPILER_GNUC)
#define EMBB_DEFINE_SWAP(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \ #define EMBB_DEFINE_SWAP(EMBB_PARAMETER_SIZE_BYTE, EMBB_ATOMIC_TC_SIZE_SUFFIX) \
EMBB_PLATFORM_INLINE EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) EMBB_CAT2(embb_internal__atomic_swap_, EMBB_PARAMETER_SIZE_BYTE)(\ EMBB_PLATFORM_INLINE EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) EMBB_CAT2(embb_internal__atomic_swap_, EMBB_PARAMETER_SIZE_BYTE)(\
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) new_value)\ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) new_value) { \
{ \ __asm__ __volatile__("swap" EMBB_ATOMIC_TC_SIZE_SUFFIX " [%0]0, %[new_value]" \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) \ : "+a" (pointer_to_value), [new_value]"+d" (new_value) \
result=0; \ : \
__asm__ __volatile__("dsync\n\t" \
"ld" EMBB_ATOMIC_TC_SIZE_SUFFIX "%[result], %[pointer_to_value]" \
"st" EMBB_ATOMIC_TC_SIZE_SUFFIX "%[pointer_to_value], %[new_value]" \
: [result]"+d"(result), [pointer_to_value]"+m" (*pointer_to_value) \
: [new_value]"d" (new_value) \
: "memory"); \ : "memory"); \
return result; \ return new_value; \
} }
#else #else
......
base_c/include/embb/base/c/internal/atomic/xor_assign.h
...@@ -119,15 +119,21 @@ EMBB_DEFINE_XOR_ASSIGN(4, "") ...@@ -119,15 +119,21 @@ EMBB_DEFINE_XOR_ASSIGN(4, "")
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_xor_assign_, EMBB_PARAMETER_SIZE_BYTE)(\ EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_internal__atomic_xor_assign_, EMBB_PARAMETER_SIZE_BYTE)(\
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) volatile* pointer_to_value, \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \ EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) value) { \
EMBB_CAT2(EMBB_BASE_BASIC_TYPE_SIZE_, EMBB_PARAMETER_SIZE_BYTE) result=0; \ register uint64_t e_reg = sizeof(value) == sizeof(uint32_t) ? (uint64_t)value : 0ull; \
__asm__ __volatile__( \ register uint32_t add = (uint32_t)pointer_to_value & 0xFFFFFFFC; \
"dsync\n\t" \ uint32_t pos = ((uint32_t)pointer_to_value & 0x3) * 8; \
"ld" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[result], %[pointer_to_value]\n\t" \ uint32_t width = sizeof(value) == sizeof(uint32_t) ? 31 : sizeof(value) * 8; \
"xor %[result], %[value]\n\t" \ register uint64_t e_ins = ((uint64_t)width << 32) | pos; \
"st" EMBB_ATOMIC_TC_SIZE_SUFFIX " %[pointer_to_value], %[result]\n\t" \ __asm__ __volatile__ ("dsync\n\t" \
: [value]"+d" (value), [result]"+d" (result) \ "mov.a %[pointer_to_value], %[add]\n\t" \
: [pointer_to_value]"m" (*pointer_to_value) \ "loop_:\tld.w %H0, [%2]0\n\t" \
: "memory"); \ "insert %L0, %L0, %[value], %A1\n\t" \
"xor %L0, %H0\n\t" \
"cmpswap.w [%2]0, %A0\n\t" \
"jne %H0, %L0, loop_" \
: "+d"(e_reg), [e_ins]"+d"(e_ins) \
: [pointer_to_value]"a"(pointer_to_value), [value] "r" (value), [add] "d" (add) \
: "memory"); \
} }
#else #else
...@@ -136,7 +142,7 @@ EMBB_DEFINE_XOR_ASSIGN(4, "") ...@@ -136,7 +142,7 @@ EMBB_DEFINE_XOR_ASSIGN(4, "")
EMBB_DEFINE_XOR_ASSIGN(1, ".b") EMBB_DEFINE_XOR_ASSIGN(1, ".b")
EMBB_DEFINE_XOR_ASSIGN(2, ".h") EMBB_DEFINE_XOR_ASSIGN(2, ".h")
EMBB_DEFINE_XOR_ASSIGN(4, ".w") EMBB_DEFINE_XOR_ASSIGN(4, "")
#else #else
#error "Unknown architecture" #error "Unknown architecture"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment