Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some CPU feature detection for Apple platforms. #20769

Merged
merged 1 commit into from
May 23, 2024
Merged

Add some CPU feature detection for Apple platforms. #20769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions onnxruntime/core/common/cpuid_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

namespace onnxruntime {

#ifdef CPUIDINFO_ARCH_X86
#if defined(CPUIDINFO_ARCH_X86)

static inline void GetCPUID(int function_id, int data[4]) { // NOLINT
#if defined(_MSC_VER)
Expand Down Expand Up @@ -141,10 +141,11 @@
}
}

#endif /* CPUIDINFO_ARCH_X86 */
#endif // defined(CPUIDINFO_ARCH_X86)

#if defined(CPUIDINFO_ARCH_ARM)
#ifdef __linux__

#if defined(__linux__)

void CPUIDInfo::ArmLinuxInit() {
// Assuming no hyper-threading, no NUMA groups
Expand Down Expand Up @@ -190,11 +191,11 @@
}
}

#elif defined(_WIN32)
#elif defined(_WIN32) // ^ defined(__linux__)

void CPUIDInfo::ArmWindowsInit() {
// ARM32 certainly doesn't have fp16, so we will skip the logic to avoid using RegGetValueA Windows API
#ifndef _M_ARM
#if !defined(_M_ARM)
#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
// Read MIDR from windows registry
Expand Down Expand Up @@ -243,12 +244,12 @@
lastUarch = uarch;
}
}
#endif /* Application Family or OneCore Family */
#endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)

has_arm_neon_dot_ = (IsProcessorFeaturePresent(PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) != 0);
#else
#else // ^ !defined(_M_ARM) / v defined(_M_ARM)
has_arm_neon_dot_ = false;
#endif
#endif // defined(_M_ARM)

#if defined(CPUINFO_SUPPORTED)
if (pytorch_cpuinfo_init_) {
Expand All @@ -266,8 +267,29 @@
}
}

#endif /* (arm or arm64) and windows */
#endif /* arm or arm64*/
#elif defined(__APPLE__) // ^ defined(_WIN32)

void CPUIDInfo::ArmAppleInit() {
#if defined(CPUINFO_SUPPORTED)
if (pytorch_cpuinfo_init_) {
is_hybrid_ = cpuinfo_get_uarchs_count() > 1;
has_arm_neon_dot_ = cpuinfo_has_arm_neon_dot();
has_fp16_ = cpuinfo_has_arm_neon_fp16_arith();
has_arm_neon_i8mm_ = cpuinfo_has_arm_i8mm();
has_arm_sve_i8mm_ = cpuinfo_has_arm_sve() && cpuinfo_has_arm_i8mm();
has_arm_neon_bf16_ = cpuinfo_has_arm_neon_bf16();

// TODO figure out how to set core_uarchs_ and is_armv8_narrow_ld_

Check warning on line 282 in onnxruntime/core/common/cpuid_info.cc

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 Missing username in TODO; it should look like "// TODO(my_username): Stuff."  [readability/todo] [2]

Raw Output:
onnxruntime/core/common/cpuid_info.cc:282:  Missing username in TODO; it should look like "// TODO(my_username): Stuff."  [readability/todo] [2]
edgchen1 marked this conversation as resolved.
Show resolved Hide resolved
} else

Check warning on line 283 in onnxruntime/core/common/cpuid_info.cc

View workflow job for this annotation

GitHub Actions / Lint C++ 

[cpplint] reported by reviewdog 🐶
 If an else has a brace on one side, it should have it on both  [readability/braces] [5]

Raw Output:
onnxruntime/core/common/cpuid_info.cc:283:  If an else has a brace on one side, it should have it on both  [readability/braces] [5]
#endif // defined(CPUINFO_SUPPORTED)
{
// No fallback detection attempted now. Add if needed.
}
}

#endif // defined(__APPLE__)

#endif // defined(CPUIDINFO_ARCH_ARM)

uint32_t CPUIDInfo::GetCurrentCoreIdx() const {
#ifdef _WIN32
Expand Down Expand Up @@ -295,11 +317,13 @@
"due to undetected CPU features.";
}
#endif // defined(CPUINFO_SUPPORTED)
#ifdef __linux__
#if defined(__linux__)
ArmLinuxInit();
#elif defined(_WIN32)
ArmWindowsInit();
#endif /* (arm or arm64) and windows */
#elif defined(__APPLE__)
ArmAppleInit();
#endif
#endif // defined(CPUIDINFO_ARCH_ARM)
}
} // namespace onnxruntime
8 changes: 6 additions & 2 deletions onnxruntime/core/common/cpuid_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,19 @@ class CPUIDInfo {
bool pytorch_cpuinfo_init_{false};
#endif // defined(CPUINFO_SUPPORTED)

#ifdef __linux__
#if defined(__linux__)

void ArmLinuxInit();

#elif defined(_WIN32)

void ArmWindowsInit();

#endif /* (arm or arm64) and windows */
#elif defined(__APPLE__)

void ArmAppleInit();

#endif

#endif // defined(CPUIDINFO_ARCH_ARM)
};
Expand Down
Loading