This is an archive of the discontinued LLVM Phabricator instance.

Differential D140695

[M68k] Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros
ClosedPublic

Authored by brad on Dec 27 2022, 8:09 AM.

Details

Reviewers
0x59616e
myhsu
efriedma
glaubitz
Commits
rG2784b243e38f: [M68k] Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros
Summary

Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros

Fixes #58974

Diff Detail

Unit TestsFailed

TimeTest
1,920 msx64 debian > DataFlowSanitizer-x86_64.DataFlowSanitizer-x86_64::stack_trace.c

Event Timeline

brad created this revision.Dec 27 2022, 8:09 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 27 2022, 8:09 AM
brad requested review of this revision.Dec 27 2022, 8:09 AM
myhsu accepted this revision.Dec 27 2022, 9:01 AM

LGTM Thanks!

This revision is now accepted and ready to land.Dec 27 2022, 9:01 AM
Harbormaster completed remote builds in B204987: Diff 485378.Dec 27 2022, 9:58 AM
glaubitz accepted this revision.Dec 27 2022, 12:04 PM

Tested and works as expected. Thanks a lot for catching this!

0x59616e added a comment.EditedDec 27 2022, 9:45 PM

FYI the pre-merge checks seem to have some issues. Here is the output:

Command Output (stderr):
--
/var/lib/buildkite-agent/builds/llvm-project/clang/test/Preprocessor/predefined-arch-macros.c:4322:28: error: CHECK_M68K_GCC_ATOMICS: expected string not found in input
// CHECK_M68K_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
                           ^
<stdin>:1:1: note: scanning from here
#define _ILP32 1
^
<stdin>:62:1: note: possible intended match here
#define __GCC_ATOMIC_CHAR_LOCK_FREE 1
^
 
Input file: <stdin>
Check file: /var/lib/buildkite-agent/builds/llvm-project/clang/test/Preprocessor/predefined-arch-macros.c
 
-dump-input=help explains the following input dump.
 
Input was:
<<<<<<
              1: #define _ILP32 1
check:4322'0     X~~~~~~~~~~~~~~~~ error: no match found
              2: #define __ATOMIC_ACQUIRE 2
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              3: #define __ATOMIC_ACQ_REL 4
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              4: #define __ATOMIC_CONSUME 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              5: #define __ATOMIC_RELAXED 0
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              6: #define __ATOMIC_RELEASE 3
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              .
              .
              .
             57: #define __FLT_MIN__ 1.17549435e-38F
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             58: #define __FLT_RADIX__ 2
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~
             59: #define __GCC_ATOMIC_BOOL_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             60: #define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             61: #define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             62: #define __GCC_ATOMIC_CHAR_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:4322'1     ?                                      possible intended match
             63: #define __GCC_ATOMIC_INT_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             64: #define __GCC_ATOMIC_LLONG_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             65: #define __GCC_ATOMIC_LONG_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             66: #define __GCC_ATOMIC_POINTER_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             67: #define __GCC_ATOMIC_SHORT_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
              .
              .
              .
>>>>>>
 
--
0x59616e added a comment.EditedDec 27 2022, 9:52 PM

Also, could you add "Fixes #58974" in the commit message so that the item will be closed automatically upon commiting ? Thanks

brad edited the summary of this revision. (Show Details)Dec 28 2022, 2:46 PM
myhsu requested changes to this revision.EditedDec 28 2022, 3:29 PM
In D140695#4018127, @0x59616e wrote:

FYI the pre-merge checks seem to have some issues. Here is the output:

Command Output (stderr):
--
/var/lib/buildkite-agent/builds/llvm-project/clang/test/Preprocessor/predefined-arch-macros.c:4322:28: error: CHECK_M68K_GCC_ATOMICS: expected string not found in input
// CHECK_M68K_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
                           ^
<stdin>:1:1: note: scanning from here
#define _ILP32 1
^
<stdin>:62:1: note: possible intended match here
#define __GCC_ATOMIC_CHAR_LOCK_FREE 1
^
 
Input file: <stdin>
Check file: /var/lib/buildkite-agent/builds/llvm-project/clang/test/Preprocessor/predefined-arch-macros.c
 
-dump-input=help explains the following input dump.
 
Input was:
<<<<<<
              1: #define _ILP32 1
