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

Fix invocation of single benchmarks in std-benchmarks #11321

Merged
merged 6 commits into from
Oct 15, 2024

Conversation

Akirathan
Copy link
Member

@Akirathan Akirathan commented Oct 14, 2024

std-benchmarks/benchOnly Map_Error_Benchmark_Vector_ignore.Map_Id_All_Errors (or any other benchmark) is failing with

java.lang.IllegalAccessError: class org.enso.benchmarks.generated.Map_Error_Benchmark_Vector_ignore (in module org.enso.runtime) cannot access class org.enso.benchmarks.Utils (in module org.enso.bench.processor) because module org.enso.runtime does not read module org.enso.bench.processor

This PR fixes this failure by adding --add-reads org.enso.runtime=org.enso.bench.processor to the cmd line options for std-benchmarks/Compile/javaOptions.

Pull Request Description

Important Notes

  • std-benchmarks/bench, which is invoked on the CI, is not affected. It still works as expected.
  • Updated list of all projects in enso aggregate in c1d43b3

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

  • The documentation has been updated, if necessary.
  • Screenshots/screencasts have been attached, if there are any visual changes. For interactive or animated visual changes, a screencast is preferred.
  • All code follows the
    Scala,
    Java,
    TypeScript,
    and
    Rust
    style guides. In case you are using a language not listed above, follow the Rust style guide.
  • Unit tests have been written where possible.

@Akirathan Akirathan added the CI: No changelog needed Do not require a changelog entry for this PR. label Oct 14, 2024
@Akirathan Akirathan self-assigned this Oct 14, 2024
@mergify mergify bot mentioned this pull request Oct 14, 2024
4 tasks
@Akirathan
Copy link
Member Author

Reverting c1d43b3 since that is done by @hubertp in #11323

hubertp added a commit that referenced this pull request Oct 14, 2024
As cherry-picked from #11321
@Akirathan Akirathan added the CI: Ready to merge This PR is eligible for automatic merge label Oct 14, 2024
hubertp added a commit that referenced this pull request Oct 14, 2024
* Ensure wrapper projects are listed in aggregates

Previously, doing clean to deal with weird modularization failures would
have no effect.

* And updated formatting

* More projects

As cherry-picked from #11321
@Akirathan Akirathan added CI: Keep up to date Automatically update this PR to the latest develop. CI: Clean build required CI runners will be cleaned before and after this PR is built. labels Oct 15, 2024
@Akirathan Akirathan removed the CI: Keep up to date Automatically update this PR to the latest develop. label Oct 15, 2024
@mergify mergify bot merged commit 2285b7d into develop Oct 15, 2024
42 checks passed
@mergify mergify bot deleted the wip/akirathan/fix-stdbenchs-benchonly branch October 15, 2024 12:17
@@ -3967,7 +3967,8 @@ lazy val `std-benchmarks` = (project in file("std-bits/benchmarks"))
Map(
runtimeModName -> Seq(
"ALL-UNNAMED",
(`benchmarks-common` / javaModuleName).value
(`benchmarks-common` / javaModuleName).value,
(`bench-processor` / javaModuleName).value
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be handy in #10714 - I also had problems with access restrictions in the PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Clean build required CI runners will be cleaned before and after this PR is built. CI: No changelog needed Do not require a changelog entry for this PR. CI: Ready to merge This PR is eligible for automatic merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants