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

[svsim] Make EphemeralSimulator multi-processing friendly (backport #3847) #3848

Merged
merged 2 commits into from Feb 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #3847 done by Mergify.
Cherry-pick of 1ff43c9 has failed:

On branch mergify/bp/5.x/pr-3847
Your branch is up to date with 'origin/5.x'.

You are currently cherry-picking commit 1ff43c939.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/chisel3/simulator/EphemeralSimulator.scala

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


Original PR Body

I and other users have noticed rare hangs, I am not certain this fixes them but I believe it will. I also noticed on shared machines that another user owned the directory the EphemeralTester was trying to put stuff in so I could no longer run sbt test.

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

  • Grab a unique temporary directory for every invocation using Java API
  • Allow multiple EphemeralSimulators to run in the same JVM (no longer necessary to single-thread)
  • Use pure Scala code to recursively delete directory at end rather than platform specific rm -rf

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

(cherry picked from commit 1ff43c9)

# Conflicts:
#	src/main/scala/chisel3/simulator/EphemeralSimulator.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Feb 22, 2024
@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Feb 22, 2024
@chiselbot chiselbot merged commit 3a0618c into 5.x Feb 22, 2024
17 checks passed
@chiselbot chiselbot deleted the mergify/bp/5.x/pr-3847 branch February 22, 2024 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants