Update

[ghstack-poisoned]

Author: swolchok

backends/qualcomm/CMakeLists.txt

@@ -126,7 +126,6 @@ add_library(qnn_executorch_logging STATIC)
 add_library(qnn_factory STATIC)
 add_library(qnn_function_interface INTERFACE)
 add_library(qnn_graph STATIC)
-add_library(qnn_header INTERFACE)
 add_library(qnn_implementation STATIC)
 add_library(qnn_logger STATIC)
 add_library(qnn_manager STATIC)
@@ -143,16 +142,12 @@ add_library(utils STATIC)
 # declare dependency
 #
 target_link_libraries(qcir_utils PRIVATE qcir)
-target_link_libraries(wrappers PRIVATE qnn_header qnn_executorch_logging)
-target_link_libraries(qnn_function_interface INTERFACE qnn_header)
+target_link_libraries(wrappers PRIVATE qnn_executorch_logging)
 target_link_libraries(
-  qnn_implementation PRIVATE qnn_function_interface qnn_header
-                             qnn_executorch_logging ${CMAKE_DL_LIBS}
+  qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
 )
-target_link_libraries(qnn_sys_function_interface INTERFACE qnn_header)
 target_link_libraries(
-  qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_header
-                                 qnn_executorch_logging ${CMAKE_DL_LIBS}
+  qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
 )
 target_link_libraries(qnn_executorch_logging PRIVATE qnn_schema)
 target_link_libraries(qnn_profiler PRIVATE qnn_executorch_logging)
@@ -178,9 +173,7 @@ target_link_libraries(
 )
 
 target_link_libraries(
-  qnn_factory
-  PUBLIC qnn_header
-  PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
+  qnn_factory PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
           qnn_mem_manager qnn_custom_protocol
 )
 target_link_libraries(

backends/qualcomm/runtime/backends/CMakeLists.txt

@@ -122,54 +122,3 @@ target_sources(
   PUBLIC ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.h
   PRIVATE ${CMAKE_CURRENT_LIST_DIR}/QnnCustomProtocol.cpp
 )
-
-set(qnn_header_basenames
-    QnnBackend.h
-    QnnCommon.h
-    QnnContext.h
-    QnnDevice.h
-    GPU/QnnGpuBackend.h
-    GPU/QnnGpuCommon.h
-    GPU/QnnGpuContext.h
-    GPU/QnnGpuGraph.h
-    QnnGraph.h
-    HTP/QnnHtpCommon.h
-    HTP/QnnHtpDevice.h
-    HTP/QnnHtpGraph.h
-    HTP/QnnHtpMem.h
-    HTP/QnnHtpPerfInfrastructure.h
-    HTP/QnnHtpProfile.h
-    HTP/QnnHtpProperty.h
-    HTP/QnnHtpSystemContext.h
-    QnnInterface.h
-    QnnLog.h
-    QnnMem.h
-    QnnOpDef.h
-    QnnOpPackage.h
-    QnnProfile.h
-    QnnProperty.h
-    Saver/QnnSaver.h
-    Saver/QnnSaverCommon.h
-    QnnSdkBuildId.h
-    QnnSignal.h
-    QnnTensor.h
-    QnnTypes.h
-    System/QnnSystemCommon.h
-    System/QnnSystemContext.h
-    System/QnnSystemInterface.h
-)
-
-set(QNN_HEADER_DIR_DST ${CMAKE_CURRENT_BINARY_DIR}/QNN/include)
-
-# add the custom commands to copy each headers
-foreach(_qnn_header ${qnn_header_basenames})
-  # copy at generation time to make below target_sources(qnn_header) happy.
-  configure_file(
-    ${QNN_SDK_ROOT}/include/QNN/${_qnn_header}
-    ${QNN_HEADER_DIR_DST}/${_qnn_header} COPYONLY
-  )
-  list(APPEND qnn_header_files ${QNN_HEADER_DIR_DST}/${_qnn_header})
-endforeach()
-
-# qnn_header
-target_sources(qnn_header INTERFACE ${qnn_header_files})

runtime/executor/program.cpp

@@ -373,6 +373,13 @@ Result<const void*> Program::get_constant_buffer_data(
   }
 }
 
+Result<const NamedDataMap*> Program::get_named_data_map() const {
+  if (pte_data_map_.has_value()) {
+    return &pte_data_map_.value();
+  }
+  return Error::NotFound;
+}
+
 Result<const char*> Program::get_output_flattening_encoding(
     const char* method_name) const {
   auto plan = get_execution_plan(internal_program_, method_name);

runtime/executor/program.h

@@ -110,6 +110,12 @@ class Program final {
   Result<const void*> get_constant_buffer_data(size_t buffer_idx, size_t nbytes)
       const;
 
+  /**
+   * Get the named data map from the program.
+   * @return The named data map.
+   */
+  Result<const NamedDataMap*> get_named_data_map() const;
+
   /**
    * Returns the number of methods in the program.
    */

runtime/executor/test/program_test.cpp

@@ -371,6 +371,18 @@ TEST_F(ProgramTest, getMethods) {
   EXPECT_EQ(strcmp(res2.get(), "forward2"), 0);
 }
 
+TEST_F(ProgramTest, GetNamedDataMap_Fail) {
+  Result<Program> program =
+      Program::load(add_loader_.get(), kDefaultVerification);
+  ASSERT_EQ(program.error(), Error::Ok);
+
+  // Get the named data map. Expect to fail, as add.pte does not have any
+  // named data segments.
+  Result<const executorch::runtime::NamedDataMap*> named_data_map =
+      program->get_named_data_map();
+  EXPECT_EQ(named_data_map.error(), Error::NotFound);
+}
+
 // Test that the deprecated Load method (capital 'L') still works.
 TEST_F(ProgramTest, DEPRECATEDLoad) {
   // Parse the Program from the data.