Diff
Modified: trunk/JSTests/ChangeLog (247010 => 247011)
--- trunk/JSTests/ChangeLog 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/JSTests/ChangeLog 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1,3 +1,15 @@
+2019-07-01 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246946.
+
+ Caused JSC test crashes on arm64
+
+ Reverted changeset:
+
+ "Add b3 macro lowering for CheckMul on arm64"
+ https://bugs.webkit.org/show_bug.cgi?id=199251
+ https://trac.webkit.org/changeset/246946
+
2019-06-28 Justin Michaud <justin_mich...@apple.com>
Add b3 macro lowering for CheckMul on arm64
Deleted: trunk/JSTests/microbenchmarks/check-mul-constant.js (247010 => 247011)
--- trunk/JSTests/microbenchmarks/check-mul-constant.js 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/JSTests/microbenchmarks/check-mul-constant.js 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1,13 +0,0 @@
-function doTest(max) {
- let sum = 0
- for (let i=0; i<max; ++i) {
- sum = sum + i * 304;
- }
- return sum
-}
-noInline(doTest);
-
-for (let i=0; i<100000; ++i) doTest(10000)
-
-if (doTest(10000) != 15198480000)
- throw "Error: bad result: " + doTest(10000);
Deleted: trunk/JSTests/microbenchmarks/check-mul-no-constant.js (247010 => 247011)
--- trunk/JSTests/microbenchmarks/check-mul-no-constant.js 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/JSTests/microbenchmarks/check-mul-no-constant.js 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1,13 +0,0 @@
-function doTest(max) {
- let sum = 0
- for (let i=0; i<max; ++i) {
- sum = sum + i * i;
- }
- return sum
-}
-noInline(doTest);
-
-for (let i=0; i<100000; ++i) doTest(10000)
-
-if (doTest(10000) != 333283335000)
- throw "Error: bad result: " + doTest(10000);
Deleted: trunk/JSTests/microbenchmarks/check-mul-power-of-two.js (247010 => 247011)
--- trunk/JSTests/microbenchmarks/check-mul-power-of-two.js 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/JSTests/microbenchmarks/check-mul-power-of-two.js 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1,13 +0,0 @@
-function doTest(max) {
- let sum = 0
- for (let i=0; i<max; ++i) {
- sum = sum + i * 64;
- }
- return sum
-}
-noInline(doTest);
-
-for (let i=0; i<100000; ++i) doTest(10000)
-
-if (doTest(10000) != 3199680000)
- throw "Error: bad result: " + doTest(10000);
Modified: trunk/Source/_javascript_Core/ChangeLog (247010 => 247011)
--- trunk/Source/_javascript_Core/ChangeLog 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1,3 +1,15 @@
+2019-07-01 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246946.
+
+ Caused JSC test crashes on arm64
+
+ Reverted changeset:
+
+ "Add b3 macro lowering for CheckMul on arm64"
+ https://bugs.webkit.org/show_bug.cgi?id=199251
+ https://trac.webkit.org/changeset/246946
+
2019-06-28 Justin Michaud <justin_mich...@apple.com>
Add b3 macro lowering for CheckMul on arm64
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (247010 => 247011)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2019-07-01 16:59:33 UTC (rev 247011)
@@ -569,11 +569,6 @@
m_assembler.msub<64>(dest, mulLeft, mulRight, ARM64Registers::zr);
}
- void multiplySignExtend32(RegisterID left, RegisterID right, RegisterID dest)
- {
- m_assembler.smull(dest, left, right);
- }
-
void div32(RegisterID dividend, RegisterID divisor, RegisterID dest)
{
m_assembler.sdiv<32>(dest, dividend, divisor);
Modified: trunk/Source/_javascript_Core/assembler/testmasm.cpp (247010 => 247011)
--- trunk/Source/_javascript_Core/assembler/testmasm.cpp 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/assembler/testmasm.cpp 2019-07-01 16:59:33 UTC (rev 247011)
@@ -351,25 +351,6 @@
}
}
-#if CPU(ARM64)
-void testMul32SignExtend()
-{
- for (auto value : int32Operands()) {
- auto mul = compile([=] (CCallHelpers& jit) {
- jit.emitFunctionPrologue();
-
- jit.multiplySignExtend32(GPRInfo::argumentGPR0, GPRInfo::argumentGPR1, GPRInfo::returnValueGPR);
-
- jit.emitFunctionEpilogue();
- jit.ret();
- });
-
- for (auto value2 : int32Operands())
- CHECK_EQ(invoke<long int>(mul, value, value2), ((long int) value) * ((long int) value2));
- }
-}
-#endif
-
#if CPU(X86) || CPU(X86_64) || CPU(ARM64)
void testCompareFloat(MacroAssembler::DoubleCondition condition)
{
@@ -1129,10 +1110,6 @@
RUN(testCompareDouble(MacroAssembler::DoubleLessThanOrEqualOrUnordered));
RUN(testMul32WithImmediates());
-#if CPU(ARM64)
- RUN(testMul32SignExtend());
-#endif
-
#if CPU(X86) || CPU(X86_64) || CPU(ARM64)
RUN(testCompareFloat(MacroAssembler::DoubleEqual));
RUN(testCompareFloat(MacroAssembler::DoubleNotEqual));
Modified: trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp (247010 => 247011)
--- trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp 2019-07-01 16:59:33 UTC (rev 247011)
@@ -177,34 +177,6 @@
break;
}
- case CheckMul: {
- if (isARM64() && m_value->child(0)->type() == Int32) {
- CheckValue* checkMul = m_value->as<CheckValue>();
-
- Value* left = m_insertionSet.insert<Value>(m_index, SExt32, m_origin, m_value->child(0));
- Value* right = m_insertionSet.insert<Value>(m_index, SExt32, m_origin, m_value->child(1));
- Value* mulResult = m_insertionSet.insert<Value>(m_index, Mul, m_origin, left, right);
- Value* mulResult32 = m_insertionSet.insert<Value>(m_index, Trunc, m_origin, mulResult);
- Value* upperResult = m_insertionSet.insert<Value>(m_index, Trunc, m_origin,
- m_insertionSet.insert<Value>(m_index, SShr, m_origin, mulResult, m_insertionSet.insert<Const32Value>(m_index, m_origin, 32)));
- Value* signBit = m_insertionSet.insert<Value>(m_index, SShr, m_origin,
- mulResult32,
- m_insertionSet.insert<Const32Value>(m_index, m_origin, 31));
- Value* hasOverflowed = m_insertionSet.insert<Value>(m_index, NotEqual, m_origin, upperResult, signBit);
-
- CheckValue* check = m_insertionSet.insert<CheckValue>(m_index, Check, m_origin, hasOverflowed);
- check->setGenerator(checkMul->generator());
- check->clobberEarly(checkMul->earlyClobbered());
- check->clobberLate(checkMul->lateClobbered());
- check->append(checkMul->constrainedChild(0));
- check->append(checkMul->constrainedChild(1));
-
- m_value->replaceWithIdentity(mulResult32);
- m_changed = true;
- }
- break;
- }
-
case Switch: {
SwitchValue* switchValue = m_value->as<SwitchValue>();
Vector<SwitchCase> cases;
Modified: trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp (247010 => 247011)
--- trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2019-07-01 16:59:33 UTC (rev 247011)
@@ -2602,27 +2602,6 @@
}
case Mul: {
- if (m_value->type() == Int64
- && isValidForm(MultiplySignExtend32, Arg::Tmp, Arg::Tmp, Arg::Tmp)
- && m_value->child(0)->opcode() == SExt32
- && !m_locked.contains(m_value->child(0))) {
- Value* opLeft = m_value->child(0);
- Value* left = opLeft->child(0);
- Value* opRight = m_value->child(1);
- Value* right = nullptr;
-
- if (opRight->opcode() == SExt32 && !m_locked.contains(opRight->child(0))) {
- right = opRight->child(0);
- } else if (m_value->child(1)->isRepresentableAs<int32_t>() && !m_locked.contains(m_value->child(1))) {
- // We just use the 64-bit const int as a 32 bit const int directly
- right = opRight;
- }
-
- if (right) {
- append(MultiplySignExtend32, tmp(left), tmp(right), tmp(m_value));
- return;
- }
- }
appendBinOp<Mul32, Mul64, MulDouble, MulFloat, Commutative>(
m_value->child(0), m_value->child(1));
return;
Modified: trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes (247010 => 247011)
--- trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes 2019-07-01 16:59:33 UTC (rev 247011)
@@ -261,9 +261,6 @@
arm64: MultiplyNeg64 U:G:64, U:G:64, ZD:G:64
Tmp, Tmp, Tmp
-arm64: MultiplySignExtend32 U:G:32, U:G:32, ZD:G:64
- Tmp, Tmp, Tmp
-
arm64: Div32 U:G:32, U:G:32, ZD:G:32
Tmp, Tmp, Tmp
Modified: trunk/Source/_javascript_Core/b3/testb3.cpp (247010 => 247011)
--- trunk/Source/_javascript_Core/b3/testb3.cpp 2019-07-01 16:57:03 UTC (rev 247010)
+++ trunk/Source/_javascript_Core/b3/testb3.cpp 2019-07-01 16:59:33 UTC (rev 247011)
@@ -1189,47 +1189,6 @@
CHECK(compileAndRun<int>(proc, a, b) == a * b);
}
-void testMulArgs32SignExtend(int a, int b)
-{
- Procedure proc;
- if (proc.optLevel() < 1)
- return;
- BasicBlock* root = proc.addBlock();
- Value* arg1 = root->appendNew<Value>(
- proc, Trunc, Origin(),
- root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
- Value* arg2 = root->appendNew<Value>(
- proc, Trunc, Origin(),
- root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
- Value* arg164 = root->appendNew<Value>(proc, SExt32, Origin(), arg1);
- Value* arg264 = root->appendNew<Value>(proc, SExt32, Origin(), arg2);
- Value* mul = root->appendNew<Value>(proc, Mul, Origin(), arg164, arg264);
- root->appendNewControlValue(proc, Return, Origin(), mul);
-
- auto code = compileProc(proc);
-
- CHECK(invoke<long int>(*code, a, b) == ((long int) a) * ((long int) b));
-}
-
-void testMulImm32SignExtend(const int a, int b)
-{
- Procedure proc;
- if (proc.optLevel() < 1)
- return;
- BasicBlock* root = proc.addBlock();
- Value* arg1 = root->appendNew<Const64Value>(proc, Origin(), a);
- Value* arg2 = root->appendNew<Value>(
- proc, Trunc, Origin(),
- root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
- Value* arg264 = root->appendNew<Value>(proc, SExt32, Origin(), arg2);
- Value* mul = root->appendNew<Value>(proc, Mul, Origin(), arg1, arg264);
- root->appendNewControlValue(proc, Return, Origin(), mul);
-
- auto code = compileProc(proc);
-
- CHECK(invoke<long int>(*code, b) == ((long int) a) * ((long int) b));
-}
-
void testMulLoadTwice()
{
auto test = [&] () {
@@ -14676,55 +14635,55 @@
void testMemoryFence()
{
Procedure proc;
-
+
BasicBlock* root = proc.addBlock();
-
+
root->appendNew<FenceValue>(proc, Origin());
root->appendNew<Value>(proc, Return, Origin(), root->appendIntConstant(proc, Origin(), Int32, 42));
-
+
auto code = compileProc(proc);
CHECK_EQ(invoke<int>(*code), 42);
if (isX86())
checkUsesInstruction(*code, "lock or $0x0, (%rsp)");
if (isARM64())
- checkUsesInstruction(*code, "dmb ish");
+ checkUsesInstruction(*code, "dmb ish");
checkDoesNotUseInstruction(*code, "mfence");
- checkDoesNotUseInstruction(*code, "dmb ishst");
+ checkDoesNotUseInstruction(*code, "dmb ishst");
}
void testStoreFence()
{
Procedure proc;
-
+
BasicBlock* root = proc.addBlock();
-
+
root->appendNew<FenceValue>(proc, Origin(), HeapRange::top(), HeapRange());
root->appendNew<Value>(proc, Return, Origin(), root->appendIntConstant(proc, Origin(), Int32, 42));
-
+
auto code = compileProc(proc);
CHECK_EQ(invoke<int>(*code), 42);
checkDoesNotUseInstruction(*code, "lock");
checkDoesNotUseInstruction(*code, "mfence");
if (isARM64())
- checkUsesInstruction(*code, "dmb ishst");
+ checkUsesInstruction(*code, "dmb ishst");
}
void testLoadFence()
{
Procedure proc;
-
+
BasicBlock* root = proc.addBlock();
-
+
root->appendNew<FenceValue>(proc, Origin(), HeapRange(), HeapRange::top());
root->appendNew<Value>(proc, Return, Origin(), root->appendIntConstant(proc, Origin(), Int32, 42));
-
+
auto code = compileProc(proc);
CHECK_EQ(invoke<int>(*code), 42);
checkDoesNotUseInstruction(*code, "lock");
checkDoesNotUseInstruction(*code, "mfence");
if (isARM64())
- checkUsesInstruction(*code, "dmb ish");
- checkDoesNotUseInstruction(*code, "dmb ishst");
+ checkUsesInstruction(*code, "dmb ish");
+ checkDoesNotUseInstruction(*code, "dmb ishst");
}
void testTrappingLoad()
@@ -15002,7 +14961,7 @@
usesCSRs |= csrs.get(regAtOffset.reg());
CHECK_EQ(usesCSRs, !pin);
};
-
+
go(true);
go(false);
}
@@ -17198,29 +17157,6 @@
Deque<RefPtr<SharedTask<void()>>> tasks;
auto shouldRun = [&] (const char* testName) -> bool {
- // FIXME: These tests fail <https://bugs.webkit.org/show_bug.cgi?id=199330>.
- if (!filter && isARM64()) {
- for (auto& failingTest : {
- "testReportUsedRegistersLateUseFollowedByEarlyDefDoesNotMarkUseAsDead",
- "testNegFloatWithUselessDoubleConversion",
- "testPinRegisters",
- }) {
- if (WTF::findIgnoringASCIICaseWithoutLength(testName, failingTest) != WTF::notFound) {
- dataLogLn("*** Warning: Skipping known-bad test: ", testName);
- return false;
- }
- }
- }
- if (!filter && isX86()) {
- for (auto& failingTest : {
- "testReportUsedRegistersLateUseFollowedByEarlyDefDoesNotMarkUseAsDead",
- }) {
- if (WTF::findIgnoringASCIICaseWithoutLength(testName, failingTest) != WTF::notFound) {
- dataLogLn("*** Warning: Skipping known-bad test: ", testName);
- return false;
- }
- }
- }
return !filter || WTF::findIgnoringASCIICaseWithoutLength(testName, filter) != WTF::notFound;
};
@@ -17341,21 +17277,8 @@
RUN(testMulImmArg(0, 2));
RUN(testMulImmArg(1, 0));
RUN(testMulImmArg(3, 3));
- RUN(testMulImm32SignExtend(1, 2));
- RUN(testMulImm32SignExtend(0, 2));
- RUN(testMulImm32SignExtend(1, 0));
- RUN(testMulImm32SignExtend(3, 3));
- RUN(testMulImm32SignExtend(0xFFFFFFFF, 0xFFFFFFFF));
- RUN(testMulImm32SignExtend(0xFFFFFFFE, 0xFFFFFFFF));
- RUN(testMulImm32SignExtend(0xFFFFFFFF, 0xFFFFFFFE));
RUN(testMulArgs32(1, 1));
RUN(testMulArgs32(1, 2));
- RUN(testMulArgs32(0xFFFFFFFF, 0xFFFFFFFF));
- RUN(testMulArgs32(0xFFFFFFFE, 0xFFFFFFFF));
- RUN(testMulArgs32SignExtend(1, 1));
- RUN(testMulArgs32SignExtend(1, 2));
- RUN(testMulArgs32SignExtend(0xFFFFFFFF, 0xFFFFFFFF));
- RUN(testMulArgs32SignExtend(0xFFFFFFFE, 0xFFFFFFFF));
RUN(testMulLoadTwice());
RUN(testMulAddArgsLeft());
RUN(testMulAddArgsRight());
