Code Review, BC change

Author: winskuo-quic

backends/qualcomm/utils/utils.py

@@ -1116,7 +1116,7 @@ def generate_lpai_compiler_spec(
     )
 
 
-def generate_qnn_executorch_compiler_spec(
+def generate_qnn_executorch_compiler_spec(  # noqa: C901
     soc_model: QcomChipset,
     backend_options: QnnExecuTorchBackendOptions,
     debug: bool = False,
@@ -1128,6 +1128,9 @@ def generate_qnn_executorch_compiler_spec(
     is_from_context_binary: bool = False,
     op_package_options: QnnExecuTorchOpPackageOptions = None,
     use_mha2sha: bool = False,
+    # Deprecated parameters - use profile_level instead
+    profile: Optional[bool] = None,
+    optrace: Optional[bool] = None,
 ) -> List[CompileSpec]:
     """
     Helper function generating compiler specs for Qualcomm AI Engine Direct
@@ -1170,6 +1173,24 @@ def generate_qnn_executorch_compiler_spec(
     if soc_model not in _supported_soc_models:
         raise ValueError(f"unknown SoC model for QNN: {soc_model}")
 
+    # Backward compatibility: map deprecated profile/optrace to profile_level
+    if optrace is not None:
+        warnings.warn(
+            "'optrace' is deprecated, use 'profile_level=3' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        if optrace and profile_level == 0:
+            profile_level = 3  # kProfileOptrace
+    if profile is not None:
+        warnings.warn(
+            "'profile' is deprecated, use 'profile_level=2' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        if profile and profile_level == 0:
+            profile_level = 2  # kProfileDetailed
+
     if profile_level and dump_intermediate_outputs:
         warnings.warn(
             "It is not recommended to turn on both profiling and dump_intermediate_outputs the same time"

examples/qualcomm/utils.py

@@ -6,6 +6,9 @@
 
 # TODO: reenable pyre after fixing the issues
 # pyre-ignore-all-errors
+
+# Backward-compatible re-exports for symbols moved to export_utils.
+# Internal callers still import from this module.
 import csv
 import inspect
 import os
@@ -16,6 +19,13 @@
 import numpy as np
 import torch
 import transformers
+from executorch.backends.qualcomm.export_utils import (  # noqa: F401
+    _ptq_calibrate,
+    _qat_train,
+    build_executorch_binary,
+    make_quantizer,
+    SimpleADB,
+)
 
 
 def replace_module_with_custom_class(