Support optrace

Differential Revision: D64941627

Pull Request resolved: #6535

Author: limintang

backends/qualcomm/runtime/backends/QnnFunctionInterface.h

@@ -70,6 +70,7 @@ class QnnInterface {
   DEFINE_SHIM_FUNCTION_INTERFACE(log_set_log_level, logSetLogLevel);
   // --------- QnnProfile ---------
   DEFINE_SHIM_FUNCTION_INTERFACE(profile_create, profileCreate);
+  DEFINE_SHIM_FUNCTION_INTERFACE(profile_set_config, profileSetConfig);
   DEFINE_SHIM_FUNCTION_INTERFACE(profile_get_events, profileGetEvents);
   DEFINE_SHIM_FUNCTION_INTERFACE(profile_get_sub_events, profileGetSubEvents);
   DEFINE_SHIM_FUNCTION_INTERFACE(profile_get_event_data, profileGetEventData);

backends/qualcomm/runtime/backends/QnnGraphCommon.h

@@ -52,7 +52,7 @@ class QnnGraph {
 
   Qnn_ErrorHandle_t GraphFinalize() {
     return implementation_.GetQnnInterface().qnn_graph_finalize(
-        handle_, nullptr /* profile_handle */, nullptr /* signal_handle */);
+        handle_, profile_->GetHandle(), nullptr /* signal_handle */);
   };
   Qnn_ErrorHandle_t ProfileExecuteData(
       executorch::runtime::EventTracer* event_tracer) {
@@ -62,6 +62,10 @@ class QnnGraph {
     return handle_;
   }
 
+  QnnProfile* GetProfile() {
+    return profile_.get();
+  }
+
  protected:
   virtual executorch::runtime::Error MakeConfig(
       std::vector<const QnnGraph_Config_t*>& config) {

backends/qualcomm/runtime/backends/QnnProfiler.cpp

@@ -19,8 +19,20 @@ QnnProfile::QnnProfile(
     : handle_(nullptr), implementation_(implementation), backend_(backend) {
   if (profile_level != QnnExecuTorchProfileLevel::kProfileOff) {
     const QnnInterface& qnn_interface = implementation_.GetQnnInterface();
+
+    QnnProfile_Level_t qnnProfileLevel = 0;
+    if (profile_level == QnnExecuTorchProfileLevel::kProfileBasic) {
+      qnnProfileLevel = QNN_PROFILE_LEVEL_BASIC;
+    } else if (profile_level == QnnExecuTorchProfileLevel::kProfileDetailed
+        || profile_level == QnnExecuTorchProfileLevel::kProfileOptrace) {
+      qnnProfileLevel = QNN_PROFILE_LEVEL_DETAILED;
+    } else {
+      QNN_EXECUTORCH_LOG_WARN("Invalid profile level");
+      return;
+    }
+
     Qnn_ErrorHandle_t error = qnn_interface.qnn_profile_create(
-        backend_->GetHandle(), static_cast<int>(profile_level), &handle_);
+        backend_->GetHandle(), qnnProfileLevel, &handle_);
     if (error != QNN_SUCCESS) {
       QNN_EXECUTORCH_LOG_WARN(
           "Failed to create profile_handle for backend "
@@ -31,6 +43,27 @@ QnnProfile::QnnProfile(
       // ignore error and continue to create backend handle...
       handle_ = nullptr;
     }
+
+    if (profile_level == QnnExecuTorchProfileLevel::kProfileOptrace) {
+      if (handle_ == nullptr) {
+        QNN_EXECUTORCH_LOG_WARN("Prfoile handle is null, cannot enable optrace");
+        return;
+      }
+
+      QnnProfile_Config_t qnnProfileConfig = QNN_PROFILE_CONFIG_INIT;
+      qnnProfileConfig.option = QNN_PROFILE_CONFIG_OPTION_ENABLE_OPTRACE;
+      std::array<const QnnProfile_Config_t*, 2> profileConfigs = {
+          &qnnProfileConfig, nullptr};
+      error = qnn_interface.qnn_profile_set_config(handle_, profileConfigs.data());
+
+      if (error != QNN_SUCCESS) {
+        QNN_EXECUTORCH_LOG_WARN(
+            "Failed to set optrace for backend "
+            " %u, error=%d",
+            qnn_interface.GetBackendId(),
+            QNN_GET_ERROR_CODE(error));
+      }
+    }
   }
 }
 

backends/qualcomm/serialization/qnn_compile_spec_schema.py

@@ -115,6 +115,7 @@ class QnnExecuTorchProfileLevel(IntEnum):
     kProfileOff = 0
     kProfileBasic = 1
     kProfileDetailed = 2
+    kProfileOptrace = 3
 
 
 @dataclass

backends/qualcomm/serialization/schema.fbs

@@ -135,6 +135,7 @@ enum QnnExecuTorchProfileLevel: int {
   kProfileOff = 0,
   kProfileBasic,
   kProfileDetailed,
+  kProfileOptrace,
 }
 
 /// QNN backends currently supported

backends/qualcomm/utils/utils.py

@@ -770,6 +770,7 @@ def generate_qnn_executorch_compiler_spec(
     online_prepare: bool = False,
     dump_intermediate_outputs: bool = False,
     profile: bool = False,
+    optrace: bool = False,
     shared_buffer: bool = False,
     is_from_context_binary: bool = False,
 ) -> List[CompileSpec]:
@@ -831,7 +832,11 @@ def generate_qnn_executorch_compiler_spec(
     if saver:
         qnn_executorch_options.library_path = "libQnnSaver.so"
 
-    if profile:
+    if optrace:
+        qnn_executorch_options.profile_level = (
+            QnnExecuTorchProfileLevel.kProfileOptrace
+        )
+    elif profile:
         qnn_executorch_options.profile_level = (
             QnnExecuTorchProfileLevel.kProfileDetailed
         )