Skip to content

Exclude cpuid.h from Mac non x86 arch #7166

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

Merged
RandySheriffH merged 2 commits into from
Mar 30, 2021
+6 −0
Merged

Exclude cpuid.h from Mac non x86 arch #7166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f08f1
add ifdef to exclude inclusion from non x86 arch
RandyShuai Mar 29, 2021
54debe6
exclude calling of __cpuid_count
RandyShuai Mar 29, 2021
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
6 changes: 6 additions & 0 deletions onnxruntime/core/common/threadpool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ limitations under the License.
#include <codecvt>
#include <locale>
#elif defined(__APPLE__)
#if defined(__x86_64__) || defined(__i386__)
#include <cpuid.h>
#endif
#else
#include <sched.h>
#endif
Expand Down Expand Up @@ -122,11 +124,13 @@ void ThreadPoolProfiler::MainThreadStat::LogCore() {
#ifdef _WIN32
core_ = GetCurrentProcessorNumber();
#elif defined(__APPLE__)
#if defined(__x86_64__) || defined(__i386__)
uint32_t CPUInfo[4];
__cpuid_count(1, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
if ((CPUInfo[3] & (1 << 9)) != 0) {
core_ = (unsigned)CPUInfo[1] >> 24;
}
#endif
#else
core_ = sched_getcpu();
#endif
Expand Down Expand Up @@ -200,11 +204,13 @@ void ThreadPoolProfiler::LogRun(int thread_idx) {
#ifdef _WIN32
child_thread_stats_[thread_idx].core_ = GetCurrentProcessorNumber();
#elif defined(__APPLE__)
#if defined(__x86_64__) || defined(__i386__)
uint32_t CPUInfo[4];
__cpuid_count(1, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
if ((CPUInfo[3] & (1 << 9)) != 0) {
child_thread_stats_[thread_idx].core_ = (unsigned)CPUInfo[1] >> 24;
}
#endif
#else
child_thread_stats_[thread_idx].core_ = sched_getcpu();
#endif
Expand Down