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.

Sign up for GitHub

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

Jump to bottom

Add support for RISC-V Zbb (Bit manipulation) extension #204

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for RISC-V Zbb (Bit manipulation) extension #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
415225f
polkavm-common: Extend cast to include zero-extend and sign-extend of…
aman4150 Oct 29, 2024
7344afb
polkavm-linker: Add Zbb (RISC-V B extension) instruction set parsing
aman4150 Oct 29, 2024
823a34f
polkavm: Add Zbb instruction set execution support in the interpreter
aman4150 Oct 29, 2024
6d277e2
guest-programs/riscv-tests: Add risc-v Zbb instruction set tests
aman4150 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions crates/polkavm-common/src/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ impl cast<u8> {
}
}

impl cast<u16> {
#[inline(always)]
pub const fn to_signed(self) -> i16 {
self.0 as i16
}

#[inline(always)]
pub const fn to_u32(self) -> u32 {
self.0 as u32
}
}

impl cast<u32> {
#[inline(always)]
pub const fn to_signed(self) -> i32 {
Expand Down
195 changes: 195 additions & 0 deletions crates/polkavm-common/src/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,11 @@ define_opcodes! {

[I_64, I_32] cmov_if_zero_imm = 85,
[I_64, I_32] cmov_if_not_zero_imm = 86,

[I_64, I_32] rotate_right_imm = 158,
[I_64, I_32] rotate_right_imm_alt = 159,
[I_64, I_32] rotate_right_word_imm = 160,
[I_64, I_32] rotate_right_word_imm_alt = 161,
]

// Instructions with args: reg, reg, offset
Expand Down Expand Up @@ -1530,6 +1535,18 @@ define_opcodes! {

[I_64, I_32] cmov_if_zero = 83,
[I_64, I_32] cmov_if_not_zero = 84,

[I_64, I_32] and_inverted = 136,
[I_64, I_32] or_inverted = 137,
[I_64, I_32] xnor = 138,
[I_64, I_32] maximum = 145,
[I_64, I_32] maximum_unsigned = 146,
[I_64, I_32] minimum = 147,
[I_64, I_32] minimum_unsigned = 148,
[I_64, I_32] rotate_left = 152,
[I_64, I_32] rotate_left_word = 153,
[I_64, I_32] rotate_right = 154,
[I_64, I_32] rotate_right_word = 155,
]

// Instructions with args: offset
Expand All @@ -1554,6 +1571,17 @@ define_opcodes! {
[
[I_64, I_32] move_reg = 82,
[I_SBRK] sbrk = 87,
[I_64, I_32] count_leading_zero_bits = 139,
[I_64] count_leading_zero_bits_word = 140,
[I_64, I_32] count_trailing_zero_bits = 141,
[I_64] count_trailing_zero_bits_word = 142,
[I_64, I_32] count_set_bits = 143,
[I_64] count_set_bits_word = 144,
[I_64, I_32] sign_extend_byte = 149,
[I_64, I_32] sign_extend_half_word = 150,
[I_64, I_32] zero_extend_half_word = 151,
[I_64, I_32] or_combine_byte = 156,
[I_64, I_32] reverse_byte = 157,
]

// Instructions with args: reg, reg, imm, imm
Expand Down Expand Up @@ -2073,6 +2101,83 @@ impl<'a, 'b, 'c> InstructionVisitor for InstructionFormatter<'a, 'b, 'c> {
write!(self, "i64 {d} = i64 {s1} %s i64 {s2}")
}

fn and_inverted(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = ({s1} & ~{s2})")
}

fn or_inverted(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = ({s1} | ~{s2})")
}

fn xnor(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = ~({s1} ^ {s2})")
}

fn maximum(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = max({s1}, {s2})")
}

fn maximum_unsigned(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = max({s1} % u, {s2} % u)")
}

fn minimum(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = min({s1}, {s2})")
}

fn minimum_unsigned(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = min({s1} %u, {s2} %u)")
}

fn rotate_left(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = {s1} <<rotate {s2}")
}

fn rotate_left_word(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = {s1} <<rotate.32 {s2}")
}

fn rotate_right(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = {s1} >>rotate {s2}")
}

fn rotate_right_word(&mut self, d: RawReg, s1: RawReg, s2: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
let s2 = self.format_reg(s2);
write!(self, "{d} = {s1} >>rotate.32 {s2}")
}

fn set_less_than_unsigned_imm(&mut self, d: RawReg, s1: RawReg, s2: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
Expand Down Expand Up @@ -2240,6 +2345,72 @@ impl<'a, 'b, 'c> InstructionVisitor for InstructionFormatter<'a, 'b, 'c> {
write!(self, "{d} = {s}")
}

fn count_leading_zero_bits(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = clz {s}")
}

fn count_leading_zero_bits_word(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = clz.w {s}")
}

fn count_trailing_zero_bits(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = ctz {s}")
}

fn count_trailing_zero_bits_word(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = ctz.w {s}")
}

fn count_set_bits(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = cpop {s}")
}

fn count_set_bits_word(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = cpop.w {s}")
}

fn sign_extend_byte(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = sext.b {s}")
}

fn sign_extend_half_word(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = sext.h {s}")
}

fn zero_extend_half_word(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = zext.h {s}")
}

fn or_combine_byte(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = orc.b {s}")
}

fn reverse_byte(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = reverse {s}")
}

fn cmov_if_zero(&mut self, d: RawReg, s: RawReg, c: RawReg) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
Expand All @@ -2266,6 +2437,30 @@ impl<'a, 'b, 'c> InstructionVisitor for InstructionFormatter<'a, 'b, 'c> {
write!(self, "{d} = {s} if {c} != 0")
}

fn rotate_right_imm(&mut self, d: RawReg, s: RawReg, c: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = {s} >>rotate.imm {c}")
}

fn rotate_right_imm_alt(&mut self, d: RawReg, c: RawReg, s: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let c = self.format_reg(c);
write!(self, "{d} = {s} >>rotate.imm {c}")
}

fn rotate_right_word_imm(&mut self, d: RawReg, s: RawReg, c: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let s = self.format_reg(s);
write!(self, "{d} = {s} >>rotate.imm.32 {c}")
}

fn rotate_right_word_imm_alt(&mut self, d: RawReg, c: RawReg, s: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let c = self.format_reg(c);
write!(self, "{d} = {s} >>rotate.imm.32 {c}")
}

fn add_64_imm(&mut self, d: RawReg, s1: RawReg, s2: u32) -> Self::ReturnTy {
let d = self.format_reg(d);
let s1 = self.format_reg(s1);
Expand Down
Loading
Loading