T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2019 from akirilov-arm/show_freg_sized

Browse Source 
AArch64: Remove show_freg_sized()
This commit is contained in:
Chris Fallin
2020-07-14 12:39:51 -07:00
committed by GitHub
parent 4ba3ee3368 400639245c
commit bc1e960b9e
2 changed files with 48 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
cranelift/codegen/src/isa/aarch64/inst/mod.rs
View File

@@ -2509,7 +2509,7 @@ impl Inst {
ScalarSize::Size64 => F64, ScalarSize::Size64 => F64,
_ => unimplemented!(), _ => unimplemented!(),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, size); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
let rn = show_vreg_element(rn, mb_rru, idx, vector_type); let rn = show_vreg_element(rn, mb_rru, idx, vector_type);
format!("mov {}, {}", rd, rn) format!("mov {}, {}", rd, rn)
} }
@@ -2524,8 +2524,8 @@ impl Inst {
FPUOp1::Cvt32To64 => ("fcvt", ScalarSize::Size32, ScalarSize::Size64), FPUOp1::Cvt32To64 => ("fcvt", ScalarSize::Size32, ScalarSize::Size64),
FPUOp1::Cvt64To32 => ("fcvt", ScalarSize::Size64, ScalarSize::Size32), FPUOp1::Cvt64To32 => ("fcvt", ScalarSize::Size64, ScalarSize::Size32),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, sizedest); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, sizedest);
let rn = show_freg_sized(rn, mb_rru, sizesrc); let rn = show_vreg_scalar(rn, mb_rru, sizesrc);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }
&Inst::FpuRRR { fpu_op, rd, rn, rm } => { &Inst::FpuRRR { fpu_op, rd, rn, rm } => {
@@ -2543,9 +2543,9 @@ impl Inst {
FPUOp2::Min32 => ("fmin", ScalarSize::Size32), FPUOp2::Min32 => ("fmin", ScalarSize::Size32),
FPUOp2::Min64 => ("fmin", ScalarSize::Size64), FPUOp2::Min64 => ("fmin", ScalarSize::Size64),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, size); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
let rn = show_freg_sized(rn, mb_rru, size); let rn = show_vreg_scalar(rn, mb_rru, size);
let rm = show_freg_sized(rm, mb_rru, size); let rm = show_vreg_scalar(rm, mb_rru, size);
format!("{} {}, {}, {}", op, rd, rn, rm) format!("{} {}, {}, {}", op, rd, rn, rm)
} }
&Inst::FpuRRI { fpu_op, rd, rn } => { &Inst::FpuRRI { fpu_op, rd, rn } => {
@@ -2559,7 +2559,7 @@ impl Inst {
let show_vreg_fn: fn(Reg, Option<&RealRegUniverse>) -> String = if vector { let show_vreg_fn: fn(Reg, Option<&RealRegUniverse>) -> String = if vector {
|reg, mb_rru| show_vreg_vector(reg, mb_rru, F32X2) |reg, mb_rru| show_vreg_vector(reg, mb_rru, F32X2)
} else { } else {
|reg, mb_rru| show_vreg_scalar(reg, mb_rru, F64) |reg, mb_rru| show_vreg_scalar(reg, mb_rru, ScalarSize::Size64)
}; };
let rd = show_vreg_fn(rd.to_reg(), mb_rru); let rd = show_vreg_fn(rd.to_reg(), mb_rru);
let rn = show_vreg_fn(rn, mb_rru); let rn = show_vreg_fn(rn, mb_rru);
@@ -2576,30 +2576,30 @@ impl Inst {
FPUOp3::MAdd32 => ("fmadd", ScalarSize::Size32), FPUOp3::MAdd32 => ("fmadd", ScalarSize::Size32),
FPUOp3::MAdd64 => ("fmadd", ScalarSize::Size64), FPUOp3::MAdd64 => ("fmadd", ScalarSize::Size64),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, size); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
let rn = show_freg_sized(rn, mb_rru, size); let rn = show_vreg_scalar(rn, mb_rru, size);
let rm = show_freg_sized(rm, mb_rru, size); let rm = show_vreg_scalar(rm, mb_rru, size);
let ra = show_freg_sized(ra, mb_rru, size); let ra = show_vreg_scalar(ra, mb_rru, size);
format!("{} {}, {}, {}, {}", op, rd, rn, rm, ra) format!("{} {}, {}, {}, {}", op, rd, rn, rm, ra)
} }
&Inst::FpuCmp32 { rn, rm } => { &Inst::FpuCmp32 { rn, rm } => {
let rn = show_freg_sized(rn, mb_rru, ScalarSize::Size32); let rn = show_vreg_scalar(rn, mb_rru, ScalarSize::Size32);
let rm = show_freg_sized(rm, mb_rru, ScalarSize::Size32); let rm = show_vreg_scalar(rm, mb_rru, ScalarSize::Size32);
format!("fcmp {}, {}", rn, rm) format!("fcmp {}, {}", rn, rm)
} }
&Inst::FpuCmp64 { rn, rm } => { &Inst::FpuCmp64 { rn, rm } => {
let rn = show_freg_sized(rn, mb_rru, ScalarSize::Size64); let rn = show_vreg_scalar(rn, mb_rru, ScalarSize::Size64);
let rm = show_freg_sized(rm, mb_rru, ScalarSize::Size64); let rm = show_vreg_scalar(rm, mb_rru, ScalarSize::Size64);
format!("fcmp {}, {}", rn, rm) format!("fcmp {}, {}", rn, rm)
} }
&Inst::FpuLoad32 { rd, ref mem, .. } => { &Inst::FpuLoad32 { rd, ref mem, .. } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size32); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size32);
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}ldr {}, {}", mem_str, rd, mem) format!("{}ldr {}, {}", mem_str, rd, mem)
} }
&Inst::FpuLoad64 { rd, ref mem, .. } => { &Inst::FpuLoad64 { rd, ref mem, .. } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size64); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}ldr {}, {}", mem_str, rd, mem) format!("{}ldr {}, {}", mem_str, rd, mem)
@@ -2612,13 +2612,13 @@ impl Inst {
format!("{}ldr {}, {}", mem_str, rd, mem) format!("{}ldr {}, {}", mem_str, rd, mem)
} }
&Inst::FpuStore32 { rd, ref mem, .. } => { &Inst::FpuStore32 { rd, ref mem, .. } => {
let rd = show_freg_sized(rd, mb_rru, ScalarSize::Size32); let rd = show_vreg_scalar(rd, mb_rru, ScalarSize::Size32);
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}str {}, {}", mem_str, rd, mem) format!("{}str {}, {}", mem_str, rd, mem)
} }
&Inst::FpuStore64 { rd, ref mem, .. } => { &Inst::FpuStore64 { rd, ref mem, .. } => {
let rd = show_freg_sized(rd, mb_rru, ScalarSize::Size64); let rd = show_vreg_scalar(rd, mb_rru, ScalarSize::Size64);
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}str {}, {}", mem_str, rd, mem) format!("{}str {}, {}", mem_str, rd, mem)
@@ -2631,15 +2631,15 @@ impl Inst {
format!("{}str {}, {}", mem_str, rd, mem) format!("{}str {}, {}", mem_str, rd, mem)
} }
&Inst::LoadFpuConst32 { rd, const_data } => { &Inst::LoadFpuConst32 { rd, const_data } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size32); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size32);
format!("ldr {}, pc+8 ; b 8 ; data.f32 {}", rd, const_data) format!("ldr {}, pc+8 ; b 8 ; data.f32 {}", rd, const_data)
} }
&Inst::LoadFpuConst64 { rd, const_data } => { &Inst::LoadFpuConst64 { rd, const_data } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size64); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
format!("ldr {}, pc+8 ; b 12 ; data.f64 {}", rd, const_data) format!("ldr {}, pc+8 ; b 12 ; data.f64 {}", rd, const_data)
} }
&Inst::LoadFpuConst128 { rd, const_data } => { &Inst::LoadFpuConst128 { rd, const_data } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size128); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size128);
format!("ldr {}, pc+8 ; b 20 ; data.f128 0x{:032x}", rd, const_data) format!("ldr {}, pc+8 ; b 20 ; data.f128 0x{:032x}", rd, const_data)
} }
&Inst::FpuToInt { op, rd, rn } => { &Inst::FpuToInt { op, rd, rn } => {
@@ -2654,7 +2654,7 @@ impl Inst {
FpuToIntOp::F64ToU64 => ("fcvtzu", ScalarSize::Size64, OperandSize::Size64), FpuToIntOp::F64ToU64 => ("fcvtzu", ScalarSize::Size64, OperandSize::Size64),
}; };
let rd = show_ireg_sized(rd.to_reg(), mb_rru, sizedest); let rd = show_ireg_sized(rd.to_reg(), mb_rru, sizedest);
let rn = show_freg_sized(rn, mb_rru, sizesrc); let rn = show_vreg_scalar(rn, mb_rru, sizesrc);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }
&Inst::IntToFpu { op, rd, rn } => { &Inst::IntToFpu { op, rd, rn } => {
@@ -2668,21 +2668,21 @@ impl Inst {
IntToFpuOp::I64ToF64 => ("scvtf", OperandSize::Size64, ScalarSize::Size64), IntToFpuOp::I64ToF64 => ("scvtf", OperandSize::Size64, ScalarSize::Size64),
IntToFpuOp::U64ToF64 => ("ucvtf", OperandSize::Size64, ScalarSize::Size64), IntToFpuOp::U64ToF64 => ("ucvtf", OperandSize::Size64, ScalarSize::Size64),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, sizedest); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, sizedest);
let rn = show_ireg_sized(rn, mb_rru, sizesrc); let rn = show_ireg_sized(rn, mb_rru, sizesrc);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }
&Inst::FpuCSel32 { rd, rn, rm, cond } => { &Inst::FpuCSel32 { rd, rn, rm, cond } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size32); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size32);
let rn = show_freg_sized(rn, mb_rru, ScalarSize::Size32); let rn = show_vreg_scalar(rn, mb_rru, ScalarSize::Size32);
let rm = show_freg_sized(rm, mb_rru, ScalarSize::Size32); let rm = show_vreg_scalar(rm, mb_rru, ScalarSize::Size32);
let cond = cond.show_rru(mb_rru); let cond = cond.show_rru(mb_rru);
format!("fcsel {}, {}, {}, {}", rd, rn, rm, cond) format!("fcsel {}, {}, {}, {}", rd, rn, rm, cond)
} }
&Inst::FpuCSel64 { rd, rn, rm, cond } => { &Inst::FpuCSel64 { rd, rn, rm, cond } => {
let rd = show_freg_sized(rd.to_reg(), mb_rru, ScalarSize::Size64); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
let rn = show_freg_sized(rn, mb_rru, ScalarSize::Size64); let rn = show_vreg_scalar(rn, mb_rru, ScalarSize::Size64);
let rm = show_freg_sized(rm, mb_rru, ScalarSize::Size64); let rm = show_vreg_scalar(rm, mb_rru, ScalarSize::Size64);
let cond = cond.show_rru(mb_rru); let cond = cond.show_rru(mb_rru);
format!("fcsel {}, {}, {}, {}", rd, rn, rm, cond) format!("fcsel {}, {}, {}, {}", rd, rn, rm, cond)
} }
@@ -2697,8 +2697,8 @@ impl Inst {
FpuRoundMode::Nearest32 => ("frintn", ScalarSize::Size32), FpuRoundMode::Nearest32 => ("frintn", ScalarSize::Size32),
FpuRoundMode::Nearest64 => ("frintn", ScalarSize::Size64), FpuRoundMode::Nearest64 => ("frintn", ScalarSize::Size64),
}; };
let rd = show_freg_sized(rd.to_reg(), mb_rru, size); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
let rn = show_freg_sized(rn, mb_rru, size); let rn = show_vreg_scalar(rn, mb_rru, size);
format!("{} {}, {}", inst, rd, rn) format!("{} {}, {}", inst, rd, rn)
} }
&Inst::MovToVec64 { rd, rn } => { &Inst::MovToVec64 { rd, rn } => {
@@ -2790,7 +2790,7 @@ impl Inst {
let show_vreg_fn: fn(Reg, Option<&RealRegUniverse>, Type) -> String = if vector { let show_vreg_fn: fn(Reg, Option<&RealRegUniverse>, Type) -> String = if vector {
|reg, mb_rru, ty| show_vreg_vector(reg, mb_rru, ty) |reg, mb_rru, ty| show_vreg_vector(reg, mb_rru, ty)
} else { } else {
|reg, mb_rru, _ty| show_vreg_scalar(reg, mb_rru, I64) |reg, mb_rru, _ty| show_vreg_scalar(reg, mb_rru, ScalarSize::Size64)
}; };
let rd = show_vreg_fn(rd.to_reg(), mb_rru, ty); let rd = show_vreg_fn(rd.to_reg(), mb_rru, ty);
@@ -2812,8 +2812,14 @@ impl Inst {
let op = match op { let op = match op {
VecLanesOp::Uminv => "uminv", VecLanesOp::Uminv => "uminv",
}; };
let size = match ty {
I8X16 => ScalarSize::Size8,
I16X8 => ScalarSize::Size16,
I32X4 => ScalarSize::Size32,
_ => unimplemented!(),
};
let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ty); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
let rn = show_vreg_vector(rn, mb_rru, ty); let rn = show_vreg_vector(rn, mb_rru, ty);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }

33
cranelift/codegen/src/isa/aarch64/inst/regs.rs
View File

@@ -277,25 +277,8 @@ pub fn show_ireg_sized(reg: Reg, mb_rru: Option<&RealRegUniverse>, size: Operand
s s
} }
/// Show a vector register.
pub fn show_freg_sized(reg: Reg, mb_rru: Option<&RealRegUniverse>, size: ScalarSize) -> String {
let mut s = reg.show_rru(mb_rru);
if reg.get_class() != RegClass::V128 {
return s;
}
let prefix = match size {
ScalarSize::Size8 => "b",
ScalarSize::Size16 => "h",
ScalarSize::Size32 => "s",
ScalarSize::Size64 => "d",
ScalarSize::Size128 => "q",
};
s.replace_range(0..1, prefix);
s
}
/// Show a vector register used in a scalar context. /// Show a vector register used in a scalar context.
pub fn show_vreg_scalar(reg: Reg, mb_rru: Option<&RealRegUniverse>, ty: Type) -> String { pub fn show_vreg_scalar(reg: Reg, mb_rru: Option<&RealRegUniverse>, size: ScalarSize) -> String {
let mut s = reg.show_rru(mb_rru); let mut s = reg.show_rru(mb_rru);
if reg.get_class() != RegClass::V128 { if reg.get_class() != RegClass::V128 {
// We can't do any better. // We can't do any better.
@@ -304,13 +287,13 @@ pub fn show_vreg_scalar(reg: Reg, mb_rru: Option<&RealRegUniverse>, ty: Type) ->
if reg.is_real() { if reg.is_real() {
// Change (eg) "v0" into "d0". // Change (eg) "v0" into "d0".
if reg.get_class() == RegClass::V128 && s.starts_with("v") { if s.starts_with("v") {
let replacement = match ty { let replacement = match size {
I64 | F64 => "d", ScalarSize::Size8 => "b",
I8X16 => "b", ScalarSize::Size16 => "h",
I16X8 => "h", ScalarSize::Size32 => "s",
I32X4 => "s", ScalarSize::Size64 => "d",
_ => unimplemented!(), ScalarSize::Size128 => "q",
}; };
s.replace_range(0..1, replacement); s.replace_range(0..1, replacement);
} }