From 411781d2fef834ff0e1c57414c15a8bd7526e845 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 10 Mar 2023 20:41:41 +0100 Subject: [PATCH] s390x: Fix mistake in available_in_isa (#5981) The 32-bit float<->int conversion instructions are part of the VXRS_EXT2 facility, not MIE2. Fixes https://github.com/bytecodealliance/wasmtime/issues/5979. --- cranelift/codegen/src/isa/s390x/inst/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cranelift/codegen/src/isa/s390x/inst/mod.rs b/cranelift/codegen/src/isa/s390x/inst/mod.rs index d68e3317cd..7305b98fbb 100644 --- a/cranelift/codegen/src/isa/s390x/inst/mod.rs +++ b/cranelift/codegen/src/isa/s390x/inst/mod.rs @@ -261,10 +261,10 @@ impl Inst { _ => InstructionSet::Base, }, Inst::FpuRound { op, .. } => match op { - FpuRoundOp::ToSInt32 | FpuRoundOp::FromSInt32 => InstructionSet::MIE2, - FpuRoundOp::ToUInt32 | FpuRoundOp::FromUInt32 => InstructionSet::MIE2, - FpuRoundOp::ToSInt32x4 | FpuRoundOp::FromSInt32x4 => InstructionSet::MIE2, - FpuRoundOp::ToUInt32x4 | FpuRoundOp::FromUInt32x4 => InstructionSet::MIE2, + FpuRoundOp::ToSInt32 | FpuRoundOp::FromSInt32 => InstructionSet::VXRS_EXT2, + FpuRoundOp::ToUInt32 | FpuRoundOp::FromUInt32 => InstructionSet::VXRS_EXT2, + FpuRoundOp::ToSInt32x4 | FpuRoundOp::FromSInt32x4 => InstructionSet::VXRS_EXT2, + FpuRoundOp::ToUInt32x4 | FpuRoundOp::FromUInt32x4 => InstructionSet::VXRS_EXT2, _ => InstructionSet::Base, },