Get Kani to run on Apple M1 #1323
Merged
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
* Modified check_target() in compiler_interface.rs to accept 'arm64-apple-*', * machine_model_from_session() in goto_ctx.rs to use the parameters for this target * added a small cpp in tools/sizeofs/main.cpp to generate these) * fixed a few tests that had hardcoded assumes on type sizes and alignements.
Added copyright header to tools/sizeofs/main.cpp
tedinski
approved these changes
Jun 30, 2022
Comment on lines
+232
to
+234
| let is_x86_64_darwin_target = session.target.llvm_target.starts_with("x86_64-apple-"); | ||
| // looking for `arm64-apple-*` | ||
| let is_arm64_darwin_target = session.target.llvm_target.starts_with("arm64-apple-"); |
There was a problem hiding this comment.
This isn't your change, but ew. I wonder if there's a convenient way to look at the Rust target name here, not the LLVM one, because Rust-side this should be "darwin" consistently, I think.
Note to self for a refactoring follow-up...
| long_double_width, | ||
| long_int_width, | ||
| long_long_int_width, | ||
| memory_operand_size: int_width / 8, |
Comment on lines
+23
to
+24
| #[cfg(target_arch = "aarch64")] | ||
| assert_eq!(align_of_val(t), 16); |
There was a problem hiding this comment.
Hmm, note to self: wonder if this will be different on linux arm64.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Description of changes:
Kani was building on M1 but refusing to perform verifications with the following error: error: Kani requires the target platform to be
x86_64-unknown-linux-gnuorx86_64-apple-darwin, but it is arm64-apple-macosx11.0.0error: aborting due to previous error.
Modified check_target() in compiler_interface.rs to accept 'arm64-apple-*', machine_model_from_session() in goto_ctx.rs to use the parameters for this target (added a small cpp in tools/sizeofs/main.cpp to generate these), and fixed a few tests that had hardcoded assumes on type sizes and alignements.
Resolved issues:
Resolves #1167
Call-outs:
Not covering any CI aspects.
Testing:
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.