Skip to content

riscv64: Use Constant Pool to load 32 and 64 bit constants #5578

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

Closed
afonso360 wants to merge 2 commits into from
Closed

riscv64: Use Constant Pool to load 32 and 64 bit constants #5578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c0112
riscv64: Use Constant Pool for Loads
afonso360 Jan 16, 2023
98bb9f7
riscv64: Remove remaining uses of LoadConstant
afonso360 Jan 16, 2023
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
52 changes: 26 additions & 26 deletions cranelift/codegen/src/isa/riscv64/inst/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,55 +35,52 @@ pub enum AMode {
/// clobber pushes. See the diagram in the documentation for
/// [crate::isa::riscv64::abi](the ABI module) for more details.
NominalSPOffset(i64, Type),

/// Emits a relocation that resolves to the appropriate location
Label(MachLabel),
}

impl AMode {
pub(crate) fn reg_offset(reg: Reg, imm: i64, ty: Type) -> AMode {
AMode::RegOffset(reg, imm, ty)
}

pub(crate) fn get_base_register(&self) -> Reg {
pub(crate) fn get_base_register(&self) -> Option<Reg> {
match self {
&AMode::RegOffset(reg, ..) => reg,
&AMode::SPOffset(..) => stack_reg(),
&AMode::FPOffset(..) => fp_reg(),
&AMode::NominalSPOffset(..) => stack_reg(),
&AMode::RegOffset(reg, ..) => Some(reg),
&AMode::SPOffset(..) => Some(stack_reg()),
&AMode::FPOffset(..) => Some(fp_reg()),
&AMode::NominalSPOffset(..) => Some(stack_reg()),
&AMode::Label(_) => None,
}
}

pub(crate) fn get_offset_with_state(&self, state: &EmitState) -> i64 {
pub(crate) fn get_offset_with_state(&self, state: &EmitState) -> Option<i64> {
match self {
&AMode::NominalSPOffset(offset, _) => offset + state.virtual_sp_offset,
&AMode::NominalSPOffset(offset, _) => Some(offset + state.virtual_sp_offset),
_ => self.get_offset(),
}
}

fn get_offset(&self) -> i64 {
pub(crate) fn get_offset(&self) -> Option<i64> {
match self {
&AMode::RegOffset(_, offset, ..) => offset,
&AMode::SPOffset(offset, _) => offset,
&AMode::FPOffset(offset, _) => offset,
&AMode::NominalSPOffset(offset, _) => offset,
&AMode::RegOffset(_, offset, ..) => Some(offset),
&AMode::SPOffset(offset, _) => Some(offset),
&AMode::FPOffset(offset, _) => Some(offset),
&AMode::NominalSPOffset(offset, _) => Some(offset),
&AMode::Label(_) => None,
}
}

pub(crate) fn to_string_with_alloc(&self, allocs: &mut AllocationConsumer<'_>) -> String {
let reg = self.get_base_register();
let next = allocs.next(reg);
let offset = self.get_offset();
match self {
&AMode::Label(l) => format!(".L{}", l.as_u32()),
&AMode::NominalSPOffset(..) => format!("{}", self),
_ => format!("{}({})", offset, reg_name(next),),
}
}

pub(crate) fn to_addr(&self, allocs: &mut AllocationConsumer<'_>) -> String {
let reg = self.get_base_register();
let next = allocs.next(reg);
let offset = self.get_offset();
match self {
&AMode::NominalSPOffset(..) => format!("nsp{:+}", offset),
_ => format!("{}{:+}", reg_name(next), offset),
_ => {
let reg = self.get_base_register().unwrap();
let next = allocs.next(reg);
format!("{}({})", self.get_offset().unwrap(), reg_name(next),)
}
}
}
}
Expand All @@ -103,6 +100,9 @@ impl Display for AMode {
&AMode::FPOffset(offset, ..) => {
write!(f, "{}(fp)", offset)
}
&AMode::Label(label) => {
write!(f, ".L{}", label.as_u32())
}
}
}
}
Expand Down
Loading