Commit 5f1661aa authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[turbofan] For Word32Shl optimizations only consider the last 5 bits of the shift

One optimization in the machine-operator-reducer did not consider that
that word32 shift left instructions only consider the last 5 bits of
the shift input.

The issue only occurs for WebAssembly because in JavaScript we always
add a "& 0xf" on the shift value to the TurboFan graph.

For additional background: The JavaScript and WebAssembly spec both
say that only the last 5 bits of the shift value are used in the
word32-shift-left operation. This means that an "x << 0x29", in the
code is actually executed as "x << 0x09". Therefore the changes in
this CL are okay because they mask the last 5 bit of the shift value.

BUG=chromium:689450

Change-Id: Id92f298ed6d7f1714b109b3f4fbcecd5ac6d30f7
Reviewed-on: https://chromium-review.googlesource.com/439312Reviewed-by: 's avatarBen Titzer <titzer@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43245}
parent e9f5e1e9
...@@ -1180,8 +1180,9 @@ Reduction MachineOperatorReducer::ReduceWord32And(Node* node) { ...@@ -1180,8 +1180,9 @@ Reduction MachineOperatorReducer::ReduceWord32And(Node* node) {
if (m.left().IsWord32Shl()) { if (m.left().IsWord32Shl()) {
Uint32BinopMatcher mleft(m.left().node()); Uint32BinopMatcher mleft(m.left().node());
if (mleft.right().HasValue() && if (mleft.right().HasValue() &&
mleft.right().Value() >= base::bits::CountTrailingZeros32(mask)) { (mleft.right().Value() & 0x1f) >=
// (x << L) & (-1 << K) => x << L iff K >= L base::bits::CountTrailingZeros32(mask)) {
// (x << L) & (-1 << K) => x << L iff L >= K
return Replace(mleft.node()); return Replace(mleft.node());
} }
} else if (m.left().IsInt32Add()) { } else if (m.left().IsInt32Add()) {
......
// Copyright 2017 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.
load('test/mjsunit/wasm/wasm-constants.js');
load('test/mjsunit/wasm/wasm-module-builder.js');
(function() {
var builder = new WasmModuleBuilder();
builder.addMemory(16, 32, false);
builder.addFunction('test', kSig_i_i)
.addBodyWithEnd([
kExprGetLocal, 0x00,
kExprI32Const, 0x29,
kExprI32Shl,
kExprI32Const, 0x18,
kExprI32ShrS,
kExprI32Const, 0x18,
kExprI32Shl,
kExprEnd,
])
.exportFunc();
var module = builder.instantiate();
assertEquals(0, module.exports.test(16));
})();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment