Add Macro for Android api level

Keep original name of dump_context_from_pte

Author: DannyYuyang-quic

backends/qualcomm/runtime/backends/irbackend/aarch64/QnnDlcManager.cpp

@@ -73,7 +73,12 @@ Error QnnDlcManager::RegisterGraphsFromDLC(
       cache->GetQnnContextBlob();
 
   // memfd_create on android api level 30 and above
-  int fd = memfd_create("tmp.dlc", 0);
+  int fd = -1;
+  #ifdef __ANDROID__
+    #if __ANDROID_API__ >= 30
+      fd = memfd_create("tmp.dlc", 0);
+    #endif
+  #endif
   if (fd == -1) {
     QNN_EXECUTORCH_LOG_ERROR("memfd_create fail");
     return Error::Internal;

backends/qualcomm/runtime/targets.bzl

@@ -46,8 +46,8 @@ def define_common_targets():
                     "backends/irbackend/*.cpp",
                     "backends/htpbackend/*.cpp",
                 ] + (["backends/htpbackend/x86_64/*.cpp"] if include_aot_qnn_lib else ["backends/htpbackend/aarch64/*.cpp"]) + (
-+                    ["backends/irbackend/x86_64/*.cpp"] if include_aot_qnn_lib else ["backends/irbackend/aarch64/*.cpp"]
-+                ),
+                    ["backends/irbackend/x86_64/*.cpp"] if include_aot_qnn_lib else ["backends/irbackend/aarch64/*.cpp"]
+                ),
                 exclude = ["Logging.cpp"],
             ),
             exported_headers = glob(

backends/qualcomm/tests/test_qnn_delegate.py

@@ -41,7 +41,7 @@
 )
 from executorch.backends.qualcomm.utils.utils import (
     capture_program,
-    dump_qnn_binary_from_pte,
+    dump_context_from_pte,
     from_context_binary,
     generate_htp_compiler_spec,
     generate_multi_graph_program,
@@ -2577,7 +2577,7 @@ def test_qnn_backend_context_extraction(self):
             pte_path = f"{tmp_dir}/model.pte"
             with open(pte_path, "wb") as f:
                 edge_prog_mgr.write_to_file(f)
-            dump_qnn_binary_from_pte(pte_path)
+            dump_context_from_pte(pte_path)
 
             qnn_tool = QnnTool(tmp_dir, pte_path, sample_input)
             qnn_tool.qnn_context_binary_generator()
@@ -2620,7 +2620,7 @@ def test_qnn_backend_dump_context_from_pte(self):
             pte_path = f"{tmp_dir}/model.pte"
             with open(pte_path, "wb") as f:
                 edge_prog_mgr.write_to_file(f)
-            dump_qnn_binary_from_pte(pte_path)
+            dump_context_from_pte(pte_path)
 
             qnn_tool = QnnTool(tmp_dir, pte_path, sample_input)
             qnn_tool.qnn_context_binary_generator()
@@ -2641,7 +2641,7 @@ def test_qnn_backend_dump_context_from_pte(self):
                 with open(pte_path, "wb") as f:
                     edge_prog_mgr.write_to_file(f)
 
-                dump_qnn_binary_from_pte(pte_path)
+                dump_context_from_pte(pte_path)
                 binary_name = f"{tmp_dir}/forward_0.bin"
                 self.assertTrue(os.path.isfile(binary_name))
                 with open(binary_name, "rb") as f:
@@ -3225,7 +3225,7 @@ def test_qnn_backend_context_extraction(self):
             pte_path = f"{tmp_dir}/model.pte"
             with open(pte_path, "wb") as f:
                 edge_prog_mgr.write_to_file(f)
-            dump_qnn_binary_from_pte(pte_path)
+            dump_context_from_pte(pte_path)
 
             qnn_tool = QnnTool(tmp_dir, pte_path, sample_input)
             qnn_tool.qnn_context_binary_generator()
@@ -3269,7 +3269,7 @@ def test_qnn_backend_dump_context_from_pte(self):
             pte_path = f"{tmp_dir}/model.pte"
             with open(pte_path, "wb") as f:
                 edge_prog_mgr.write_to_file(f)
-            dump_qnn_binary_from_pte(pte_path)
+            dump_context_from_pte(pte_path)
 
             qnn_tool = QnnTool(tmp_dir, pte_path, sample_input)
             qnn_tool.qnn_context_binary_generator()
@@ -3290,7 +3290,7 @@ def test_qnn_backend_dump_context_from_pte(self):
                 with open(pte_path, "wb") as f:
                     edge_prog_mgr.write_to_file(f)
 
-                dump_qnn_binary_from_pte(pte_path)
+                dump_context_from_pte(pte_path)
                 binary_name = f"{tmp_dir}/forward_0.bin"
                 self.assertTrue(os.path.isfile(binary_name))
                 with open(binary_name, "rb") as f:

backends/qualcomm/utils/utils.py

@@ -187,7 +187,7 @@ def replace_linear(module: torch.nn.Module):
     return replace_linear(module)
 
 
-def dump_qnn_binary_from_pte(pte_path):
+def dump_context_from_pte(pte_path):
     """
     Dump compiled binaries under the same directory of pte_path.
     For partitioned graph, there will be multiple files with names f"{graph_name}_{index}".