Commit ad83fa92 authored by Clemens Hammacher's avatar Clemens Hammacher Committed by Commit Bot

[wasm] Fix TODO and skip test on win32

In the {Fixed} variant, the {GrowingVsFixedModule} test first reserves
1GB of memory, then allocates another 1GB to add it to the module as
code. This uses too much memory on win32, making the test fail.
Before this CL, the {NativeModule} only reserved 128kB upfront (in
contrast to the actual expectation of the test).

Since all other aspects of this test are already covered by other
tests, we just skip this test on win32.
This allows us to resolve the TODO.

Drive-by: Clean up the unittests status file a bit.

R=mstarzinger@chromium.org

Bug: v8:9477
Change-Id: I575dd1a3f486e1805e0256e8ee6071246f2c24c4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1816505Reviewed-by: 's avatarMichael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63921}
parent 4921821b
......@@ -1577,13 +1577,10 @@ std::shared_ptr<NativeModule> WasmCodeManager::NewNativeModule(
}
// If we cannot add code space later, reserve enough address space up front.
// TODO(clemensh): Fix WasmCodeManagerTest and use {can_request_more} here.
bool can_add_code_space = !NativeModule::kNeedsFarJumpsBetweenCodeSpaces ||
FLAG_wasm_far_jump_table;
size_t code_vmem_size =
can_add_code_space ? ReservationSize(code_size_estimate,
module->num_declared_functions, 0)
: kMaxWasmCodeMemory;
can_request_more ? ReservationSize(code_size_estimate,
module->num_declared_functions, 0)
: kMaxWasmCodeMemory;
// The '--wasm-max-code-space-reservation' testing flag can be used to reduce
// the maximum size of the initial code space reservation (in MB).
......
......@@ -14,12 +14,12 @@
'RandomNumberGenerator.NextSampleInvalidParam': [SKIP],
'RandomNumberGenerator.NextSampleSlowInvalidParam1': [SKIP],
'RandomNumberGenerator.NextSampleSlowInvalidParam2': [SKIP],
}], # 'system == macos and asan'
}], # system == macos and asan
['(arch == arm or arch == mips) and not simulator_run', {
# Uses too much memory.
'Parameterized/WasmCodeManagerTest.GrowingVsFixedModule/Fixed': [SKIP]
}], # '(arch == arm or arch == mips) and not simulator_run'
}], # (arch == arm or arch == mips) and not simulator_run
##############################################################################
['lite_mode or variant == jitless', {
......@@ -37,18 +37,23 @@
['system == windows and asan', {
# BUG(893437).
'Torque*': [SKIP],
}], # 'system == windows and asan'
}], # system == windows and asan
['system == windows and arch == x64 and mode == release', {
# BUG(992783).
'Torque.ConditionalFields': [SKIP],
'Torque.UsingUnderscorePrefixedIdentifierError': [SKIP],
}], # 'system == windows and arch == x64 and mode == release'
}], # system == windows and arch == x64 and mode == release
['system == windows and arch == ia32', {
# Runs OOM on win32.
'Parameterized/WasmCodeManagerTest.GrowingVsFixedModule/Fixed': [SKIP],
}], # system == windows and arch == ia32
['tsan == True', {
# https://crbug.com/v8/9380
# The test is broken and needs to be fixed to use separate isolates.
'BackingStoreTest.RacyGrowWasmMemoryInPlace': [SKIP],
}], # 'tsan == True'
}], # tsan == True
]
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