This is an archive of the discontinued LLVM Phabricator instance.

Generate ENABLE_RUNTIMES in ClangBuilder
ClosedPublic

Authored by DavidSpickett on Feb 27 2023, 2:15 AM.

Details

Summary

In ca793509f5a9b26395400dcb92b344b1e055e949 I passed down
enable_runtimes to ClangBuilder but did not realise that
it was not LLVMBuildFactory that generates the CMake arguments.

LLVMBuildFactory simply holds properties of the build. In this
case what projects and runtimes we rely on.

ClangBuilder is the one making the CMake arguments, so I've updated
that to emit the right options this time instead of putting everything
in PROJECTS.

I've adjusted two of the PPC bots that were manually putting compiler-rt
into RUNTIMES.

Event Timeline

DavidSpickett created this revision.Feb 27 2023, 2:15 AM
Herald added a project: Restricted Project. · View Herald Transcript
DavidSpickett requested review of this revision.Feb 27 2023, 2:15 AM
DavidSpickett added a subscriber: kamaub.

@kamaub for the PPC changes. Originally done in https://reviews.llvm.org/D133940.

I probably need to add check-runtimes to Linaro's bot also, but I'll deal with that later.

gkistanova requested changes to this revision.Feb 28 2023, 10:29 AM

The patch looks good in general.

One thing does not look right, though.

buildbot/osuosl/master/config/builders.py
691

LLVMBuildFactory expects a list of runtimes, or one of the special values: None (for default behavior whatever it is), "auto", or "all". True is not one of them.

Did you mean "auto" here?

This revision now requires changes to proceed.Feb 28 2023, 10:29 AM

Correct =True to ="auto" for enable_runtimes.

DavidSpickett marked an inline comment as done.Mar 1 2023, 1:10 AM
DavidSpickett added inline comments.
buildbot/osuosl/master/config/builders.py
691

I did, fixed.

This revision is now accepted and ready to land.Mar 1 2023, 10:34 AM
DavidSpickett marked an inline comment as done.Mar 3 2023, 7:55 AM

@kamaub Any comments?

If there's no response by tomorrow I'm going to land this and test it on staging. If it works there on the AArch64 bot I doubt there will be an issue with ppc, the configurations are very similar architecture aside.

This revision was automatically updated to reflect the committed changes.