From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2152) id EA71E3858C30; Fri, 13 Oct 2023 00:21:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA71E3858C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697156464; bh=gpVm23NJAZu5CDQBWNmiXkI2Ff2SD34MV+D1YXH7wD0=; h=From:To:Subject:Date:From; b=ejiSKQ9MgwHudTbnvwb9zjZY10PIoXOR3w27hsX68IDdcuTtqb3CIysc1GcGhkVbS y3mXw54djb5LwVKzWDTyRXCmEjjaN0pTRn4MOhVKj6+raNhwhGD5qkA1epZH7Jwca1 oZ1SRdXmTwzvCvPqn5IdE0Yn4aB5fL3ssE+psV04= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Hans-Peter Nilsson To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-4603] testsuite: Add dg-require-atomic-cmpxchg-word X-Act-Checkin: gcc X-Git-Author: Hans-Peter Nilsson X-Git-Refname: refs/heads/master X-Git-Oldrev: f9ef2e6dcdc70d7a05641a4abec86ad25638903d X-Git-Newrev: 2a4d9e4f533c77870cc0eb60fbbd8047da4c7386 Message-Id: <20231013002104.EA71E3858C30@sourceware.org> Date: Fri, 13 Oct 2023 00:21:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2a4d9e4f533c77870cc0eb60fbbd8047da4c7386 commit r14-4603-g2a4d9e4f533c77870cc0eb60fbbd8047da4c7386 Author: Hans-Peter Nilsson Date: Wed Oct 4 03:40:25 2023 +0200 testsuite: Add dg-require-atomic-cmpxchg-word Some targets (armv6-m) support inline atomic load and store, i.e. dg-require-thread-fence matches, but not atomic operations like compare and exchange. This directive can be used to replace uses of dg-require-thread-fence where an atomic operation is actually used. * testsuite/lib/dg-options.exp (dg-require-atomic-cmpxchg-word): New proc. * testsuite/lib/libstdc++.exp (check_v3_target_atomic_cmpxchg_word): Ditto. Diff: --- libstdc++-v3/testsuite/lib/dg-options.exp | 9 ++++++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 37 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 84ad0c65330..850442b6b7c 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -133,6 +133,15 @@ proc dg-require-thread-fence { args } { return } +proc dg-require-atomic-cmpxchg-word { args } { + if { ![ check_v3_target_atomic_cmpxchg_word ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + proc dg-require-atomic-builtins { args } { if { ![ check_v3_target_atomic_builtins ] } { upvar dg-do-what dg-do-what diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 608056e5068..4bedb36dc6f 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1221,6 +1221,43 @@ proc check_v3_target_thread_fence { } { }] } +proc check_v3_target_atomic_cmpxchg_word { } { + return [check_v3_target_prop_cached et_atomic_cmpxchg_word { + global cxxflags + global DEFAULT_CXXFLAGS + + # Set up and link a C++11 test program that depends on + # atomic-compare-exchange being available for a pointer-sized + # integer. It should be sufficient as gcc can derive all + # other operations when a target implements this operation. + set src atomic_cmpxchg_word[pid].cc + + set f [open $src "w"] + puts $f " + __UINTPTR_TYPE__ i, j, k; + int main() { + __atomic_compare_exchange (&i, &j, &k, 1, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + return 0; + }" + close $f + + set cxxflags_saved $cxxflags + set cxxflags "$cxxflags $DEFAULT_CXXFLAGS -Werror -std=gnu++11" + + set lines [v3_target_compile $src /dev/null executable ""] + set cxxflags $cxxflags_saved + file delete $src + + if [string match "" $lines] { + # No error message, linking succeeded. + return 1 + } else { + verbose "check_v3_target_atomic_cmpxchg_word: compilation failed" 2 + return 0 + } + }] +} + # Return 1 if atomics_bool and atomic_int are always lock-free, 0 otherwise. proc check_v3_target_atomic_builtins { } { return [check_v3_target_prop_cached et_atomic_builtins {