This is an archive of the discontinued LLVM Phabricator instance.

Differential D130820

[cmake] Add LoongArch to config.guess
ClosedPublic

Authored by xen0n on Jul 30 2022, 6:37 AM.

Details

Reviewers
xry111
MaskRay
rengolin
myhsu
SixWeining
wangleiat
Commits
rGe48a0df3fcfd: [cmake] Add LoongArch to config.guess
Summary

Necessary for native builds on LoongArch. Only Linux is added for now,
matching upstream config.git changes.

Unfortunately, the upstream config.guess is GPLv3+ since 2012, and
LLVM is without autoconf support for a long time, so the script's
licensing exception no longer works and a bump could not be trivially
done.

This is the same as the upstream commit adding LoongArch,
but rewritten to match the 2011 style that our script is holding on
to.

Diff Detail

Unit TestsFailed

TimeTest
60,080 msx64 debian > AddressSanitizer-x86_64-linux.TestCases::scariness_score_test.cpp
70 msx64 debian > LLVM.Examples/IRTransforms/SimplifyCFG::tut-simplify-cfg2-dead-block-order.ll

Event Timeline

xen0n created this revision.Jul 30 2022, 6:37 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 30 2022, 6:37 AM
Herald added subscribers: StephenFan, mgorny. · View Herald Transcript
xen0n requested review of this revision.Jul 30 2022, 6:37 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 30 2022, 6:37 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
xen0n added a child revision: D130821: [cmake] Support native LoongArch builds.Jul 30 2022, 6:39 AM
xen0n added reviewers: SixWeining, wangleiat.Jul 30 2022, 6:42 AM
xen0n added a subscriber: gonglingqin.
Harbormaster completed remote builds in B178404: Diff 448798.Jul 30 2022, 8:30 AM
MaskRay accepted this revision.Jul 30 2022, 10:38 AM

LGTM.

This revision is now accepted and ready to land.Jul 30 2022, 10:38 AM
SixWeining added inline comments.Jul 31 2022, 3:49 AM
llvm/cmake/config.guess
925

I'm not sure it exists or not. Let me double check with others internally. Thanks.

926

Unlike the upstream config.git, this file misses the initialization of LIBC. Perhaps we can use gnu for now?

xen0n updated this revision to Diff 448849.Jul 31 2022, 3:55 AM

Fix libc detection; the 2011 script is not initializing $LIBC beforehand.

xen0n added inline comments.Jul 31 2022, 3:58 AM
llvm/cmake/config.guess
925

IIRC it was planned to be something like the MIPS n32, but due to the later shift to the RISC-V-like model it should no longer exist. The "LPX32" ABI should never see the light of day.

But again here I'm just updating the script to match the upstream behavior. If loongarchx32 should be deleted here, then the upstream config.git should get updated too.

926

I just found out this a few minutes ago (in my test repo I just copied over the upstream script so I didn't notice). Fixed.

Harbormaster completed remote builds in B178443: Diff 448849.Jul 31 2022, 5:48 AM
SixWeining accepted this revision.Jul 31 2022, 8:21 PM

LGTM. Thanks.

llvm/cmake/config.guess
925

I agree with you. Let's remove it after upstream config.git has done so.

xen0n added a comment.Jul 31 2022, 11:57 PM

Note to $random_passer_by_with_commit_access: I don't currently have commit access, so please help me land the patch (and also D130821 which is also accepted) at your leisure. Thanks.

This revision was landed with ongoing or failed builds.Aug 1 2022, 12:07 AM
Closed by commit rGe48a0df3fcfd: [cmake] Add LoongArch to config.guess (authored by WANG Xuerui <xen0n@gentoo.org>, committed by SixWeining). · Explain Why
This revision was automatically updated to reflect the committed changes.
SixWeining added a commit: rGe48a0df3fcfd: [cmake] Add LoongArch to config.guess.

Revision Contents

PathSize
llvm/
cmake/
3 lines

Diff 448798

llvm/cmake/config.guess

Show First 20 Lines • Show All 916 Lines • ▼ Show 20 LinesEOF
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
echo "${UNAME_MACHINE}-pc-linux-${LIBC}" echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;; exit ;;
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
SixWeiningUnsubmitted
Not Done
ReplyInline Actions

I'm not sure it exists or not. Let me double check with others internally. Thanks.

SixWeining: I'm not sure it exists or not. Let me double check with others internally. Thanks.
xen0nAuthorUnsubmitted
Done
ReplyInline Actions

IIRC it was planned to be something like the MIPS n32, but due to the later shift to the RISC-V-like model it should no longer exist. The "LPX32" ABI should never see the light of day.

But again here I'm just updating the script to match the upstream behavior. If loongarchx32 should be deleted here, then the upstream config.git should get updated too.

xen0n: IIRC it was planned to be something like the MIPS n32, but due to the later shift to the RISC-V…
SixWeiningUnsubmitted
Not Done
ReplyInline Actions

I agree with you. Let's remove it after upstream config.git has done so.

SixWeining: I agree with you. Let's remove it after upstream config.git has done so.
echo "${UNAME_MACHINE}-unknown-linux-${LIBC}"
SixWeiningUnsubmitted
Not Done
ReplyInline Actions

Unlike the upstream config.git, this file misses the initialization of LIBC. Perhaps we can use gnu for now?

SixWeining: Unlike the upstream `config.git`, this file misses the initialization of `LIBC`. Perhaps we…
xen0nAuthorUnsubmitted
Done
ReplyInline Actions

I just found out this a few minutes ago (in my test repo I just copied over the upstream script so I didn't notice). Fixed.

xen0n: I just found out this a few minutes ago (in my test repo I just copied over the upstream script…
exit ;;
m32r*:Linux:*:*) m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
m68*:Linux:*:*) m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
mips:Linux:*:* | mips64:Linux:*:*) mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build eval $set_cc_for_build
▲ Show 20 Lines • Show All 640 Lines • Show Last 20 Lines