Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build Morello benchmark ABI kernels. #398

Merged
merged 1 commit into from
May 27, 2024
Merged

Build Morello benchmark ABI kernels. #398

merged 1 commit into from
May 27, 2024

Conversation

qwattash
Copy link
Contributor

This is inhibited by the no-build-alternate-abi-kernels.

@qwattash qwattash force-pushed the benchmark-abi-kernel branch 2 times, most recently from 401bb19 to 00dfcfb Compare May 15, 2024 12:35
@jrtc27
Copy link
Member

jrtc27 commented May 15, 2024

Won't this break building older CheriBSD, including in CI for releng/23.11?

@qwattash
Copy link
Contributor Author

Won't this break building older CheriBSD, including in CI for releng/23.11?

Right.. I wanted to avoid adding another option specifically for benchmark ABI kernels, but maybe I need a different flag to disable building benchmark ABI kernels. I'm leaning towards building it by default but I could make it off-by-default.

@jrtc27
Copy link
Member

jrtc27 commented May 15, 2024

Won't this break building older CheriBSD, including in CI for releng/23.11?

Right.. I wanted to avoid adding another option specifically for benchmark ABI kernels, but maybe I need a different flag to disable building benchmark ABI kernels. I'm leaning towards building it by default but I could make it off-by-default.

It needs to be off by default unfortunately, and enabled in CheriBSD CI, but we can flip the default once 24.0x is out.

@qwattash
Copy link
Contributor Author

Won't this break building older CheriBSD, including in CI for releng/23.11?

Right.. I wanted to avoid adding another option specifically for benchmark ABI kernels, but maybe I need a different flag to disable building benchmark ABI kernels. I'm leaning towards building it by default but I could make it off-by-default.

It needs to be off by default unfortunately, and enabled in CheriBSD CI, but we can flip the default once 24.0x is out.

This version should fix it. It is now enabled with --cheribsd/build-benchmark-abi-kernels. There is one test failing due to MFS root options, although I'm puzzled because it seems that it uses the riscv64 target and the option should not be available there (as expected). This seems to be a bug in the way options are inherited and registered. I'm quite confused by the condition here and the use of fallback_replaceable. My understanding is that if the current target is not in only_add_for_targets list we should just bail and not add the option, e.g. just return None. However this seems a very intentional workaround to a corner case.
@arichardson Do you have any clue?

)
if target is not None and target not in only_add_for_targets and not typing.TYPE_CHECKING:
kwargs["option_cls"] = DefaultValueOnlyConfigOption
kwargs["fallback_replaceable"] = True

This is enabled by the build-benchmark-abi-kernels.
@qwattash qwattash merged commit 7799827 into main May 27, 2024
5 checks passed
@qwattash qwattash deleted the benchmark-abi-kernel branch May 27, 2024 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants