mirror of
https://github.com/lubosz/overte.git
synced 2025-04-23 13:33:38 +02:00
Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix
Rename CPUID to CPUIdent to fix XCode 7.2 builds
This commit is contained in:
Seth Alves
commit
2b63c2a8ba
4 changed files with 89 additions and 89 deletions
|
|
@ -1,75 +0,0 @@
|
|||
//
|
||||
// CPUID.cpp
|
||||
//
|
||||
// Created by Ryan Huffman on 3/25/16.
|
||||
// Copyright 2016 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "CPUID.h"
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
|
||||
const CPUID::CPUID_Internal CPUID::CPU_Rep;
|
||||
|
||||
std::vector<CPUID::Feature> CPUID::getAllFeatures() {
|
||||
std::vector<CPUID::Feature> features;
|
||||
|
||||
features.push_back({ "3DNOW", CPUID::_3DNOW() });
|
||||
features.push_back({ "3DNOWEXT", CPUID::_3DNOWEXT() });
|
||||
features.push_back({ "ABM", CPUID::ABM() });
|
||||
features.push_back({ "ADX", CPUID::ADX() });
|
||||
features.push_back({ "AES", CPUID::AES() });
|
||||
features.push_back({ "AVX", CPUID::AVX() });
|
||||
features.push_back({ "AVX2", CPUID::AVX2() });
|
||||
features.push_back({ "AVX512CD", CPUID::AVX512CD() });
|
||||
features.push_back({ "AVX512ER", CPUID::AVX512ER() });
|
||||
features.push_back({ "AVX512F", CPUID::AVX512F() });
|
||||
features.push_back({ "AVX512PF", CPUID::AVX512PF() });
|
||||
features.push_back({ "BMI1", CPUID::BMI1() });
|
||||
features.push_back({ "BMI2", CPUID::BMI2() });
|
||||
features.push_back({ "CLFSH", CPUID::CLFSH() });
|
||||
features.push_back({ "CMPXCHG16B", CPUID::CMPXCHG16B() });
|
||||
features.push_back({ "CX8", CPUID::CX8() });
|
||||
features.push_back({ "ERMS", CPUID::ERMS() });
|
||||
features.push_back({ "F16C", CPUID::F16C() });
|
||||
features.push_back({ "FMA", CPUID::FMA() });
|
||||
features.push_back({ "FSGSBASE", CPUID::FSGSBASE() });
|
||||
features.push_back({ "FXSR", CPUID::FXSR() });
|
||||
features.push_back({ "HLE", CPUID::HLE() });
|
||||
features.push_back({ "INVPCID", CPUID::INVPCID() });
|
||||
features.push_back({ "LAHF", CPUID::LAHF() });
|
||||
features.push_back({ "LZCNT", CPUID::LZCNT() });
|
||||
features.push_back({ "MMX", CPUID::MMX() });
|
||||
features.push_back({ "MMXEXT", CPUID::MMXEXT() });
|
||||
features.push_back({ "MONITOR", CPUID::MONITOR() });
|
||||
features.push_back({ "MOVBE", CPUID::MOVBE() });
|
||||
features.push_back({ "MSR", CPUID::MSR() });
|
||||
features.push_back({ "OSXSAVE", CPUID::OSXSAVE() });
|
||||
features.push_back({ "PCLMULQDQ", CPUID::PCLMULQDQ() });
|
||||
features.push_back({ "POPCNT", CPUID::POPCNT() });
|
||||
features.push_back({ "PREFETCHWT1", CPUID::PREFETCHWT1() });
|
||||
features.push_back({ "RDRAND", CPUID::RDRAND() });
|
||||
features.push_back({ "RDSEED", CPUID::RDSEED() });
|
||||
features.push_back({ "RDTSCP", CPUID::RDTSCP() });
|
||||
features.push_back({ "RTM", CPUID::RTM() });
|
||||
features.push_back({ "SEP", CPUID::SEP() });
|
||||
features.push_back({ "SHA", CPUID::SHA() });
|
||||
features.push_back({ "SSE", CPUID::SSE() });
|
||||
features.push_back({ "SSE2", CPUID::SSE2() });
|
||||
features.push_back({ "SSE3", CPUID::SSE3() });
|
||||
features.push_back({ "SSE4.1", CPUID::SSE41() });
|
||||
features.push_back({ "SSE4.2", CPUID::SSE42() });
|
||||
features.push_back({ "SSE4a", CPUID::SSE4a() });
|
||||
features.push_back({ "SSSE3", CPUID::SSSE3() });
|
||||
features.push_back({ "SYSCALL", CPUID::SYSCALL() });
|
||||
features.push_back({ "TBM", CPUID::TBM() });
|
||||
features.push_back({ "XOP", CPUID::XOP() });
|
||||
features.push_back({ "XSAVE", CPUID::XSAVE() });
|
||||
|
||||
return features;
|
||||
};
|
||||
|
||||
#endif
|
||||
75
libraries/shared/src/CPUIdent.cpp
Normal file
75
libraries/shared/src/CPUIdent.cpp
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
//
|
||||
// CPUIdent.cpp
|
||||
//
|
||||
// Created by Ryan Huffman on 3/25/16.
|
||||
// Copyright 2016 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "CPUIdent.h"
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
|
||||
const CPUIdent::CPUIdent_Internal CPUIdent::CPU_Rep;
|
||||
|
||||
std::vector<CPUIdent::Feature> CPUIdent::getAllFeatures() {
|
||||
std::vector<CPUIdent::Feature> features;
|
||||
|
||||
features.push_back({ "3DNOW", CPUIdent::_3DNOW() });
|
||||
features.push_back({ "3DNOWEXT", CPUIdent::_3DNOWEXT() });
|
||||
features.push_back({ "ABM", CPUIdent::ABM() });
|
||||
features.push_back({ "ADX", CPUIdent::ADX() });
|
||||
features.push_back({ "AES", CPUIdent::AES() });
|
||||
features.push_back({ "AVX", CPUIdent::AVX() });
|
||||
features.push_back({ "AVX2", CPUIdent::AVX2() });
|
||||
features.push_back({ "AVX512CD", CPUIdent::AVX512CD() });
|
||||
features.push_back({ "AVX512ER", CPUIdent::AVX512ER() });
|
||||
features.push_back({ "AVX512F", CPUIdent::AVX512F() });
|
||||
features.push_back({ "AVX512PF", CPUIdent::AVX512PF() });
|
||||
features.push_back({ "BMI1", CPUIdent::BMI1() });
|
||||
features.push_back({ "BMI2", CPUIdent::BMI2() });
|
||||
features.push_back({ "CLFSH", CPUIdent::CLFSH() });
|
||||
features.push_back({ "CMPXCHG16B", CPUIdent::CMPXCHG16B() });
|
||||
features.push_back({ "CX8", CPUIdent::CX8() });
|
||||
features.push_back({ "ERMS", CPUIdent::ERMS() });
|
||||
features.push_back({ "F16C", CPUIdent::F16C() });
|
||||
features.push_back({ "FMA", CPUIdent::FMA() });
|
||||
features.push_back({ "FSGSBASE", CPUIdent::FSGSBASE() });
|
||||
features.push_back({ "FXSR", CPUIdent::FXSR() });
|
||||
features.push_back({ "HLE", CPUIdent::HLE() });
|
||||
features.push_back({ "INVPCID", CPUIdent::INVPCID() });
|
||||
features.push_back({ "LAHF", CPUIdent::LAHF() });
|
||||
features.push_back({ "LZCNT", CPUIdent::LZCNT() });
|
||||
features.push_back({ "MMX", CPUIdent::MMX() });
|
||||
features.push_back({ "MMXEXT", CPUIdent::MMXEXT() });
|
||||
features.push_back({ "MONITOR", CPUIdent::MONITOR() });
|
||||
features.push_back({ "MOVBE", CPUIdent::MOVBE() });
|
||||
features.push_back({ "MSR", CPUIdent::MSR() });
|
||||
features.push_back({ "OSXSAVE", CPUIdent::OSXSAVE() });
|
||||
features.push_back({ "PCLMULQDQ", CPUIdent::PCLMULQDQ() });
|
||||
features.push_back({ "POPCNT", CPUIdent::POPCNT() });
|
||||
features.push_back({ "PREFETCHWT1", CPUIdent::PREFETCHWT1() });
|
||||
features.push_back({ "RDRAND", CPUIdent::RDRAND() });
|
||||
features.push_back({ "RDSEED", CPUIdent::RDSEED() });
|
||||
features.push_back({ "RDTSCP", CPUIdent::RDTSCP() });
|
||||
features.push_back({ "RTM", CPUIdent::RTM() });
|
||||
features.push_back({ "SEP", CPUIdent::SEP() });
|
||||
features.push_back({ "SHA", CPUIdent::SHA() });
|
||||
features.push_back({ "SSE", CPUIdent::SSE() });
|
||||
features.push_back({ "SSE2", CPUIdent::SSE2() });
|
||||
features.push_back({ "SSE3", CPUIdent::SSE3() });
|
||||
features.push_back({ "SSE4.1", CPUIdent::SSE41() });
|
||||
features.push_back({ "SSE4.2", CPUIdent::SSE42() });
|
||||
features.push_back({ "SSE4a", CPUIdent::SSE4a() });
|
||||
features.push_back({ "SSSE3", CPUIdent::SSSE3() });
|
||||
features.push_back({ "SYSCALL", CPUIdent::SYSCALL() });
|
||||
features.push_back({ "TBM", CPUIdent::TBM() });
|
||||
features.push_back({ "XOP", CPUIdent::XOP() });
|
||||
features.push_back({ "XSAVE", CPUIdent::XSAVE() });
|
||||
|
||||
return features;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// CPUID.h
|
||||
// CPUIdent.h
|
||||
//
|
||||
// Adapted from Microsoft's example for using the cpuid intrinsic,
|
||||
// found at https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef hifi_CPUID_h
|
||||
#define hifi_CPUID_h
|
||||
#ifndef hifi_CPUIdent_h
|
||||
#define hifi_CPUIdent_h
|
||||
|
||||
#include <QtCore/QtGlobal>
|
||||
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
|
||||
#include <intrin.h>
|
||||
|
||||
class CPUID
|
||||
class CPUIdent
|
||||
{
|
||||
// forward declarations
|
||||
class CPUID_Internal;
|
||||
class CPUIdent_Internal;
|
||||
|
||||
public:
|
||||
struct Feature {
|
||||
|
|
@ -104,12 +104,12 @@ public:
|
|||
static bool _3DNOW(void) { return CPU_Rep.isAMD_ && CPU_Rep.f_81_EDX_[31]; }
|
||||
|
||||
private:
|
||||
static const CPUID_Internal CPU_Rep;
|
||||
static const CPUIdent_Internal CPU_Rep;
|
||||
|
||||
class CPUID_Internal
|
||||
class CPUIdent_Internal
|
||||
{
|
||||
public:
|
||||
CPUID_Internal()
|
||||
CPUIdent_Internal()
|
||||
: nIds_ { 0 },
|
||||
nExIds_ { 0 },
|
||||
isIntel_ { false },
|
||||
|
|
@ -209,4 +209,4 @@ private:
|
|||
|
||||
#endif
|
||||
|
||||
#endif // hifi_CPUID_h
|
||||
#endif // hifi_CPUIdent_h
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include "CPUID.h"
|
||||
#include "CPUIdent.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -758,10 +758,10 @@ void printSystemInformation() {
|
|||
|
||||
qDebug() << "CPUID";
|
||||
|
||||
qDebug() << "\tCPU Vendor: " << CPUID::Vendor().c_str();
|
||||
qDebug() << "\tCPU Brand: " << CPUID::Brand().c_str();
|
||||
qDebug() << "\tCPU Vendor: " << CPUIdent::Vendor().c_str();
|
||||
qDebug() << "\tCPU Brand: " << CPUIdent::Brand().c_str();
|
||||
|
||||
for (auto& feature : CPUID::getAllFeatures()) {
|
||||
for (auto& feature : CPUIdent::getAllFeatures()) {
|
||||
qDebug().nospace().noquote() << "\t[" << (feature.supported ? "x" : " ") << "] " << feature.name.c_str();
|
||||
}
|
||||
#endif
|
||||
|
|
@ -777,4 +777,4 @@ void printSystemInformation() {
|
|||
qDebug().noquote().nospace() << "\t" <<
|
||||
(envVariables.contains(env) ? " = " + envVariables.value(env) : " NOT FOUND");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue