winch(arm64): and, or, xor, shifts#8921
Merged
elliottt merged 10 commits intobytecodealliance:mainfrom Jul 16, 2024
Merged
Conversation
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
Member
|
I'll take a look at this one. |
saulecabrera
reviewed
Jul 9, 2024
winch/codegen/src/isa/aarch64/asm.rs
Outdated
Comment on lines
+32
to
+43
| impl Into<ALUOp> for ShiftKind { | ||
| fn into(self) -> ALUOp { | ||
| match self { | ||
| ShiftKind::Shl => ALUOp::Lsl, | ||
| ShiftKind::ShrS => ALUOp::Asr, | ||
| ShiftKind::ShrU => ALUOp::Lsr, | ||
| ShiftKind::Rotr => ALUOp::RotR, | ||
| // Rotl is implemented as neg+ROR. | ||
| ShiftKind::Rotl => unimplemented!(), | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Given that this operation can fail, maybe we should avoid implementing Into/From and instead create a helper method in the Assembler itself, by extracting:
let shift_op: ALUOp = if kind == ShiftKind::Rotl {
// Emulate Rotr with rm := neg(rm); with neg(x) := sub(zero, x).
self.emit_alu_rrr(ALUOp::Sub, regs::zero(), rn, rn, size);
ALUOp::RotR
} else {
kind.into()
};
Contributor
Author
There was a problem hiding this comment.
refactored and moved to shift_kind_to_alu_op()
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
evacchi
commented
Jul 12, 2024
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
This commit includes very minor clean-ups, these are mechanical changes only. * Rename `shift_rr` to `shift`, as we're still passing the context in, the callee can decide what to do with the instruction arguments. * Delete the un-used `Into<AluOp> for ShiftKind`
saulecabrera
approved these changes
Jul 16, 2024
Member
There was a problem hiding this comment.
This looks good to me, thanks!
For visibility, here's a recap of an offline discussion between @evacchi and myself:
- @evacchi is on PTO for the next couple of weeks and therefore suggested pushing any required changes on top of this PR in order to take it to the finish line.
- I pushed e18681c, which is a mechanical change only.
Given the recent changes I was thinking it might make sense to get a second review on this change.
@elliottt, would you be able to provide a second pass on this change?
elliottt
approved these changes
Jul 16, 2024
Member
elliottt
left a comment
There was a problem hiding this comment.
This looks good to me as well!
Contributor
Author
|
Wonderful thanks for pushing this to the finish line!! ❤️❤️ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Follow up to #8321.
Adds support to binary and, binary or, binary xor (eor), shl, shrS, shrU, rotr, rotl.