check:4322'0     X~~~~~~~~~~~~~~~~ error: no match found
              2: #define __ATOMIC_ACQUIRE 2
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              3: #define __ATOMIC_ACQ_REL 4
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              4: #define __ATOMIC_CONSUME 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              5: #define __ATOMIC_RELAXED 0
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              6: #define __ATOMIC_RELEASE 3
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
              .
              .
              .
             57: #define __FLT_MIN__ 1.17549435e-38F
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             58: #define __FLT_RADIX__ 2
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~
             59: #define __GCC_ATOMIC_BOOL_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             60: #define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             61: #define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             62: #define __GCC_ATOMIC_CHAR_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:4322'1     ?                                      possible intended match
             63: #define __GCC_ATOMIC_INT_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             64: #define __GCC_ATOMIC_LLONG_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             65: #define __GCC_ATOMIC_LONG_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             66: #define __GCC_ATOMIC_POINTER_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             67: #define __GCC_ATOMIC_SHORT_LOCK_FREE 1
check:4322'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
              .
              .
              .
>>>>>>
 
--

This is probably caused by the fact that you didn't use CPU later than 68020. @brad Please update your test.

This revision now requires changes to proceed.Dec 28 2022, 3:29 PM
brad added a comment.Dec 28 2022, 10:15 PM

How come the Clang M68k backend defaults to 68000? GCC defaults to 68020 for all targets.

brad updated this revision to Diff 485582.Dec 28 2022, 10:18 PM
Harbormaster completed remote builds in B205135: Diff 485582.Dec 28 2022, 11:36 PM
glaubitz added a comment.Dec 29 2022, 12:34 AM
In D140695#4019189, @brad wrote:

How come the Clang M68k backend defaults to 68000? GCC defaults to 68020 for all targets.

The Clang M68k is a complete rewrite from scratch, independent of GCC, so it's not surprising you may see differences between Clang and GCC.

I'm open to raising the default baseline to 68020 though once the backend has matured enough.

0x59616e accepted this revision.Dec 29 2022, 1:04 AM

The CI seems OK. My first LGTM is given to you.

This revision was not accepted when it landed; it landed in state Needs Review.Dec 29 2022, 2:08 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG2784b243e38f: [M68k] Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros (authored by brad). · Explain Why
This revision was automatically updated to reflect the committed changes.
brad added a commit: rG2784b243e38f: [M68k] Define __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros.

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
6 lines
test/
Preprocessor/
17 lines

Diff 485582

clang/lib/Basic/Targets/M68k.cpp

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Linesvoid M68kTargetInfo::getTargetDefines(const LangOptions &Opts,
case CK_68060: case CK_68060:
Builder.defineMacro("mc68060"); Builder.defineMacro("mc68060");
Builder.defineMacro("__mc68060"); Builder.defineMacro("__mc68060");
Builder.defineMacro("__mc68060__"); Builder.defineMacro("__mc68060__");
break; break;
default: default:
break; break;
} }
if (CPU >= CK_68020) {
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4");
}
} }
ArrayRef<Builtin::Info> M68kTargetInfo::getTargetBuiltins() const { ArrayRef<Builtin::Info> M68kTargetInfo::getTargetBuiltins() const {
// FIXME: Implement. // FIXME: Implement.
return std::nullopt; return std::nullopt;
} }
bool M68kTargetInfo::hasFeature(StringRef Feature) const { bool M68kTargetInfo::hasFeature(StringRef Feature) const {
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

clang/test/Preprocessor/predefined-arch-macros.c

Show First 20 Lines • Show All 991 Lines • ▼ Show 20 Lines
// CHECK_R600: #define __R600__ 1 // CHECK_R600: #define __R600__ 1
// CHECK_R600-NOT: #define __HAS_FMAF__ 1 // CHECK_R600-NOT: #define __HAS_FMAF__ 1
// RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \ // RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \
// RUN: -target r600-unknown-unknown \ // RUN: -target r600-unknown-unknown \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64 // RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64
// CHECK_R600_FP64-DAG: #define __R600__ 1 // CHECK_R600_FP64-DAG: #define __R600__ 1
// CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1 // CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1
// Begin M68k tests ----------------
// RUN: %clang -mcpu=68000 -E -dM %s -o - 2>&1 \
// RUN: -target m68k-unknown-linux \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_M68K_68000_ATOMICS
// RUN: %clang -mcpu=68010 -E -dM %s -o - 2>&1 \
// RUN: -target m68k-unknown-linux \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_M68K_68000_ATOMICS
// RUN: %clang -mcpu=68020 -E -dM %s -o - 2>&1 \
// RUN: -target m68k-unknown-linux \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_M68K_68020_ATOMICS
// CHECK_M68K_68000_ATOMICS-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP
// CHECK_M68K_68020_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
// CHECK_M68K_68020_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
// CHECK_M68K_68020_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
Context not available.