[wasm][simd][liftoff][arm] Fix f64x2.pmin/pmax
The previous combination of a conditional and an unconditional move produced an incorrect value when dst == rhs and lhs contained the expected result. Fixed: chromium:1338980 Change-Id: If3f722999ed9c0ffd687736280d048d232d75736 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3738219 Auto-Submit: Jakob Kummerow <jkummerow@chromium.org> Commit-Queue: Deepti Gandluri <gdeepti@chromium.org> Reviewed-by: Deepti Gandluri <gdeepti@chromium.org> Cr-Commit-Position: refs/heads/main@{#81475}
This commit is contained in:
parent
838a220cf8
commit
711b65f723
@ -2678,14 +2678,12 @@ void LiftoffAssembler::emit_f64x2_pmin(LiftoffRegister dst, LiftoffRegister lhs,
|
||||
QwNeonRegister left = liftoff::GetSimd128Register(lhs);
|
||||
QwNeonRegister right = liftoff::GetSimd128Register(rhs);
|
||||
|
||||
if (dst != rhs) {
|
||||
vmov(dest, left);
|
||||
}
|
||||
|
||||
VFPCompareAndSetFlags(right.low(), left.low());
|
||||
vmov(dest.low(), right.low(), mi);
|
||||
if (dst != rhs) vmov(dest.low(), right.low(), mi);
|
||||
if (dst != lhs) vmov(dest.low(), left.low(), NegateCondition(mi));
|
||||
VFPCompareAndSetFlags(right.high(), left.high());
|
||||
vmov(dest.high(), right.high(), mi);
|
||||
if (dst != rhs) vmov(dest.high(), right.high(), mi);
|
||||
if (dst != lhs) vmov(dest.high(), left.high(), NegateCondition(mi));
|
||||
}
|
||||
|
||||
void LiftoffAssembler::emit_f64x2_pmax(LiftoffRegister dst, LiftoffRegister lhs,
|
||||
@ -2694,14 +2692,12 @@ void LiftoffAssembler::emit_f64x2_pmax(LiftoffRegister dst, LiftoffRegister lhs,
|
||||
QwNeonRegister left = liftoff::GetSimd128Register(lhs);
|
||||
QwNeonRegister right = liftoff::GetSimd128Register(rhs);
|
||||
|
||||
if (dst != rhs) {
|
||||
vmov(dest, left);
|
||||
}
|
||||
|
||||
VFPCompareAndSetFlags(right.low(), left.low());
|
||||
vmov(dest.low(), right.low(), gt);
|
||||
if (dst != rhs) vmov(dest.low(), right.low(), gt);
|
||||
if (dst != lhs) vmov(dest.low(), left.low(), NegateCondition(gt));
|
||||
VFPCompareAndSetFlags(right.high(), left.high());
|
||||
vmov(dest.high(), right.high(), gt);
|
||||
if (dst != rhs) vmov(dest.high(), right.high(), gt);
|
||||
if (dst != lhs) vmov(dest.high(), left.high(), NegateCondition(gt));
|
||||
}
|
||||
|
||||
void LiftoffAssembler::emit_f64x2_relaxed_min(LiftoffRegister dst,
|
||||
|
63
test/mjsunit/regress/wasm/regress-crbug-1338980.js
Normal file
63
test/mjsunit/regress/wasm/regress-crbug-1338980.js
Normal file
@ -0,0 +1,63 @@
|
||||
// Copyright 2022 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
d8.file.execute("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
|
||||
let builder = new WasmModuleBuilder();
|
||||
|
||||
const kSmallValue = 0x02;
|
||||
const kBigValue = 0x04; // "Big" is relative.
|
||||
|
||||
const min = kExprF64x2Pmin;
|
||||
const max = kExprF64x2Pmax;
|
||||
|
||||
function GetFunctionName(instruction, flags) {
|
||||
return [instruction == min ? "min" : "max", flags].join("_");
|
||||
}
|
||||
|
||||
function AddFunction(instruction, flags) {
|
||||
// Liftoff's register management won't reuse an input as the output when
|
||||
// the same value has another use, such as a local.
|
||||
const pin_left = (flags & 1) != 0;
|
||||
const pin_right = (flags & 2) != 0;
|
||||
// Test both possible permutations of the inputs.
|
||||
const small_left = (flags & 4) != 0;
|
||||
let body = [].concat(
|
||||
[
|
||||
kExprI64Const, small_left ? kSmallValue : kBigValue,
|
||||
kSimdPrefix, kExprI64x2Splat,
|
||||
],
|
||||
pin_left ? [kExprLocalSet, 0,
|
||||
kExprLocalGet, 0] : [],
|
||||
[
|
||||
kExprI64Const, small_left ? kBigValue : kSmallValue,
|
||||
kSimdPrefix,kExprI64x2Splat,
|
||||
],
|
||||
pin_right ? [kExprLocalSet, 1,
|
||||
kExprLocalGet, 1] : [],
|
||||
[
|
||||
kSimdPrefix, instruction, 0x01,
|
||||
kSimdPrefix, kExprI64x2ExtractLane, 0x00,
|
||||
]);
|
||||
builder.addFunction(GetFunctionName(instruction, flags), kSig_l_v)
|
||||
.exportFunc()
|
||||
.addLocals(kWasmS128, 2)
|
||||
.addBody(body);
|
||||
}
|
||||
|
||||
for (let instruction of [min, max]) {
|
||||
for (let flags = 0; flags <= 7; flags++) {
|
||||
AddFunction(instruction, flags);
|
||||
}
|
||||
}
|
||||
|
||||
let instance = builder.instantiate();
|
||||
|
||||
for (let instruction of [min, max]) {
|
||||
let expected = instruction == min ? kSmallValue : kBigValue;
|
||||
for (let flags = 0; flags <= 7; flags++) {
|
||||
let actual = instance.exports[GetFunctionName(instruction, flags)]();
|
||||
assertEquals(BigInt(expected), actual);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user