Merge pull request #3978 from graham0824:dev/weilhuan/fix_soc_info

LiteRT-PiperOrigin-RevId: 820318801

Author: copybara-github

litert/vendors/qualcomm/compiler/qnn_compiler_plugin_test.cc

@@ -176,7 +176,7 @@ TEST(TestQnnPlugin, GetConfigInfo) {
   LiteRtParamIndex num_supported_soc_models;
   LITERT_ASSERT_OK(LiteRtGetNumCompilerPluginSupportedSocModels(
       plugin.get(), &num_supported_soc_models));
-  ASSERT_EQ(num_supported_soc_models, 9);
+  ASSERT_EQ(num_supported_soc_models, 10);
 
   const char* config_id;
   LITERT_ASSERT_OK(

litert/vendors/qualcomm/core/backends/htp_backend.cc

@@ -77,22 +77,47 @@ bool HtpBackend::Init(const Options& options,
     return false;
   }
 
-  // Soc Info
+  // Starting from QAIRT 2.39, platform information will be available even when
+  // this API is called during offline preparation. However, it will always
+  // return the default SoC info (SM8350). If user specifies a SoC, we will
+  // override the default.
+  std::optional<::qnn::SocInfo> soc_info_online;
   auto local_qnn_device_platform_info = CreateDevicePlatformInfo();
   if (local_qnn_device_platform_info) {
-    QNN_LOG_INFO("Apply deviceGetPlatformInfo for SoC info.");
-    auto soc_info_online = FindSocInfo(static_cast<::qnn::SnapdragonModel>(
-        local_qnn_device_platform_info->v1.hwDevices->v1.deviceInfoExtension
-            ->onChipDevice.socModel));
-    if (soc_info_online.has_value()) {
-      soc_info_ = *soc_info_online;
-    }
+    auto online_soc_model = local_qnn_device_platform_info->v1.hwDevices->v1
+                                .deviceInfoExtension->onChipDevice.socModel;
+    soc_info_online =
+        FindSocInfo(static_cast<::qnn::SnapdragonModel>(online_soc_model));
+    QNN_LOG_INFO(
+        "Succssfully get platform info. SoC model: %d. SoC name: %s.",
+        online_soc_model,
+        soc_info_online.has_value() ? soc_info_online->soc_name : "NotFound");
+  }
+
+#if defined(__ANDROID__)
+  if (soc_info_online.has_value()) {
+    QNN_LOG_INFO("Using online SoC info. SoC name: %s.",
+                 soc_info_online->soc_name);
+    soc_info_ = *soc_info_online;
   } else if (soc_info.has_value()) {
-    QNN_LOG_INFO("Using provided SoC info.");
+    QNN_LOG_INFO("Using provided SoC info. SoC name: %s.", soc_info->soc_name);
     soc_info_ = *soc_info;
   } else {
-    QNN_LOG_WARNING("Fail to get platforminfo, using default.");
+    QNN_LOG_WARNING("Fail to get SoC info, using default.");
   }
+#else
+  if (soc_info.has_value()) {
+    QNN_LOG_INFO("Using provided SoC info. SoC name: %s.", soc_info->soc_name);
+    soc_info_ = *soc_info;
+  } else if (soc_info_online.has_value()) {
+    QNN_LOG_INFO("Using online SoC info. SoC name: %s.",
+                 soc_info_online->soc_name);
+    soc_info_ = *soc_info_online;
+  } else {
+    QNN_LOG_WARNING("Fail to get SoC info, using default.");
+  }
+#endif
+
   QNN_LOG_INFO("Initializing QNN backend for SoC model: %s",
                soc_info_.soc_name);
 

litert/vendors/qualcomm/core/schema/soc_table.cc

@@ -33,6 +33,9 @@ constexpr SocInfo kSocInfos[] = {
     {SocInfo("SM8750", SnapdragonModel::SM8750, DspArch::V79,
              8  // vtcm_size_in_mb
              )},
+    {SocInfo("SM8850", SnapdragonModel::SM8850, DspArch::V81,
+             8  // vtcm_size_in_mb
+             )},
 };
 constexpr uint64_t kNumSocInfos =
     sizeof(::qnn::kSocInfos) / sizeof(::qnn::kSocInfos[0]);

litert/vendors/qualcomm/core/schema/soc_table.h

@@ -15,7 +15,8 @@ enum class SnapdragonModel {
   SM8550 = 43,
   SA8255 = 52,
   SM8650 = 57,
-  SM8750 = 69
+  SM8750 = 69,
+  SM8850 = 87,
 };
 
 enum class DspArch {
@@ -27,6 +28,7 @@ enum class DspArch {
   V73 = 73,  // HTP supported device
   V75 = 75,  // HTP supported device
   V79 = 79,  // HTP supported device
+  V81 = 81,  // HTP supported device
 };
 
 struct SocInfo {