diff options
Diffstat (limited to 'deps/v8/tools/testrunner/local')
| -rw-r--r-- | deps/v8/tools/testrunner/local/execution.py | 12 | ||||
| -rw-r--r-- | deps/v8/tools/testrunner/local/testsuite.py | 2 | ||||
| -rw-r--r-- | deps/v8/tools/testrunner/local/variants.py | 22 |
3 files changed, 20 insertions, 16 deletions
diff --git a/deps/v8/tools/testrunner/local/execution.py b/deps/v8/tools/testrunner/local/execution.py index d5b519aadb..dc55129a14 100644 --- a/deps/v8/tools/testrunner/local/execution.py +++ b/deps/v8/tools/testrunner/local/execution.py @@ -62,17 +62,18 @@ ProcessContext = collections.namedtuple( "process_context", ["suites", "context"]) -def MakeProcessContext(context): +def MakeProcessContext(context, suite_names): """Generate a process-local context. This reloads all suites per process and stores the global context. Args: context: The global context from the test runner. + suite_names (list of str): Suite names as loaded by the parent process. + Load the same suites in each subprocess. """ - suite_paths = utils.GetSuitePaths(TEST_DIR) suites = {} - for root in suite_paths: + for root in suite_names: # Don't reinitialize global state as this is concurrently called from # different processes. suite = testsuite.TestSuite.LoadTestSuite( @@ -198,7 +199,8 @@ class Runner(object): self.perfdata = self.perf_data_manager.GetStore(context.arch, context.mode) self.perf_failures = False self.printed_allocations = False - self.tests = [ t for s in suites for t in s.tests ] + self.tests = [t for s in suites for t in s.tests] + self.suite_names = [s.name for s in suites] # Always pre-sort by status file, slowest tests first. slow_key = lambda t: statusfile.IsSlow(t.outcomes) @@ -353,7 +355,7 @@ class Runner(object): fn=RunTest, gen=gen_tests(), process_context_fn=MakeProcessContext, - process_context_args=[self.context], + process_context_args=[self.context, self.suite_names], ) for result in it: if result.heartbeat: diff --git a/deps/v8/tools/testrunner/local/testsuite.py b/deps/v8/tools/testrunner/local/testsuite.py index f7fa19b20a..68f39d6b4a 100644 --- a/deps/v8/tools/testrunner/local/testsuite.py +++ b/deps/v8/tools/testrunner/local/testsuite.py @@ -71,7 +71,7 @@ class TestSuite(object): f = None try: (f, pathname, description) = imp.find_module("testcfg", [root]) - module = imp.load_module("testcfg", f, pathname, description) + module = imp.load_module(name + "_testcfg", f, pathname, description) return module.GetSuite(name, root) except ImportError: # Use default if no testcfg is present. diff --git a/deps/v8/tools/testrunner/local/variants.py b/deps/v8/tools/testrunner/local/variants.py index 2ad00cff2a..0dba0d9579 100644 --- a/deps/v8/tools/testrunner/local/variants.py +++ b/deps/v8/tools/testrunner/local/variants.py @@ -10,11 +10,12 @@ ALL_VARIANT_FLAGS = { "turbofan_opt": [["--turbo", "--always-opt"]], "noturbofan": [["--no-turbo"]], "noturbofan_stress": [["--no-turbo", "--stress-opt", "--always-opt"]], - "fullcode": [["--nocrankshaft", "--no-turbo"]], - # No optimization actually means no profile guided optimization - - # %OptimizeFunctionOnNextCall still works. - "nooptimization": [["--nocrankshaft"]], - "asm_wasm": [["--validate-asm", "--fast-validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], + "fullcode": [["--noopt", "--no-turbo"]], + # No optimization means disable all optimizations. OptimizeFunctionOnNextCall + # would not force optimization too. It turns into a Nop. Please see + # https://chromium-review.googlesource.com/c/452620/ for more discussion. + "nooptimization": [["--noopt"]], + "asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]], } @@ -25,11 +26,12 @@ FAST_VARIANT_FLAGS = { "turbofan": [["--turbo"]], "noturbofan": [["--no-turbo"]], "noturbofan_stress": [["--no-turbo", "--stress-opt"]], - "fullcode": [["--nocrankshaft", "--no-turbo"]], - # No optimization actually means no profile guided optimization - - # %OptimizeFunctionOnNextCall still works. - "nooptimization": [["--nocrankshaft"]], - "asm_wasm": [["--validate-asm", "--fast-validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], + "fullcode": [["--noopt", "--no-turbo"]], + # No optimization means disable all optimizations. OptimizeFunctionOnNextCall + # would not force optimization too. It turns into a Nop. Please see + # https://chromium-review.googlesource.com/c/452620/ for more discussion. + "nooptimization": [["--noopt"]], + "asm_wasm": [["--validate-asm", "--stress-validate-asm", "--suppress-asm-messages"]], "wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]], } |