From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 74A683858434; Wed, 9 Mar 2022 18:35:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74A683858434 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7567] GCN: Implement __atomic_compare_exchange_{1, 2} in libgcc [PR102215] X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: bded0d549fdfdc1328b2c0189dc5f8593b4cbe42 X-Git-Newrev: 450526551dcb97b7c0513699d4333efb79b8b490 Message-Id: <20220309183545.74A683858434@sourceware.org> Date: Wed, 9 Mar 2022 18:35:45 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2022 18:35:45 -0000 https://gcc.gnu.org/g:450526551dcb97b7c0513699d4333efb79b8b490 commit r12-7567-g450526551dcb97b7c0513699d4333efb79b8b490 Author: Tobias Burnus Date: Wed Mar 9 19:34:48 2022 +0100 GCN: Implement __atomic_compare_exchange_{1,2} in libgcc [PR102215] libgcc/ChangeLog: PR target/102215 * config/gcn/atomic.c (__sync_val_compare_and_swap_##SIZE): Move a line up to non-arg-dependent value first. (__ATOMIC_COMPARE_EXCHANGE): Define + call to generate __atomic_compare_exchange_{1,2}. Diff: --- libgcc/config/gcn/atomic.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/libgcc/config/gcn/atomic.c b/libgcc/config/gcn/atomic.c index 8784f90dfe2..cf29fa82aba 100644 --- a/libgcc/config/gcn/atomic.c +++ b/libgcc/config/gcn/atomic.c @@ -28,9 +28,9 @@ TYPE \ __sync_val_compare_and_swap_##SIZE (TYPE *ptr, TYPE oldval, TYPE newval) \ { \ + unsigned int valmask = (1 << (SIZE * 8)) - 1; \ unsigned int *wordptr = (unsigned int *)((__UINTPTR_TYPE__ ) ptr & ~3UL); \ int shift = ((__UINTPTR_TYPE__ ) ptr & 3UL) * 8; \ - unsigned int valmask = (1 << (SIZE * 8)) - 1; \ unsigned int wordmask = ~(valmask << shift); \ unsigned int oldword = *wordptr; \ for (;;) \ @@ -57,3 +57,30 @@ __sync_bool_compare_and_swap_##SIZE (TYPE *ptr, TYPE oldval, TYPE newval) \ __SYNC_SUBWORD_COMPARE_AND_SWAP (unsigned char, 1) __SYNC_SUBWORD_COMPARE_AND_SWAP (unsigned short, 2) + +#define __ATOMIC_COMPARE_EXCHANGE(TYPE,SIZE) \ +bool \ +__atomic_compare_exchange_##SIZE (TYPE *ptr, TYPE *expected, \ + TYPE desired, bool weak, \ + int success_memorder, int failure_memorder) \ +{ \ + unsigned int valmask = (1 << (SIZE * 8)) - 1; \ + \ + unsigned int *wordptr = (unsigned int *)((__UINTPTR_TYPE__ ) ptr & ~3UL); \ + int ptrshift = ((__UINTPTR_TYPE__ ) ptr & 3UL) * 8; \ + unsigned int wordmask = ~(valmask << ptrshift); \ + \ + unsigned int ptrword = *wordptr; \ + unsigned int exptword = ptrword & wordmask; \ + unsigned int newword = ptrword & wordmask; \ + exptword |= ((unsigned int) *expected) << ptrshift; \ + newword |= ((unsigned int) desired) << ptrshift; \ + if (__atomic_compare_exchange_4 (wordptr, &exptword, newword, weak, \ + success_memorder, failure_memorder)) \ + return true; \ + *expected = (TYPE) ((exptword >> ptrshift) & valmask); \ + return false; \ +} + +__ATOMIC_COMPARE_EXCHANGE (unsigned char, 1) +__ATOMIC_COMPARE_EXCHANGE (unsigned short, 2)