mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1523876: Replace uses of test-also-wasm-compiler by test-also in wasm tests; r=lth 

--HG--
extra : rebase_source : b3db9e3815916c7d10d847f03625cfe79d492d5b
extra : amend_source : 91d0887c3c1743a8ad4049a9d8e458564291d3a0
This commit is contained in:
Benjamin Bouvier 2019-01-30 14:18:15 +01:00
Родитель 506304e224
Коммит 1d77cf0e4d
32 изменённых файлов: 32 добавлений и 63 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
js/src/jit-test/jit_test.py
Просмотреть файл

@ -215,20 +215,6 @@ def main(argv):
test_list = []
read_all = True
# No point in adding in noasmjs and wasm-baseline variants if the
# jitflags forbid asmjs in the first place. (This is to avoid getting a
# wasm-baseline run when requesting --jitflags=interp, but the test
# contains test-also-noasmjs.)
test_flags = get_jitflags(options.jitflags)
options.asmjs_enabled = True
options.wasm_enabled = True
if all(['--no-asmjs' in flags for flags in test_flags]):
options.asmjs_enabled = False
options.wasm_enabled = False
if all(['--wasm-compiler=none' in flags for flags in test_flags]):
options.asmjs_enabled = False
options.wasm_enabled = False
if options.run_binast:
code = 'print(getBuildConfiguration().binast)'
is_binast_enabled = subprocess.check_output([js_shell, '-e', code])
@ -329,6 +315,8 @@ def main(argv):
sys.exit(0)
# The full test list is ready. Now create copies for each JIT configuration.
test_flags = get_jitflags(options.jitflags)
test_list = [_ for test in test_list for _ in test.copy_variants(test_flags)]
job_list = (test for test in test_list)

2
js/src/jit-test/tests/asm.js/directives.txt
Просмотреть файл

@ -1 +1 @@
|jit-test| test-also-noasmjs
|jit-test| test-also=--no-asmjs

2
js/src/jit-test/tests/debug/bug1330339.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
if (!wasmDebuggingIsSupported())
throw "TestComplete";

2
js/src/jit-test/tests/debug/bug1330489-sps.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/bug1330489.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/bug1330491.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
if (!wasmDebuggingIsSupported())
throw "TestComplete";

2
js/src/jit-test/tests/debug/bug1331064.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/bug1331592.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
if (!wasmDebuggingIsSupported())
throw "TestComplete";

2
js/src/jit-test/tests/debug/bug1332493.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// Checking in debug frame is initialized properly during stack overflow.
var dbg;

2
js/src/jit-test/tests/debug/bug1343579.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Checking if Debugger.Script.isInCatchScope return false for wasm.
load(libdir + "wasm.js");

2
js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// Checking resumption values for 'null' at onEnterFrame.
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/wasm-06-onPop-null.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
// Checking resumption values for 'null' at frame's onPop.
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/wasm-06.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; error: TestComplete; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/wasm-07.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Checking existence of all frame.offset references during onEnterFrame,
// onLeaveFrame and onStep events in the source code, and that we can

2
js/src/jit-test/tests/debug/wasm-08.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Checking if we destroying work registers by breakpoint/step handler.
load(libdir + "wasm.js");

2
js/src/jit-test/tests/debug/wasm-09.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests debugEnabled state of wasm when allowUnobservedAsmJS == true.
load(libdir + "asserts.js");

2
js/src/jit-test/tests/debug/wasm-10.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts has inspectable locals.
load(libdir + "wasm.js");

2
js/src/jit-test/tests/debug/wasm-11.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Test single-stepping where the TLS register can be evicted by a non-trivial
// function body.

2
js/src/jit-test/tests/debug/wasm-12.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts have special URLs.

2
js/src/jit-test/tests/debug/wasm-breakpoint.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts handles basic breakpoint operations.
load(libdir + "wasm.js");

2
js/src/jit-test/tests/debug/wasm-get-return.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm frame opPop event can access function resumption value.
load(libdir + "wasm.js");

2
js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts have column and line to bytecode offset
// information when source text is generated.

2
js/src/jit-test/tests/debug/wasm-responseurls.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module can accept URL and sourceMapURL from response
// when instantiateStreaming is used.

2
js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module sourceMappingURL section is parsed.

2
js/src/jit-test/tests/debug/wasm-step.js
Просмотреть файл

@ -1,4 +1,4 @@
// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
// Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.

2
js/src/jit-test/tests/wasm/bench/directives.txt
Просмотреть файл

@ -1 +1 @@
|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js

2
js/src/jit-test/tests/wasm/directives.txt
Просмотреть файл

@ -1 +1 @@
|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js

2
js/src/jit-test/tests/wasm/regress/directives.txt
Просмотреть файл

@ -1 +1 @@
|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js

2
js/src/jit-test/tests/wasm/spec/directives.txt
Просмотреть файл

@ -1 +1 @@
|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm-testharness.js
|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm-testharness.js

2
js/src/jit-test/tests/wasm/timeout/directives.txt
Просмотреть файл

@ -1,2 +1,2 @@
|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering
|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2

19
js/src/tests/lib/jittests.py
Просмотреть файл

@ -127,11 +127,6 @@ class JitTest:
self.valgrind = False
# True means force Pacific time for the test
self.tz_pacific = False
# True means run with and without asm.js
self.test_also_noasmjs = False
# enabled.
# True means run with and and without wasm baseline compiler enabled.
self.test_also_wasm_baseline = False
# Additional files to include, in addition to prologue.js
self.other_includes = []
# List of other configurations to test with.
@ -165,8 +160,6 @@ class JitTest:
t.allow_overrecursed = self.allow_overrecursed
t.valgrind = self.valgrind
t.tz_pacific = self.tz_pacific
t.test_also_noasmjs = self.test_also_noasmjs
t.test_also_wasm_baseline = self.test_also_wasm_baseline
t.other_includes = self.other_includes[:]
t.test_also = self.test_also
t.test_join = self.test_join
@ -301,18 +294,6 @@ class JitTest:
test.valgrind = options.valgrind
elif name == 'tz-pacific':
test.tz_pacific = True
elif name == 'test-also-noasmjs':
if options.asmjs_enabled:
test.test_also.append(['--no-asmjs'])
elif name == 'test-also-wasm-compiler-ion':
if options.wasm_enabled:
test.test_also.append(['--wasm-compiler=ion'])
elif name == 'test-also-wasm-compiler-baseline':
if options.wasm_enabled:
test.test_also.append(['--wasm-compiler=baseline'])
elif name == 'test-also-wasm-tiering':
if options.wasm_enabled:
test.test_also.append(['--test-wasm-await-tier2'])
elif name.startswith('test-also='):
test.test_also.append([name[len('test-also='):]])
elif name.startswith('test-join='):

2
js/src/wasm/Makefile
Просмотреть файл

@ -23,7 +23,7 @@ update:
--use-sync \
--js ../jit-test/tests/wasm/spec \
--html ../../../testing/web-platform/mozilla/tests/wasm
echo "|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm-testharness.js" > ../jit-test/tests/wasm/spec/directives.txt
echo "|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm-testharness.js" > ../jit-test/tests/wasm/spec/directives.txt
echo "|jit-test| skip-if:true" > ../jit-test/tests/wasm/spec/harness/directives.txt
run: