Skip to content

V
V8
Commit 0e8b7ec8 authored by bradnelson's avatar bradnelson Committed by Commit bot
Browse files
Options

Remove wasm compile time option and enable wasm behind a runtime flag. 

Deferring enabling of tests to separate per platform CLs.

R=machenbach@chromium.org,titzer@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1553083003

Cr-Commit-Position: refs/heads/master@{#33123}
parent beef98f1
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 64 deletions
BUILD.gn
View file @ 0e8b7ec8
...@@ -871,6 +871,9 @@ source_set("v8_base") { ...@@ -871,6 +871,9 @@ source_set("v8_base") {
"src/compiler/value-numbering-reducer.h", "src/compiler/value-numbering-reducer.h",
"src/compiler/verifier.cc", "src/compiler/verifier.cc",
"src/compiler/verifier.h", "src/compiler/verifier.h",
"src/compiler/wasm-compiler.cc",
"src/compiler/wasm-compiler.h",
"src/compiler/wasm-linkage.cc",
"src/compiler/zone-pool.cc", "src/compiler/zone-pool.cc",
"src/compiler/zone-pool.h", "src/compiler/zone-pool.h",
"src/compiler.cc", "src/compiler.cc",
...@@ -1288,6 +1291,24 @@ source_set("v8_base") { ...@@ -1288,6 +1291,24 @@ source_set("v8_base") {
"src/version.h", "src/version.h",
"src/vm-state-inl.h", "src/vm-state-inl.h",
"src/vm-state.h", "src/vm-state.h",
"src/wasm/asm-wasm-builder.cc",
"src/wasm/asm-wasm-builder.h",
"src/wasm/ast-decoder.cc",
"src/wasm/ast-decoder.h",
"src/wasm/decoder.h",
"src/wasm/encoder.cc",
"src/wasm/encoder.h",
"src/wasm/module-decoder.cc",
"src/wasm/module-decoder.h",
"src/wasm/wasm-js.cc",
"src/wasm/wasm-js.h",
"src/wasm/wasm-macro-gen.h",
"src/wasm/wasm-module.cc",
"src/wasm/wasm-module.h",
"src/wasm/wasm-opcodes.cc",
"src/wasm/wasm-opcodes.h",
"src/wasm/wasm-result.cc",
"src/wasm/wasm-result.h",
"src/zone.cc", "src/zone.cc",
"src/zone.h", "src/zone.h",
"src/zone-allocator.h", "src/zone-allocator.h",
......
Makefile
View file @ 0e8b7ec8
...@@ -220,12 +220,6 @@ ifeq ($(arm_test_noprobe), on) ...@@ -220,12 +220,6 @@ ifeq ($(arm_test_noprobe), on)
GYPFLAGS += -Darm_test_noprobe=on GYPFLAGS += -Darm_test_noprobe=on
endif endif
# Optionally enable wasm prototype.
# Assume you've placed a link to v8-native-prototype in third_party/wasm.
ifeq ($(wasm), on)
GYPFLAGS += -Dv8_wasm=1
endif
# ----------------- available targets: -------------------- # ----------------- available targets: --------------------
# - "grokdump": rebuilds heap constants lists used by grokdump # - "grokdump": rebuilds heap constants lists used by grokdump
# - any arch listed in ARCHES (see below) # - any arch listed in ARCHES (see below)
......
build/features.gypi
View file @ 0e8b7ec8
...@@ -67,9 +67,6 @@ ...@@ -67,9 +67,6 @@
# Set to 1 to enable DCHECKs in release builds. # Set to 1 to enable DCHECKs in release builds.
'dcheck_always_on%': 0, 'dcheck_always_on%': 0,
# Set to 1 to enable building with wasm prototype.
'v8_wasm%': 0,
# Enable/disable JavaScript API accessors. # Enable/disable JavaScript API accessors.
'v8_js_accessors%': 0, 'v8_js_accessors%': 0,
}, },
...@@ -111,9 +108,6 @@ ...@@ -111,9 +108,6 @@
['dcheck_always_on!=0', { ['dcheck_always_on!=0', {
'defines': ['DEBUG',], 'defines': ['DEBUG',],
}], }],
['v8_wasm!=0', {
'defines': ['V8_WASM',],
}],
], # conditions ], # conditions
'configurations': { 'configurations': {
'DebugBaseCommon': { 'DebugBaseCommon': {
......
src/bootstrapper.cc
View file @ 0e8b7ec8
...@@ -16,11 +16,7 @@ ...@@ -16,11 +16,7 @@
#include "src/isolate-inl.h" #include "src/isolate-inl.h"
#include "src/snapshot/natives.h" #include "src/snapshot/natives.h"
#include "src/snapshot/snapshot.h" #include "src/snapshot/snapshot.h"
#include "third_party/fdlibm/fdlibm.h"
#if defined(V8_WASM)
#include "src/wasm/wasm-js.h" #include "src/wasm/wasm-js.h"
#endif
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -2941,11 +2937,9 @@ bool Genesis::InstallSpecialObjects(Handle<Context> native_context) { ...@@ -2941,11 +2937,9 @@ bool Genesis::InstallSpecialObjects(Handle<Context> native_context) {
JSObject::AddProperty(global, debug_string, global_proxy, DONT_ENUM); JSObject::AddProperty(global, debug_string, global_proxy, DONT_ENUM);
} }
#if defined(V8_WASM)
if (FLAG_expose_wasm) { if (FLAG_expose_wasm) {
WasmJs::Install(isolate, global); WasmJs::Install(isolate, global);
} }
#endif
return true; return true;
} }
......
src/d8.gyp
View file @ 0e8b7ec8
...@@ -101,9 +101,6 @@ ...@@ -101,9 +101,6 @@
'<(icu_gyp_path):icudata', '<(icu_gyp_path):icudata',
], ],
}], }],
['v8_wasm!=0', {
'include_dirs': ['../third_party/wasm'],
}],
], ],
}, },
{ {
......
test/cctest/cctest.gyp
View file @ 0e8b7ec8
...@@ -185,6 +185,9 @@ ...@@ -185,6 +185,9 @@
'test-weakmaps.cc', 'test-weakmaps.cc',
'test-weaksets.cc', 'test-weaksets.cc',
'trace-extension.cc', 'trace-extension.cc',
'wasm/test-run-wasm.cc',
'wasm/test-run-wasm-module.cc',
'wasm/test-signatures.h',
], ],
'conditions': [ 'conditions': [
['v8_target_arch=="ia32"', { ['v8_target_arch=="ia32"', {
...@@ -301,13 +304,6 @@ ...@@ -301,13 +304,6 @@
}, { }, {
'dependencies': ['../../tools/gyp/v8.gyp:v8'], 'dependencies': ['../../tools/gyp/v8.gyp:v8'],
}], }],
['v8_wasm!=0', {
'sources': [
'wasm/test-run-wasm.cc',
'wasm/test-run-wasm-module.cc',
'wasm/test-signatures.h',
],
}],
], ],
}, },
{ {
......
test/cctest/wasm/test-run-wasm.cc
View file @ 0e8b7ec8
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -3441,6 +3442,8 @@ TEST(Run_Wasm_I64UConvertF64) { ...@@ -3441,6 +3442,8 @@ TEST(Run_Wasm_I64UConvertF64) {
#endif #endif
// TODO(titzer): Fix and re-enable.
#if 0
TEST(Run_Wasm_I32SConvertF32) { TEST(Run_Wasm_I32SConvertF32) {
WasmRunner<int32_t> r(MachineType::Float32()); WasmRunner<int32_t> r(MachineType::Float32());
BUILD(r, WASM_I32_SCONVERT_F32(WASM_GET_LOCAL(0))); BUILD(r, WASM_I32_SCONVERT_F32(WASM_GET_LOCAL(0)));
...@@ -3497,6 +3500,7 @@ TEST(Run_Wasm_I32UConvertF64) { ...@@ -3497,6 +3500,7 @@ TEST(Run_Wasm_I32UConvertF64) {
} }
} }
} }
#endif
TEST(Run_Wasm_F64CopySign) { TEST(Run_Wasm_F64CopySign) {
......
test/mjsunit/mjsunit.status
View file @ 0e8b7ec8
...@@ -163,9 +163,6 @@ ...@@ -163,9 +163,6 @@
# issue 4078: # issue 4078:
'allocation-site-info': [PASS, NO_VARIANTS], 'allocation-site-info': [PASS, NO_VARIANTS],
# Native WASM is not yet enabled by default.
'wasm/*': [SKIP],
############################################################################## ##############################################################################
# Too slow in debug mode with --stress-opt mode. # Too slow in debug mode with --stress-opt mode.
'compiler/regress-stacktrace-methods': [PASS, ['mode == debug', SKIP]], 'compiler/regress-stacktrace-methods': [PASS, ['mode == debug', SKIP]],
...@@ -286,6 +283,9 @@ ...@@ -286,6 +283,9 @@
'regress/regress-crbug-474297': [PASS, ['mode == debug', SLOW]], 'regress/regress-crbug-474297': [PASS, ['mode == debug', SLOW]],
'strong/implicit-conversions': [PASS, SLOW], 'strong/implicit-conversions': [PASS, SLOW],
'strong/load-element-mutate-backing-store': [PASS, SLOW], 'strong/load-element-mutate-backing-store': [PASS, SLOW],
# TODO(bradnelson): Enable tests in a separate change.
'wasm/*': [SKIP],
}], # ALWAYS }], # ALWAYS
['novfp3 == True', { ['novfp3 == True', {
...@@ -748,6 +748,9 @@ ...@@ -748,6 +748,9 @@
'regress/debug*': [SKIP], 'regress/debug*': [SKIP],
'regress/regress-debug*': [SKIP], 'regress/regress-debug*': [SKIP],
# TODO(bradnelson): Figure out why these tests fail with ignition.
'wasm/*': [SKIP],
'allocation-folding': [SKIP], 'allocation-folding': [SKIP],
'api-call-after-bypassed-exception': [SKIP], 'api-call-after-bypassed-exception': [SKIP],
'apply-arguments-gc-safepoint': [SKIP], 'apply-arguments-gc-safepoint': [SKIP],
......
test/unittests/unittests.gyp
View file @ 0e8b7ec8
...@@ -110,6 +110,10 @@ ...@@ -110,6 +110,10 @@
'runtime/runtime-interpreter-unittest.cc', 'runtime/runtime-interpreter-unittest.cc',
'test-utils.h', 'test-utils.h',
'test-utils.cc', 'test-utils.cc',
'wasm/ast-decoder-unittest.cc',
'wasm/encoder-unittest.cc',
'wasm/module-decoder-unittest.cc',
'wasm/wasm-macro-gen-unittest.cc',
], ],
'conditions': [ 'conditions': [
['v8_target_arch=="arm"', { ['v8_target_arch=="arm"', {
...@@ -169,14 +173,6 @@ ...@@ -169,14 +173,6 @@
], ],
}, },
}], }],
['v8_wasm!=0', {
'sources': [
'wasm/ast-decoder-unittest.cc',
'wasm/encoder-unittest.cc',
'wasm/module-decoder-unittest.cc',
'wasm/wasm-macro-gen-unittest.cc',
],
}],
], ],
}, },
], ],
......
tools/gyp/v8.gyp
View file @ 0e8b7ec8
...@@ -648,6 +648,9 @@ ...@@ -648,6 +648,9 @@
'../../src/compiler/value-numbering-reducer.h', '../../src/compiler/value-numbering-reducer.h',
'../../src/compiler/verifier.cc', '../../src/compiler/verifier.cc',
'../../src/compiler/verifier.h', '../../src/compiler/verifier.h',
'../../src/compiler/wasm-compiler.cc',
'../../src/compiler/wasm-compiler.h',
'../../src/compiler/wasm-linkage.cc',
'../../src/compiler/zone-pool.cc', '../../src/compiler/zone-pool.cc',
'../../src/compiler/zone-pool.h', '../../src/compiler/zone-pool.h',
'../../src/compiler.cc', '../../src/compiler.cc',
...@@ -1070,6 +1073,24 @@ ...@@ -1070,6 +1073,24 @@
'../../src/version.h', '../../src/version.h',
'../../src/vm-state-inl.h', '../../src/vm-state-inl.h',
'../../src/vm-state.h', '../../src/vm-state.h',
'../../src/wasm/asm-wasm-builder.cc',
'../../src/wasm/asm-wasm-builder.h',
'../../src/wasm/ast-decoder.cc',
'../../src/wasm/ast-decoder.h',
'../../src/wasm/decoder.h',
'../../src/wasm/encoder.cc',
'../../src/wasm/encoder.h',
'../../src/wasm/module-decoder.cc',
'../../src/wasm/module-decoder.h',
'../../src/wasm/wasm-js.cc',
'../../src/wasm/wasm-js.h',
'../../src/wasm/wasm-macro-gen.h',
'../../src/wasm/wasm-module.cc',
'../../src/wasm/wasm-module.h',
'../../src/wasm/wasm-opcodes.cc',
'../../src/wasm/wasm-opcodes.h',
'../../src/wasm/wasm-result.cc',
'../../src/wasm/wasm-result.h',
'../../src/zone.cc', '../../src/zone.cc',
'../../src/zone.h', '../../src/zone.h',
'../../src/zone-allocator.h', '../../src/zone-allocator.h',
...@@ -1483,31 +1504,6 @@ ...@@ -1483,31 +1504,6 @@
}], }],
], ],
}], }],
['v8_wasm!=0', {
'sources': [
'../../src/compiler/wasm-compiler.cc',
'../../src/compiler/wasm-compiler.h',
'../../src/compiler/wasm-linkage.cc',
'../../src/wasm/asm-wasm-builder.cc',
'../../src/wasm/asm-wasm-builder.h',
'../../src/wasm/ast-decoder.cc',
'../../src/wasm/ast-decoder.h',
'../../src/wasm/decoder.h',
'../../src/wasm/encoder.cc',
'../../src/wasm/encoder.h',
'../../src/wasm/module-decoder.cc',
'../../src/wasm/module-decoder.h',
'../../src/wasm/wasm-js.cc',
'../../src/wasm/wasm-js.h',
'../../src/wasm/wasm-macro-gen.h',
'../../src/wasm/wasm-module.cc',
'../../src/wasm/wasm-module.h',
'../../src/wasm/wasm-opcodes.cc',
'../../src/wasm/wasm-opcodes.h',
'../../src/wasm/wasm-result.cc',
'../../src/wasm/wasm-result.h',
],
}],
], ],
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment