Commit 59076a3b authored by Maya Lekova's avatar Maya Lekova Committed by Commit Bot

Revert "[wasm][ukm] Add tests for Wasm events"

This reverts commit d7b20edc.

Reason for revert: Introduces data races - https://ci.chromium.org/p/v8/builders/ci/V8%20Linux64%20TSAN/32898

Original change's description:
> [wasm][ukm] Add tests for Wasm events
> 
> Ensure that events are triggered when a module is decoded, compiled,
> instantiated and tiered-up.
> 
> R=​clemensb@chromium.org
> 
> Bug: chromium:1092417
> 
> Change-Id: I9dc87957fc03023c5ab1c4f49e865957c8324e1a
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2351676
> Commit-Queue: Emanuel Ziegler <ecmziegler@chromium.org>
> Reviewed-by: Clemens Backes <clemensb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#69508}

TBR=clemensb@chromium.org,ecmziegler@chromium.org

Change-Id: I9bcfeda1048939a8142f5003b03feab399f9de96
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1092417
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2366785Reviewed-by: 's avatarMaya Lekova <mslekova@chromium.org>
Commit-Queue: Maya Lekova <mslekova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69509}
parent d7b20edc
...@@ -2475,7 +2475,6 @@ void AsyncStreamingProcessor::OnFinishedChunk() { ...@@ -2475,7 +2475,6 @@ void AsyncStreamingProcessor::OnFinishedChunk() {
void AsyncStreamingProcessor::OnFinishedStream(OwnedVector<uint8_t> bytes) { void AsyncStreamingProcessor::OnFinishedStream(OwnedVector<uint8_t> bytes) {
TRACE_STREAMING("Finish stream...\n"); TRACE_STREAMING("Finish stream...\n");
DCHECK_EQ(NativeModuleCache::PrefixHash(bytes.as_vector()), prefix_hash_); DCHECK_EQ(NativeModuleCache::PrefixHash(bytes.as_vector()), prefix_hash_);
decoder_.SetModuleWireBytes(bytes.begin(), bytes.end());
ModuleResult result = decoder_.FinishDecoding(false); ModuleResult result = decoder_.FinishDecoding(false);
if (result.failed()) { if (result.failed()) {
FinishAsyncCompileJobWithError(result.error()); FinishAsyncCompileJobWithError(result.error());
......
...@@ -295,8 +295,6 @@ class ModuleDecoderImpl : public Decoder { ...@@ -295,8 +295,6 @@ class ModuleDecoderImpl : public Decoder {
explicit ModuleDecoderImpl(const WasmFeatures& enabled, ModuleOrigin origin) explicit ModuleDecoderImpl(const WasmFeatures& enabled, ModuleOrigin origin)
: Decoder(nullptr, nullptr), : Decoder(nullptr, nullptr),
enabled_features_(enabled), enabled_features_(enabled),
module_start_(nullptr),
module_end_(nullptr),
origin_(FLAG_assume_asmjs_origin ? kAsmJsSloppyOrigin : origin) {} origin_(FLAG_assume_asmjs_origin ? kAsmJsSloppyOrigin : origin) {}
ModuleDecoderImpl(const WasmFeatures& enabled, const byte* module_start, ModuleDecoderImpl(const WasmFeatures& enabled, const byte* module_start,
...@@ -308,13 +306,6 @@ class ModuleDecoderImpl : public Decoder { ...@@ -308,13 +306,6 @@ class ModuleDecoderImpl : public Decoder {
error(start_, "end is less than start"); error(start_, "end is less than start");
end_ = start_; end_ = start_;
} }
SetModuleWireBytes(module_start, module_end);
}
void SetModuleWireBytes(const byte* module_start, const byte* module_end) {
DCHECK_NOT_NULL(module_start);
DCHECK_NOT_NULL(module_end);
DCHECK_GE(module_end, module_start);
module_start_ = module_start; module_start_ = module_start;
module_end_ = module_end; module_end_ = module_end;
} }
...@@ -1223,7 +1214,7 @@ class ModuleDecoderImpl : public Decoder { ...@@ -1223,7 +1214,7 @@ class ModuleDecoderImpl : public Decoder {
if (metrics_) { if (metrics_) {
metrics_->success = ok() && !intermediate_error_.has_error(); metrics_->success = ok() && !intermediate_error_.has_error();
metrics_->module_size_in_bytes = module_end_ - module_start_; metrics_->module_size_in_bytes = end() - start();
metrics_->function_count = module_->num_declared_functions; metrics_->function_count = module_->num_declared_functions;
metrics_.reset(); metrics_.reset();
} }
...@@ -2228,11 +2219,6 @@ const std::shared_ptr<WasmModule>& ModuleDecoder::shared_module() const { ...@@ -2228,11 +2219,6 @@ const std::shared_ptr<WasmModule>& ModuleDecoder::shared_module() const {
return impl_->shared_module(); return impl_->shared_module();
} }
void ModuleDecoder::SetModuleWireBytes(const byte* module_start,
const byte* module_end) {
impl_->SetModuleWireBytes(module_start, module_end);
}
void ModuleDecoder::StartDecoding( void ModuleDecoder::StartDecoding(
Counters* counters, std::shared_ptr<metrics::Recorder> metrics_recorder, Counters* counters, std::shared_ptr<metrics::Recorder> metrics_recorder,
v8::metrics::Recorder::ContextId context_id, AccountingAllocator* allocator, v8::metrics::Recorder::ContextId context_id, AccountingAllocator* allocator,
......
...@@ -199,8 +199,6 @@ class ModuleDecoder { ...@@ -199,8 +199,6 @@ class ModuleDecoder {
explicit ModuleDecoder(const WasmFeatures& enabled); explicit ModuleDecoder(const WasmFeatures& enabled);
~ModuleDecoder(); ~ModuleDecoder();
void SetModuleWireBytes(const byte* module_start, const byte* module_end);
void StartDecoding(Counters* counters, void StartDecoding(Counters* counters,
std::shared_ptr<metrics::Recorder> metrics_recorder, std::shared_ptr<metrics::Recorder> metrics_recorder,
v8::metrics::Recorder::ContextId context_id, v8::metrics::Recorder::ContextId context_id,
......
...@@ -676,7 +676,7 @@ Vector<byte> WasmCodeAllocator::AllocateForCodeInRegion( ...@@ -676,7 +676,7 @@ Vector<byte> WasmCodeAllocator::AllocateForCodeInRegion(
} }
DCHECK(IsAligned(code_space.begin(), kCodeAlignment)); DCHECK(IsAligned(code_space.begin(), kCodeAlignment));
allocated_code_space_.Merge(code_space); allocated_code_space_.Merge(code_space);
generated_code_size_.fetch_add(code_space.size(), std::memory_order_release); generated_code_size_.fetch_add(code_space.size(), std::memory_order_relaxed);
TRACE_HEAP("Code alloc for %p: 0x%" PRIxPTR ",+%zu\n", this, TRACE_HEAP("Code alloc for %p: 0x%" PRIxPTR ",+%zu\n", this,
code_space.begin(), size); code_space.begin(), size);
......
...@@ -304,7 +304,6 @@ v8_source_set("cctest_sources") { ...@@ -304,7 +304,6 @@ v8_source_set("cctest_sources") {
"wasm/test-wasm-debug-evaluate.cc", "wasm/test-wasm-debug-evaluate.cc",
"wasm/test-wasm-debug-evaluate.h", "wasm/test-wasm-debug-evaluate.h",
"wasm/test-wasm-import-wrapper-cache.cc", "wasm/test-wasm-import-wrapper-cache.cc",
"wasm/test-wasm-metrics.cc",
"wasm/test-wasm-serialization.cc", "wasm/test-wasm-serialization.cc",
"wasm/test-wasm-shared-engine.cc", "wasm/test-wasm-shared-engine.cc",
"wasm/test-wasm-stack.cc", "wasm/test-wasm-stack.cc",
......
...@@ -508,7 +508,6 @@ ...@@ -508,7 +508,6 @@
'test-wasm-codegen/*': [SKIP], 'test-wasm-codegen/*': [SKIP],
'test-wasm-debug-evaluate/*': [SKIP], 'test-wasm-debug-evaluate/*': [SKIP],
'test-wasm-import-wrapper-cache/*': [SKIP], 'test-wasm-import-wrapper-cache/*': [SKIP],
'test-wasm-metrics/*': [SKIP],
'test-wasm-serialization/*': [SKIP], 'test-wasm-serialization/*': [SKIP],
'test-wasm-shared-engine/*': [SKIP], 'test-wasm-shared-engine/*': [SKIP],
'test-wasm-stack/*': [SKIP], 'test-wasm-stack/*': [SKIP],
......
This diff is collapsed.
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