[Calyx-utils] Overhaul GlobalPositionTable + a bunch of CI nonsense
#2377
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ather than using the one packaged with the docker container
ekiwi
requested changes
Dec 17, 2024
.github/workflows/rust.yml
Outdated
| rust-toolchain.toml | ||
| sparse-checkout-cone-mode: false | ||
|
|
||
| - name: Install Rust stable |
There was a problem hiding this comment.
is it stable rust or the rust version from rust-toolchain.toml?
.github/workflows/rust.yml
Outdated
| @@ -226,6 +240,16 @@ jobs: | |||
| git checkout -f $GITHUB_SHA | |||
| git clean -fd | |||
|
|
|||
| - name: Checkout toolchain | |||
There was a problem hiding this comment.
This isn't actually checking out the toolchain, tough, correct? Only the toolchain configuration.
| @@ -57,16 +57,17 @@ impl CalyxParser { | |||
| })?; | |||
| // Add a new file to the position table | |||
| let string_content = std::str::from_utf8(content)?.to_string(); | |||
| let file = GlobalPositionTable::as_mut() | |||
| .add_file(path.to_string_lossy().to_string(), string_content); | |||
| let file = GlobalPositionTable::add_file( | |||
ekiwi
approved these changes
Dec 17, 2024
|
I think it's fine to merge probably! |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A quick touch up of the
GlobalPositionTableto avoid UB without getting too fancy. Main changes are use ofboxcar::Vecinstead of the standard library Vec, so that we can now have lock-free concurrent appends and accesses. This fits our use-case since we never de-allocate files & positions and frees us from all the issues associated with using locks. Since we're not using locks, we also don't need any unsafe to extend lifetimes, and sinceboxcar::Vecdoesn't reallocate stored elements, we don't need to box the stored stuff.I also use
LazyLockinstead oflazy_static!which is easier to deal with.The end result is a global position table that can be accessed through associated functions on the
GlobalPositionTabletype, rather than methods on an instance. I also changed theStrings stored byFiletoBox<str>, because we don't ever mutate them.In the process of this, I ran face first in CI issues. Turns out that because some of the tests run in the docker container, they aren't actually building using the version of rust in
rust-toolchain.tomland instead were using the version of rust from the container (1.76). This broke things sinceLazyLockwas only stabilized in 1.80. I had a real fight with the CI because it turns out that using the standard actions in the docker container is not a straightforward as one would like. I'll skip a recount of the entire ordeal---peruse the commits to witness my pain---but I resolved things and made these tests consistent with the rest of CI by specifically pulling the toolchain file before running the rust install action. The end result is that even the docker container tests do respect the indicated rust version, and we should be able to bump the version of rust used by EVERYTHING (if this isn't true I may scream) by updating the file.