Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1711636 - Assertion failure: from.toStackSlot()->slot() % SimdMemoryAlignment == 0, at js/src/jit/LIR.cpp:654. r=lth.

Browse Source 
This assertion is overly constraining: in fact we don't require or provide
naturally-aligned 128-bit accesses to the stack on arm64.  So disable it for
arm64, and cause a compilation failure on any target supporting wasm SIMD that
isn't x86, x64 or arm64.  The original alignment-check code remains but is
commented out, just in case we need to reinstate it at some point.

Differential Revision: https://phabricator.services.mozilla.com/D115466
This commit is contained in:
Julian Seward 2021-05-19 17:54:17 +00:00
parent eebee7c675
commit 0da3a4882d
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/src/jit/LIR.cpp
View File

@ -640,31 +640,40 @@ bool LMoveGroup::add(LAllocation from, LAllocation to, LDefinition::Type type) {
}
// Check that SIMD moves are aligned according to ABI requirements.
# ifdef ENABLE_WASM_SIMD
// Alignment is not currently required for SIMD on x86/x64. See also
// CodeGeneratorShared::CodeGeneratorShared and in general everywhere
// SimdMemoryAignment is used. Likely, alignment requirements will return.
# if !defined(JS_CODEGEN_X86) && !defined(JS_CODEGEN_X64)
if (LDefinition(type).type() == LDefinition::SIMD128) {
MOZ_ASSERT(from.isMemory() || from.isFloatReg());
if (from.isMemory()) {
if (from.isArgument()) {
MOZ_ASSERT(from.toArgument()->index() % SimdMemoryAlignment == 0);
} else {
MOZ_ASSERT(from.toStackSlot()->slot() % SimdMemoryAlignment == 0);
}
}
MOZ_ASSERT(to.isMemory() || to.isFloatReg());
if (to.isMemory()) {
if (to.isArgument()) {
MOZ_ASSERT(to.toArgument()->index() % SimdMemoryAlignment == 0);
} else {
MOZ_ASSERT(to.toStackSlot()->slot() % SimdMemoryAlignment == 0);
}
}
}
# endif
# endif
// clang-format off
# ifdef ENABLE_WASM_SIMD
// Alignment is not currently required for SIMD on x86/x64/arm64. See also
// CodeGeneratorShared::CodeGeneratorShared and in general everywhere
// SimdMemoryAignment is used. Likely, alignment requirements will return.
# if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || \
defined(JS_CODEGEN_ARM64)
// No need for any check on x86/x64/arm64.
# else
# error "Need to consider SIMD alignment on this target."
// The following code may be of use if we need alignment checks on
// some future target.
//if (LDefinition(type).type() == LDefinition::SIMD128) {
// MOZ_ASSERT(from.isMemory() || from.isFloatReg());
// if (from.isMemory()) {
// if (from.isArgument()) {
// MOZ_ASSERT(from.toArgument()->index() % SimdMemoryAlignment == 0);
// } else {
// MOZ_ASSERT(from.toStackSlot()->slot() % SimdMemoryAlignment == 0);
// }
// }
// MOZ_ASSERT(to.isMemory() || to.isFloatReg());
// if (to.isMemory()) {
// if (to.isArgument()) {
// MOZ_ASSERT(to.toArgument()->index() % SimdMemoryAlignment == 0);
// } else {
// MOZ_ASSERT(to.toStackSlot()->slot() % SimdMemoryAlignment == 0);
// }
// }
//}
# endif
# endif
// clang-format on
#endif
return moves_.append(LMove(from, to, type));
}