From 9fbe872137e45542b609ffe46a86379fa64ed066 Mon Sep 17 00:00:00 2001 From: mstarzinger Date: Fri, 16 Jan 2015 04:53:24 -0800 Subject: [PATCH] Enable test coverage for --turbo-deoptimization mode. R=jarin@chromium.org Review URL: https://codereview.chromium.org/845193004 Cr-Commit-Position: refs/heads/master@{#26102} --- test/benchmarks/testcfg.py | 2 +- test/cctest/cctest.status | 30 ++++------------- test/mjsunit/mjsunit.status | 44 ++++--------------------- test/unittests/compiler/js-operator-unittest.cc | 2 +- tools/testrunner/local/testsuite.py | 2 +- 5 files changed, 17 insertions(+), 63 deletions(-) diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py index 29e0c37..6607bef 100644 --- a/test/benchmarks/testcfg.py +++ b/test/benchmarks/testcfg.py @@ -186,7 +186,7 @@ class BenchmarksTestSuite(testsuite.TestSuite): # Both --nocrankshaft and --stressopt are very slow. Add TF but without # always opt to match the way the benchmarks are run for performance # testing. - return [[], ["--turbo-asm", "--turbo-filter=*"]] + return [[], ["--turbo-filter=*"]] def GetSuite(name, root): diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index 7318456..bb3cc6c 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -90,29 +90,13 @@ # BUG(3742). 'test-mark-compact/MarkCompactCollector': [PASS, ['arch==arm', NO_VARIANTS]], - # Support for %GetFrameDetails is missing and requires checkpoints. - 'test-api/Regress385349': [PASS, NO_VARIANTS], - 'test-debug/DebuggerStatement': [PASS, NO_VARIANTS], - 'test-debug/DebuggerStatementBreakpoint': [PASS, NO_VARIANTS], - 'test-debug/DebugEvaluateWithCodeGenerationDisallowed': [PASS, NO_VARIANTS], - 'test-debug/DebugStepNatives': [PASS, NO_VARIANTS], - 'test-debug/DebugStepFunctionCall': [PASS, NO_VARIANTS], - 'test-debug/DebugStepFunctionApply': [PASS, NO_VARIANTS], - 'test-debug/ScriptNameAndData': [PASS, NO_VARIANTS], - 'test-debug/ContextData': [PASS, NO_VARIANTS], - 'test-debug/DebugBreakInMessageHandler': [PASS, NO_VARIANTS], - 'test-debug/CallFunctionInDebugger': [PASS, NO_VARIANTS], - 'test-debug/CallingContextIsNotDebugContext': [PASS, NO_VARIANTS], - 'test-debug/DebugEventContext': [PASS, NO_VARIANTS], - 'test-debug/DebugBreakInline': [PASS, NO_VARIANTS], - 'test-debug/BreakMessageWhenMessageHandlerIsReset': [PASS, NO_VARIANTS], - 'test-debug/DebugBreak': [PASS, NO_VARIANTS], - 'test-debug/DebugBreakFunctionApply': [PASS, NO_VARIANTS], - 'test-debug/DebugBreakStackInspection': [PASS, NO_VARIANTS], - 'test-debug/DeoptimizeDuringDebugBreak': [PASS, NO_VARIANTS], - 'test-debug/DisableBreak': [PASS, NO_VARIANTS], - 'test-debug/NoDebugBreakInAfterCompileMessageHandler': [PASS, NO_VARIANTS], - 'test-debug/RegExpDebugBreak': [PASS, NO_VARIANTS], + # TODO(jarin): Some tests don't like --turbo-deoptimzation very much. + 'test-api/ApiUncaughtExceptionInObjectObserve': [PASS, NO_VARIANTS], + 'test-api/GetPrototypeAccessControl': [PASS, NO_VARIANTS], + 'test-api/Regress93759': [PASS, NO_VARIANTS], + 'test-debug/DebugBreakOnExceptionInObserveCallback': [PASS, NO_VARIANTS], + 'test-object-observe/DeliveryCallbackThrows': [PASS, NO_VARIANTS], + 'test-js-typed-lowering/JSToNumberOfNumberOrOtherPrimitive': [PASS, NO_VARIANTS], # TODO(titzer): Triggers bug in late control reduction. 'test-run-inlining/InlineLoopGuardedEmpty': [SKIP], diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 26ec10b..1f28e95 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -76,49 +76,19 @@ 'whitespaces': [PASS, NO_VARIANTS], 'compiler/osr-assert': [PASS, NO_VARIANTS], 'regress/regress-2185-2': [PASS, NO_VARIANTS], + 'regress/regress-2612': [PASS, NO_VARIANTS], # Issue 3660: Replacing activated TurboFan frames by unoptimized code does # not work, but we expect it to not crash. 'debug-step-turbofan': [PASS, FAIL], - # Support for %GetFrameDetails is missing and requires checkpoints. - 'debug-evaluate-bool-constructor': [PASS, NO_VARIANTS], - 'debug-evaluate-const': [PASS, NO_VARIANTS], - 'debug-evaluate-locals-optimized-double': [PASS, NO_VARIANTS], - 'debug-evaluate-locals-optimized': [PASS, NO_VARIANTS], - 'debug-evaluate-locals': [PASS, NO_VARIANTS], - 'debug-evaluate-with-context': [PASS, NO_VARIANTS], - 'debug-liveedit-double-call': [PASS, NO_VARIANTS], - 'debug-liveedit-restart-frame': [PASS, NO_VARIANTS], - 'debug-return-value': [PASS, NO_VARIANTS], - 'debug-set-variable-value': [PASS, NO_VARIANTS], - 'debug-step-stub-callfunction': [PASS, NO_VARIANTS], - 'debug-stepin-accessor': [PASS, NO_VARIANTS], - 'debug-stepin-builtin': [PASS, NO_VARIANTS], - 'debug-stepin-constructor': [PASS, NO_VARIANTS], - 'debug-stepin-function-call': [PASS, NO_VARIANTS], - 'debug-stepnext-do-while': [PASS, NO_VARIANTS], - 'debug-stepout-recursive-function': [PASS, NO_VARIANTS], - 'debug-stepout-scope-part1': [PASS, NO_VARIANTS], - 'debug-stepout-scope-part2': [PASS, NO_VARIANTS], - 'debug-stepout-scope-part3': [PASS, NO_VARIANTS], - 'debug-stepout-scope-part7': [PASS, NO_VARIANTS], - 'debug-stepout-to-builtin': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-in-constructor': [PASS, NO_VARIANTS], - 'es6/debug-promises/reject-in-constructor': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-with-undefined-reject': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-with-throw-in-reject': [PASS, NO_VARIANTS], - 'es6/debug-promises/reject-with-throw-in-reject': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-uncaught-all': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-uncaught-uncaught': [PASS, NO_VARIANTS], - 'es6/debug-promises/reject-uncaught-late': [PASS, NO_VARIANTS], - 'es6/debug-promises/throw-caught-by-default-reject-handler': [PASS, NO_VARIANTS], - 'es6/generators-debug-scopes': [PASS, NO_VARIANTS], - 'harmony/debug-blockscopes': [PASS, NO_VARIANTS], - 'regress/regress-1081309': [PASS, NO_VARIANTS], - 'regress/regress-269': [PASS, NO_VARIANTS], + # TODO(jarin): Some tests don't like --turbo-deoptimzation very much. + 'asm/embenchen/lua_binarytrees': [SKIP], + 'es6/symbols': [PASS, NO_VARIANTS], + 'es7/object-observe-debug-event': [PASS, NO_VARIANTS], + 'harmony/classes': [PASS, NO_VARIANTS], + 'regress/regress-354433': [PASS, NO_VARIANTS], # only on ARM simulator. 'regress/regress-crbug-259300': [PASS, NO_VARIANTS], - 'regress/regress-frame-details-null-receiver': [PASS, NO_VARIANTS], # TODO(arv): TurboFan does not yet add [[HomeObject]] as needed. 'harmony/object-literals-super': [PASS, NO_VARIANTS], diff --git a/test/unittests/compiler/js-operator-unittest.cc b/test/unittests/compiler/js-operator-unittest.cc index 7aa0c64..912f984 100644 --- a/test/unittests/compiler/js-operator-unittest.cc +++ b/test/unittests/compiler/js-operator-unittest.cc @@ -66,7 +66,7 @@ const SharedOperator kSharedOperators[] = { SHARED(Modulus, Operator::kNoProperties, 2, 1, 1, 1, 1, 1), SHARED(UnaryNot, Operator::kPure, 1, 0, 0, 0, 1, 0), SHARED(ToBoolean, Operator::kPure, 1, 0, 0, 0, 1, 0), - SHARED(ToNumber, Operator::kNoProperties, 1, 0, 1, 1, 1, 1), + SHARED(ToNumber, Operator::kNoProperties, 1, 1, 1, 1, 1, 1), SHARED(ToString, Operator::kNoProperties, 1, 0, 1, 1, 1, 1), SHARED(ToName, Operator::kNoProperties, 1, 0, 1, 1, 1, 1), SHARED(ToObject, Operator::kNoProperties, 1, 1, 1, 1, 1, 1), diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py index 84f07fe..f3178d8 100644 --- a/tools/testrunner/local/testsuite.py +++ b/tools/testrunner/local/testsuite.py @@ -38,7 +38,7 @@ from ..objects import testcase VARIANT_FLAGS = { "default": [], "stress": ["--stress-opt", "--always-opt"], - "turbofan": ["--turbo-asm", "--turbo-filter=*", "--always-opt"], + "turbofan": ["--turbo-deoptimization", "--turbo-filter=*", "--always-opt"], "nocrankshaft": ["--nocrankshaft"]} FAST_VARIANT_FLAGS = [ -- 2.7.4