Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: src/compiler/wasm-compiler.cc

Issue 2083523002: Reland of "Implement WASM big-endian support". (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase to master Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/compiler/wasm-compiler.h ('k') | src/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/wasm-compiler.cc
diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc
index 0a13f98d8593f32e8990752d7d1a64451314ae6d..f4f2239927afdaaa03d2624187d409a48c3c47bb 100644
--- a/src/compiler/wasm-compiler.cc
+++ b/src/compiler/wasm-compiler.cc
@@ -996,6 +996,134 @@ Node* WasmGraphBuilder::MaskShiftCount64(Node* node) {
return node;
}
+Node* WasmGraphBuilder::BuildChangeEndianness(Node* node, MachineType memtype,
+ wasm::LocalType wasmtype) {
+ Node* result;
+ Node* value = node;
+ const Operator* shiftLeftOpcode;
+ const Operator* shiftRightOpcode;
+ const Operator* andOpcode;
+ const Operator* orOpcode;
+ MachineOperatorBuilder* m = jsgraph()->machine();
+ int valueSizeInBytes = 1 << ElementSizeLog2Of(memtype.representation());
+ int valueSizeInBits = 8 * valueSizeInBytes;
+ bool isFloat = false;
+
+ switch (memtype.representation()) {
+ case MachineRepresentation::kFloat64:
+ value = graph()->NewNode(m->BitcastFloat64ToInt64(), node);
+ isFloat = true;
+ case MachineRepresentation::kWord64:
+ shiftLeftOpcode = m->Word64Shl();
+ shiftRightOpcode = m->Word64Shr();
+ andOpcode = m->Word64And();
+ orOpcode = m->Word64Or();
+ result = jsgraph()->Int64Constant(0);
+ break;
+ case MachineRepresentation::kFloat32:
+ value = graph()->NewNode(m->BitcastFloat32ToInt32(), node);
+ isFloat = true;
+ case MachineRepresentation::kWord32:
+ case MachineRepresentation::kWord16:
+ shiftLeftOpcode = m->Word32Shl();
+ shiftRightOpcode = m->Word32Shr();
+ andOpcode = m->Word32And();
+ orOpcode = m->Word32Or();
+ result = jsgraph()->Int32Constant(0);
+ break;
+ case MachineRepresentation::kWord8:
+ // No need to change endianness for byte size, return original node
+ return node;
+ break;
+ default:
+ UNREACHABLE();
+ break;
+ }
+
+ int i;
+ uint32_t shiftCount;
+
+ for (i = 0, shiftCount = valueSizeInBits - 8; i < valueSizeInBits / 2;
+ i += 8, shiftCount -= 16) {
+ Node* shiftLower;
+ Node* shiftHigher;
+ Node* lowerByte;
+ Node* higherByte;
+
+ DCHECK(shiftCount > 0);
+ DCHECK((shiftCount + 8) % 16 == 0);
+
+ if (valueSizeInBits > 32) {
+ shiftLower = graph()->NewNode(shiftLeftOpcode, value,
+ jsgraph()->Int64Constant(shiftCount));
+ shiftHigher = graph()->NewNode(shiftRightOpcode, value,
+ jsgraph()->Int64Constant(shiftCount));
+ lowerByte = graph()->NewNode(
+ andOpcode, shiftLower,
+ jsgraph()->Int64Constant(static_cast<uint64_t>(0xFF)
+ << (valueSizeInBits - 8 - i)));
+ higherByte = graph()->NewNode(
+ andOpcode, shiftHigher,
+ jsgraph()->Int64Constant(static_cast<uint64_t>(0xFF) << i));
+ } else {
+ shiftLower = graph()->NewNode(shiftLeftOpcode, value,
+ jsgraph()->Int32Constant(shiftCount));
+ shiftHigher = graph()->NewNode(shiftRightOpcode, value,
+ jsgraph()->Int32Constant(shiftCount));
+ lowerByte = graph()->NewNode(
+ andOpcode, shiftLower,
+ jsgraph()->Int32Constant(static_cast<uint32_t>(0xFF)
+ << (valueSizeInBits - 8 - i)));
+ higherByte = graph()->NewNode(
+ andOpcode, shiftHigher,
+ jsgraph()->Int32Constant(static_cast<uint32_t>(0xFF) << i));
+ }
+
+ result = graph()->NewNode(orOpcode, result, lowerByte);
+ result = graph()->NewNode(orOpcode, result, higherByte);
+ }
+
+ if (isFloat) {
+ switch (memtype.representation()) {
+ case MachineRepresentation::kFloat64:
+ result = graph()->NewNode(m->BitcastInt64ToFloat64(), result);
+ break;
+ case MachineRepresentation::kFloat32:
+ result = graph()->NewNode(m->BitcastInt32ToFloat32(), result);
+ break;
+ default:
+ UNREACHABLE();
+ break;
+ }
+ }
+
+ // We need to sign extend the value
+ if (memtype.IsSigned()) {
+ DCHECK(!isFloat);
+ if (valueSizeInBits < 32) {
+ Node* shiftBitCount;
+ // Perform sign extension using following trick
+ // result = (x << machine_width - type_width) >> (machine_width -
+ // type_width)
+ if (wasmtype == wasm::kAstI64) {
+ shiftBitCount = jsgraph()->Int32Constant(64 - valueSizeInBits);
+ result = graph()->NewNode(
+ m->Word64Sar(),
+ graph()->NewNode(m->Word64Shl(), result, shiftBitCount),
+ shiftBitCount);
+ } else if (wasmtype == wasm::kAstI32) {
+ shiftBitCount = jsgraph()->Int32Constant(32 - valueSizeInBits);
+ result = graph()->NewNode(
+ m->Word32Sar(),
+ graph()->NewNode(m->Word32Shl(), result, shiftBitCount),
+ shiftBitCount);
+ }
+ }
+ }
+
+ return result;
+}
+
Node* WasmGraphBuilder::BuildF32Neg(Node* input) {
Node* result =
Unop(wasm::kExprF32ReinterpretI32,
@@ -2734,6 +2862,11 @@ Node* WasmGraphBuilder::LoadMem(wasm::LocalType type, MachineType memtype,
} else {
load = BuildUnalignedLoad(type, memtype, index, offset, alignment);
}
+#if defined(V8_TARGET_BIG_ENDIAN)
+ // TODO(john.yan) Implement byte swap turbofan operator
+ // and use it if available for better performance
+ load = BuildChangeEndianness(load, memtype, type);
+#endif
if (type == wasm::kAstI64 &&
ElementSizeLog2Of(memtype.representation()) < 3) {
@@ -2854,6 +2987,12 @@ Node* WasmGraphBuilder::StoreMem(MachineType memtype, Node* index,
bool aligned = static_cast<int>(alignment) >=
ElementSizeLog2Of(memtype.representation());
+#if defined(V8_TARGET_BIG_ENDIAN)
+ // TODO(john.yan) Implement byte swap turbofan operator
+ // and use it if available for better performance
+ val = BuildChangeEndianness(val, memtype);
+#endif
+
if (aligned ||
jsgraph()->machine()->UnalignedStoreSupported(memtype, alignment)) {
StoreRepresentation rep(memtype.representation(), kNoWriteBarrier);
« no previous file with comments | « src/compiler/wasm-compiler.h ('k') | src/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698