use etdump instead of event tracer

Differential Revision: D70356526

Author: cccclai

extension/module/module.cpp

@@ -66,7 +66,7 @@ runtime::Result<std::unique_ptr<runtime::DataLoader>> load_file(
 Module::Module(
     const std::string& file_path,
     const LoadMode load_mode,
-    std::unique_ptr<runtime::EventTracer> event_tracer)
+    std::unique_ptr<etdump::ETDumpGen> event_tracer)
     : file_path_(file_path),
       load_mode_(load_mode),
       memory_allocator_(std::make_unique<MallocMemoryAllocator>()),
@@ -81,7 +81,7 @@ Module::Module(
     const std::string& file_path,
     const std::string& data_map_path,
     const LoadMode load_mode,
-    std::unique_ptr<runtime::EventTracer> event_tracer)
+    std::unique_ptr<etdump::ETDumpGen> event_tracer)
     : file_path_(file_path),
       data_map_path_(data_map_path),
       load_mode_(load_mode),
@@ -97,8 +97,10 @@ Module::Module(
     std::unique_ptr<runtime::DataLoader> data_loader,
     std::unique_ptr<runtime::MemoryAllocator> memory_allocator,
     std::unique_ptr<runtime::MemoryAllocator> temp_allocator,
-    std::unique_ptr<runtime::EventTracer> event_tracer,
-    std::unique_ptr<runtime::DataLoader> data_map_loader)
+    std::unique_ptr<etdump::ETDumpGen> event_tracer,
+    std::unique_ptr<runtime::DataLoader> data_map_loader,
+    size_t debug_buffer_size,
+    runtime::Program::Verification program_verification)
     : data_loader_(std::move(data_loader)),
       memory_allocator_(
           memory_allocator ? std::move(memory_allocator)
@@ -108,15 +110,17 @@ Module::Module(
                          : std::make_unique<MallocMemoryAllocator>()),
       event_tracer_(std::move(event_tracer)),
       data_map_loader_(std::move(data_map_loader)),
-      data_map_(nullptr) {
+      data_map_(nullptr),
+      debug_buffer_size_(debug_buffer_size),
+      program_verification_(program_verification) {
   runtime::runtime_init();
 }
 
 Module::Module(
     std::shared_ptr<runtime::Program> program,
     std::unique_ptr<runtime::MemoryAllocator> memory_allocator,
     std::unique_ptr<runtime::MemoryAllocator> temp_allocator,
-    std::unique_ptr<runtime::EventTracer> event_tracer,
+    std::unique_ptr<etdump::ETDumpGen> event_tracer,
     std::unique_ptr<runtime::DataLoader> data_map_loader)
     : program_(std::move(program)),
       memory_allocator_(
@@ -129,6 +133,14 @@ Module::Module(
       data_map_loader_(std::move(data_map_loader)),
       data_map_(nullptr) {
   runtime::runtime_init();
+  if (event_tracer_ && debug_buffer_size_ > 0) {
+    // If a debug buffer was requested for the ETDump, allocate it and make
+    // sure its lifetime is as long as the event_tracer.
+    debug_buffer_ = std::make_unique<uint8_t[]>(debug_buffer_size_);
+    event_tracer_->set_debug_buffer(get_etdump_debug_buffer());
+    event_tracer_->set_event_tracer_debug_level(
+        runtime::EventTracerDebugLogLevel::kIntermediateOutputs);
+  }
 }
 
 runtime::Error Module::load(const runtime::Program::Verification verification) {
@@ -266,12 +278,6 @@ runtime::Error Module::set_inputs(
     const std::vector<runtime::EValue>& input_values) {
   ET_CHECK_OK_OR_RETURN_ERROR(load_method(method_name));
   auto& inputs = methods_.at(method_name).inputs;
-  ET_CHECK_OR_RETURN_ERROR(
-      inputs.size() == input_values.size(),
-      InvalidArgument,
-      "input size: %zu does not match method input size: %zu",
-      input_values.size(),
-      inputs.size());
   inputs = input_values;
   return runtime::Error::Ok;
 }
@@ -292,5 +298,6 @@ runtime::Error Module::set_output(
       output_tensor.mutable_data_ptr(), output_tensor.nbytes(), output_index);
 }
 
+
 } // namespace extension
 } // namespace executorch

extension/module/module.h

@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-
+#include <executorch/devtools/etdump/etdump_flatcc.h>
 #include <executorch/runtime/executor/program.h>
 
 namespace executorch {
@@ -49,7 +49,7 @@ class Module {
   explicit Module(
       const std::string& file_path,
       const LoadMode load_mode = LoadMode::MmapUseMlock,
-      std::unique_ptr<runtime::EventTracer> event_tracer = nullptr);
+      std::unique_ptr<etdump::ETDumpGen> event_tracer = nullptr);
 
   /**
    * Constructs an instance by loading a program from a file with specified
@@ -64,7 +64,7 @@ class Module {
       const std::string& file_path,
       const std::string& data_map_path,
       const LoadMode load_mode = LoadMode::MmapUseMlock,
-      std::unique_ptr<runtime::EventTracer> event_tracer = nullptr);
+      std::unique_ptr<etdump::ETDumpGen> event_tracer = nullptr);
 
   /**
    * Constructs an instance with the provided data loader and memory allocator.
@@ -80,8 +80,10 @@ class Module {
       std::unique_ptr<runtime::DataLoader> data_loader,
       std::unique_ptr<runtime::MemoryAllocator> memory_allocator = nullptr,
       std::unique_ptr<runtime::MemoryAllocator> temp_allocator = nullptr,
-      std::unique_ptr<runtime::EventTracer> event_tracer = nullptr,
-      std::unique_ptr<runtime::DataLoader> data_map_loader = nullptr);
+      std::unique_ptr<etdump::ETDumpGen> event_tracer = nullptr,
+      std::unique_ptr<runtime::DataLoader> data_map_loader = nullptr,
+      size_t debug_buffer_size = 0,
+      runtime::Program::Verification program_verification_ = runtime::Program::Verification::InternalConsistency);
 
   /**
    * Constructs an instance using an existing shared program.
@@ -98,7 +100,7 @@ class Module {
       std::shared_ptr<runtime::Program> program,
       std::unique_ptr<runtime::MemoryAllocator> memory_allocator = nullptr,
       std::unique_ptr<runtime::MemoryAllocator> temp_allocator = nullptr,
-      std::unique_ptr<runtime::EventTracer> event_tracer = nullptr,
+      std::unique_ptr<etdump::ETDumpGen> event_tracer = nullptr,
       std::unique_ptr<runtime::DataLoader> data_map_loader = nullptr);
 
   Module(const Module&) = delete;
@@ -438,10 +440,29 @@ class Module {
    * @returns A pointer to the EventTracer instance. Returns nullptr if no
    * EventTracer is set.
    */
-  inline runtime::EventTracer* event_tracer() const {
+  inline etdump::ETDumpGen* event_tracer() const {
     return event_tracer_.get();
   }
 
+  bool has_etdump() {
+    return static_cast<bool>(event_tracer_);
+  }
+
+  bool has_etdump_debug_buffer() const {
+    return static_cast<bool>(debug_buffer_);
+  }  
+
+  ET_NODISCARD
+  runtime::Span<uint8_t> get_etdump_debug_buffer() {
+    return runtime::Span<uint8_t>(debug_buffer_.get(), debug_buffer_size_);
+  }
+
+
+  ET_NODISCARD
+  runtime::Method& get_method(const std::string& method_name) {
+    return *methods_[method_name].method;
+  }
+
  private:
   struct MethodHolder {
     std::vector<std::vector<uint8_t>> planned_buffers;
@@ -459,9 +480,12 @@ class Module {
   std::unique_ptr<runtime::DataLoader> data_loader_;
   std::unique_ptr<runtime::MemoryAllocator> memory_allocator_;
   std::unique_ptr<runtime::MemoryAllocator> temp_allocator_;
-  std::unique_ptr<runtime::EventTracer> event_tracer_;
+  std::unique_ptr<etdump::ETDumpGen> event_tracer_;
   std::unique_ptr<runtime::DataLoader> data_map_loader_;
   std::unique_ptr<runtime::NamedDataMap> data_map_;
+  std::unique_ptr<uint8_t[]> debug_buffer_;
+  size_t debug_buffer_size_;
+  runtime::Program::Verification program_verification_ = runtime::Program::Verification::InternalConsistency;
 
  protected:
   std::unordered_map<std::string, MethodHolder> methods_;

extension/module/targets.bzl

@@ -28,6 +28,7 @@ def define_common_targets():
                 "//executorch/extension/flat_tensor:flat_tensor_data_map",
             ],
             exported_deps = [
+                "//executorch/devtools/etdump:etdump_flatcc" + aten_suffix,
                 "//executorch/runtime/executor:program" + aten_suffix,
             ],
         )