Skip to content

Commit

Permalink
Cranelift: aarch64: fix undefined dest reg in f32x4.splat case. (#5987)
Browse files Browse the repository at this point in the history
One of the cases for a splat operation, as updated in #5370, wrote to
a temp reg but then only conditionally transformed the temp into the
final destination register. In another codepath, `rd` was left
undefined. This causes a panic later when regalloc2 verifies SSA
properties of its input (here, value not def'd before use).

Fixes #5985.
  • Loading branch information
cfallin authored Mar 11, 2023
1 parent 52896e0 commit 264089e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 7 deletions.
22 changes: 15 additions & 7 deletions cranelift/codegen/src/isa/aarch64/inst/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,22 +416,30 @@ impl Inst {
size
}]
} else if let Some(imm) = widen_32_bit_pattern(pattern, lane_size) {
let tmp = alloc_tmp(types::I64X2);
let mut insts = smallvec![Inst::VecDupImm {
rd: tmp,
imm,
invert: false,
size: VectorSize::Size64x2,
}];
let mut insts = smallvec![];

// TODO: Implement support for 64-bit scalar MOVI; we zero-extend the
// lower 64 bits instead.
if !size.is_128bits() {
let tmp = alloc_tmp(types::I64X2);
insts.push(Inst::VecDupImm {
rd: tmp,
imm,
invert: false,
size: VectorSize::Size64x2,
});
insts.push(Inst::FpuExtend {
rd,
rn: tmp.to_reg(),
size: ScalarSize::Size64,
});
} else {
insts.push(Inst::VecDupImm {
rd,
imm,
invert: false,
size: VectorSize::Size64x2,
});
}

insts
Expand Down
20 changes: 20 additions & 0 deletions cranelift/filetests/filetests/isa/aarch64/issue-5985.clif
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
test compile precise-output
target aarch64

function %a() -> f32x4 system_v {
block0:
v16 = f32const 0x1.fffe00p-126
v25 = splat.f32x4 v16
return v25
}

; VCode:
; block0:
; movi v0.2d, #72056494543077120
; ret
;
; Disassembled:
; block0: ; offset 0x0
; movi v0.2d, #0xffff0000ffff00
; ret

0 comments on commit 264089e

Please sign in to comment.