Fixed buck file and rebase

Author: shewu-quic

backends/qualcomm/README.md

@@ -51,8 +51,8 @@ backends/qualcomm
 |   |       # models on a device.
 |   └── backends # Backends supported by QNN.
 |       └── gpu / htp
-|           ├── aarch64 # Configuration required to run on device. (Device Part).
-|           └── x86_64 # Configuration required to compile graph on host. (AoT Part).
+|           ├── target # Configuration required to run on device. (Device Part).
+|           └── host # Configuration required to compile graph on host. (AoT Part).
 ├── scripts # Misc supporting scripts, not related to core functionality.
 ├── serialization # Contains files related to serializing QNN compiler options and SoC information
 ├── tests # Unit tests and model tests go here.

backends/qualcomm/quantizer/targets.bzl

@@ -15,5 +15,7 @@ def define_common_targets():
         visibility = ["PUBLIC"],
         deps = [
             "//executorch/backends/transforms:decompose_sdpa",
+            "//executorch/extension/pybindings:portable_lib",
+            "//executorch/kernels/quantized:quantized_ops_lib",
         ],
     )

backends/qualcomm/runtime/backends/CMakeLists.txt

@@ -43,17 +43,6 @@ target_sources(
                        ${CMAKE_CURRENT_LIST_DIR}/QnnProfiler.cpp
 )
 
-set(HOST_ARCHITECTURE_GPU
-    ${CMAKE_CURRENT_LIST_DIR}/gpu/${CMAKE_SYSTEM_PROCESSOR}
-)
-set(HOST_ARCHITECTURE_HTP
-    ${CMAKE_CURRENT_LIST_DIR}/htp/${CMAKE_SYSTEM_PROCESSOR}
-)
-set(HOST_ARCHITECTURE_IR ${CMAKE_CURRENT_LIST_DIR}/ir/${CMAKE_SYSTEM_PROCESSOR})
-set(HOST_ARCHITECTURE_LPAI
-    ${CMAKE_CURRENT_LIST_DIR}/lpai/${CMAKE_SYSTEM_PROCESSOR}
-)
-
 set(platform target)
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64)
   set(platform host)
@@ -62,6 +51,7 @@ endif()
 set(HOST_ARCHITECTURE_GPU ${CMAKE_CURRENT_LIST_DIR}/gpu/${platform})
 set(HOST_ARCHITECTURE_HTP ${CMAKE_CURRENT_LIST_DIR}/htp/${platform})
 set(HOST_ARCHITECTURE_IR ${CMAKE_CURRENT_LIST_DIR}/ir/${platform})
+set(HOST_ARCHITECTURE_LPAI ${CMAKE_CURRENT_LIST_DIR}/lpai/${platform})
 
 # qnn_device
 target_sources(

backends/qualcomm/runtime/backends/lpai/aarch64/LpaiGraph.cpp

@@ -47,9 +47,11 @@ def define_common_targets():
                     "backends/gpu/*.cpp",
                     "backends/htp/*.cpp",
                     "backends/ir/*.cpp",
+                    "backends/lpai/*.cpp",
                 ] + (["backends/gpu/host/*.cpp"] if include_aot_qnn_lib else ["backends/gpu/target/*.cpp"]) + (
                     ["backends/htp/host/*.cpp"] if include_aot_qnn_lib else ["backends/htp/target/*.cpp"]) + (
-                    ["backends/ir/host/*.cpp"] if include_aot_qnn_lib else ["backends/ir/target/*.cpp"]
+                    ["backends/ir/host/*.cpp"] if include_aot_qnn_lib else ["backends/ir/target/*.cpp"]) + (
+                    ["backends/lpai/host/*.cpp"] if include_aot_qnn_lib else ["backends/lpai/target/*.cpp"]
                 ),
                 exclude = ["Logging.cpp"],
             ),
@@ -60,6 +62,7 @@ def define_common_targets():
                     "backends/gpu/*.h",
                     "backends/htp/*.h",
                     "backends/ir/*.h",
+                    "backends/lpai/*.h",
                 ],
                 exclude = ["Logging.h"],
             ),