From fb4dea39e2c1635325ea4eb39c586d073daa9973 Mon Sep 17 00:00:00 2001
From: Chen Fu <1316708+chenfucn@users.noreply.github.com>
Date: Tue, 11 Jan 2022 16:31:56 -0800
Subject: [PATCH] Tolerate cpuinfo init failure (#10199)

Tolerate pytorch cpuinfo library init failure.
---
 onnxruntime/core/common/cpuid_info.cc | 30 +++++++++++++++++++++------
 onnxruntime/core/common/cpuid_info.h  |  3 +++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/onnxruntime/core/common/cpuid_info.cc b/onnxruntime/core/common/cpuid_info.cc
index 57c5327c93..842e260c8b 100644
--- a/onnxruntime/core/common/cpuid_info.cc
+++ b/onnxruntime/core/common/cpuid_info.cc
@@ -18,8 +18,21 @@
 #endif
 #endif
 
+#if defined(CPUIDINFO_ARCH_ARM) && defined(CPUINFO_SUPPORTED)
+#include <sys/auxv.h>
+#include <asm/hwcap.h>
+// N.B. Support building with older versions of asm/hwcap.h that do not define
+// this capability bit.
+#ifndef HWCAP_ASIMDDP
+#define HWCAP_ASIMDDP (1 << 20)
+#endif
+
+#endif
+
 #include <mutex>
 #include "core/common/cpuid_info.h"
+#include "core/common/logging/logging.h"
+#include "core/common/logging/severity.h"
 
 #if _WIN32
 #define HAS_WINDOWS_DESKTOP WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@@ -57,10 +70,10 @@ CPUIDInfo CPUIDInfo::instance_;
 
 CPUIDInfo::CPUIDInfo() {
 #if (defined(CPUIDINFO_ARCH_X86) || defined(CPUIDINFO_ARCH_ARM)) && defined(CPUINFO_SUPPORTED)
-    if (!cpuinfo_initialize()) {
-      // Unfortunately we can not capture cpuinfo log!!
-      ORT_THROW("Failed to initialize CPU info.");
-    }
+  pytorch_cpuinfo_init_ = cpuinfo_initialize();
+  if (!pytorch_cpuinfo_init_) {
+    LOGS_DEFAULT(WARNING) << "Failed to init pytorch cpuinfo library, may cause CPU EP performance degradation due to undetected CPU features.";
+  }
 #endif
 
 #if defined(CPUIDINFO_ARCH_X86)
@@ -99,8 +112,13 @@ CPUIDInfo::CPUIDInfo() {
 #ifdef CPUINFO_SUPPORTED
 
     // only works on ARM linux or android, does not work on Windows
-    is_hybrid_ = cpuinfo_get_uarchs_count() > 1;
-    has_arm_neon_dot_ = cpuinfo_has_arm_neon_dot();
+    if (pytorch_cpuinfo_init_) {
+      is_hybrid_ = cpuinfo_get_uarchs_count() > 1;
+      has_arm_neon_dot_ = cpuinfo_has_arm_neon_dot();
+    } else {
+      has_arm_neon_dot_ = ((getauxval(AT_HWCAP) & HWCAP_ASIMDDP) != 0);
+    }
+
 #elif defined(_WIN32)
     // TODO implement hardware feature detection in windows.
     is_hybrid_ = true;
diff --git a/onnxruntime/core/common/cpuid_info.h b/onnxruntime/core/common/cpuid_info.h
index 5580446f4d..754cc2e023 100644
--- a/onnxruntime/core/common/cpuid_info.h
+++ b/onnxruntime/core/common/cpuid_info.h
@@ -37,6 +37,9 @@ class CPUIDInfo {
   bool has_sse4_1_{false};
   bool is_hybrid_{false};
 
+#if (defined(CPUIDINFO_ARCH_X86) || defined(CPUIDINFO_ARCH_ARM)) && defined(CPUINFO_SUPPORTED)
+  bool pytorch_cpuinfo_init_{false};
+#endif
   bool has_arm_neon_dot_{false};
 
   static CPUIDInfo instance_;