mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-26 14:55:39 +00:00
macos platform fixes for intel macs
This commit is contained in:
Jeff Hutchinson
parent
433d32f237
commit
7cb306b65a
6 changed files with 132 additions and 885 deletions
|
|
@ -35,15 +35,6 @@
|
|||
// we now have to use NSProcessInfo
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
//recently removed in Xcode 8 - most likely don't need these anymore
|
||||
#ifndef CPUFAMILY_INTEL_YONAH
|
||||
#define CPUFAMILY_INTEL_YONAH 0x73d67300
|
||||
#endif
|
||||
|
||||
#ifndef CPUFAMILY_INTEL_MEROM
|
||||
#define CPUFAMILY_INTEL_MEROM 0x426f69ef
|
||||
#endif
|
||||
|
||||
// Original code by Sean O'Brien (http://www.garagegames.com/community/forums/viewthread/81815).
|
||||
|
||||
|
||||
|
|
@ -89,8 +80,58 @@ int _getSysCTLvalue(const char key[], T * dest) {
|
|||
|
||||
Platform::SystemInfo_struct Platform::SystemInfo;
|
||||
|
||||
#define BASE_MHZ_SPEED 0
|
||||
//TODO update cpu list
|
||||
#define BASE_MHZ_SPEED 1000
|
||||
|
||||
static void detectCpuFeatures(U32 &procflags)
|
||||
{
|
||||
// Now we can directly query the system about a litany of "Optional" processor capabilities
|
||||
// and determine the status by using BOTH the 'err' value and the 'lraw' value. If we request
|
||||
// a non-existant feature from SYSCTL(), the 'err' result will be -1; 0 denotes it exists
|
||||
// >>>> BUT <<<<<
|
||||
// it may not be supported, only defined. Thus we need to check 'lraw' to determine if it's
|
||||
// actually supported/implemented by the processor: 0 = no, 1 = yes, others are undefined.
|
||||
|
||||
int err;
|
||||
U32 lraw;
|
||||
|
||||
// List of chip-specific features
|
||||
err = _getSysCTLvalue<U32>("hw.optional.mmx", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_MMX;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse2", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE2;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse3", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE3;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.supplementalsse3", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE3ex;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse4_1", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE4_1;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse4_2", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_SSE4_2;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.avx1_0", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_AVX;
|
||||
|
||||
err = _getSysCTLvalue<U32>("hw.ncpu", &lraw);
|
||||
if ((err==0)&&(lraw>1))
|
||||
procflags |= CPU_PROP_MP;
|
||||
err = _getSysCTLvalue<U32>("hw.cpu64bit_capable", &lraw);
|
||||
if ((err==0)&&(lraw==1))
|
||||
procflags |= CPU_PROP_64bit;
|
||||
err = _getSysCTLvalue<U32>("hw.byteorder", &lraw);
|
||||
if ((err==0)&&(lraw==1234))
|
||||
procflags |= CPU_PROP_LE;
|
||||
|
||||
}
|
||||
|
||||
void Processor::init()
|
||||
{
|
||||
U32 procflags;
|
||||
|
|
@ -98,178 +139,64 @@ void Processor::init()
|
|||
char buf[255];
|
||||
U32 lraw;
|
||||
U64 llraw;
|
||||
|
||||
Con::printf( "System & Processor Information:" );
|
||||
|
||||
// Gestalt has been deprecated since Mac OSX Mountain Lion and has stopped working on
|
||||
// Mac OSX Yosemite. we have to use NSProcessInfo now.
|
||||
// Availability: Mac OS 10.2 or greater.
|
||||
NSString *osVersionStr = [[NSProcessInfo processInfo] operatingSystemVersionString];
|
||||
Con::printf( " OSX Version: %s", [osVersionStr UTF8String]);
|
||||
|
||||
err = _getSysCTLstring("kern.ostype", buf, sizeof(buf));
|
||||
if (err)
|
||||
Con::printf( " Unable to determine OS type\n" );
|
||||
else
|
||||
Con::printf( " Mac OS Kernel name: %s", buf);
|
||||
|
||||
err = _getSysCTLstring("kern.osrelease", buf, sizeof(buf));
|
||||
if (err)
|
||||
Con::printf( " Unable to determine OS release number\n" );
|
||||
else
|
||||
Con::printf( " Mac OS Kernel version: %s", buf );
|
||||
|
||||
|
||||
S32 ramMB;
|
||||
err = _getSysCTLvalue<U64>("hw.memsize", &llraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine amount of physical RAM\n" );
|
||||
ramMB = 512;
|
||||
else
|
||||
Con::printf( " Physical memory installed: %d MB", (llraw >> 20));
|
||||
|
||||
err = _getSysCTLvalue<U32>("hw.usermem", &lraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine available user address space\n");
|
||||
else
|
||||
Con::printf( " Addressable user memory: %d MB", (lraw >> 20));
|
||||
|
||||
////////////////////////////////
|
||||
// Values for the Family Type, CPU Type and CPU Subtype are defined in the
|
||||
// SDK files for the Mach Kernel ==> mach/machine.h
|
||||
////////////////////////////////
|
||||
|
||||
// CPU Family, Type, and Subtype
|
||||
cpufam = 0;
|
||||
cputype = 0;
|
||||
cpusub = 0;
|
||||
err = _getSysCTLvalue<U32>("hw.cpufamily", &lraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine 'family' of CPU\n");
|
||||
else {
|
||||
cpufam = (int) lraw;
|
||||
err = _getSysCTLvalue<U32>("hw.cputype", &lraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine CPU type\n");
|
||||
else {
|
||||
cputype = (int) lraw;
|
||||
err = _getSysCTLvalue<U32>("hw.cpusubtype", &lraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine CPU subtype\n");
|
||||
else
|
||||
cpusub = (int) lraw;
|
||||
// If we've made it this far,
|
||||
Con::printf( " Installed processor ID: Family 0x%08x Type %d Subtype %d",cpufam, cputype,cpusub);
|
||||
}
|
||||
}
|
||||
ramMB = llraw >> 20;
|
||||
|
||||
char brandString[256];
|
||||
err = _getSysCTLstring("machdep.cpu.brand_string", brandString, sizeof(brandString));
|
||||
if (err)
|
||||
brandString[0] = '\0';
|
||||
|
||||
char vendor[256];
|
||||
err = _getSysCTLstring("machdep.cpu.vendor", vendor, sizeof(vendor));
|
||||
if (err)
|
||||
vendor[0] = '\0';
|
||||
|
||||
// The Gestalt version was known to have issues with some Processor Upgrade cards
|
||||
// but it is uncertain whether this version has similar issues.
|
||||
err = _getSysCTLvalue<U64>("hw.cpufrequency", &llraw);
|
||||
if (err) {
|
||||
llraw = BASE_MHZ_SPEED;
|
||||
Con::printf( " Unable to determine CPU Frequency. Defaulting to %d MHz\n", llraw);
|
||||
} else {
|
||||
llraw /= 1000000;
|
||||
Con::printf( " Installed processor clock frequency: %d MHz", llraw);
|
||||
}
|
||||
Platform::SystemInfo.processor.mhz = (unsigned int)llraw;
|
||||
|
||||
// Here's one that the original version of this routine couldn't do -- number
|
||||
// of processors (cores)
|
||||
U32 ncpu = 1;
|
||||
err = _getSysCTLvalue<U32>("hw.ncpu", &lraw);
|
||||
if (err)
|
||||
Con::printf( " Unable to determine number of processor cores\n");
|
||||
else
|
||||
{
|
||||
ncpu = lraw;
|
||||
Con::printf( " Installed/available processor cores: %d", lraw);
|
||||
}
|
||||
|
||||
// Now use CPUFAM to determine and then store the processor type
|
||||
// and 'friendly name' in GG-accessible structure. Note that since
|
||||
// we have access to the Family code, the Type and Subtypes are useless.
|
||||
//
|
||||
// NOTE: Even this level of detail is almost assuredly not needed anymore
|
||||
// and the Optional Capability flags (further down) should be more than enough.
|
||||
switch(cpufam)
|
||||
{
|
||||
case CPUFAMILY_INTEL_YONAH:
|
||||
Platform::SystemInfo.processor.type = CPU_Intel_Core;
|
||||
if( ncpu == 2 )
|
||||
Platform::SystemInfo.processor.name = StringTable->insert("Intel Core Duo");
|
||||
else
|
||||
Platform::SystemInfo.processor.name = StringTable->insert("Intel Core");
|
||||
break;
|
||||
case CPUFAMILY_INTEL_PENRYN:
|
||||
case CPUFAMILY_INTEL_MEROM:
|
||||
Platform::SystemInfo.processor.type = CPU_Intel_Core2;
|
||||
if( ncpu == 4 )
|
||||
Platform::SystemInfo.processor.name = StringTable->insert("Intel Core 2 Quad");
|
||||
else
|
||||
Platform::SystemInfo.processor.name = StringTable->insert("Intel Core 2 Duo");
|
||||
break;
|
||||
|
||||
case CPUFAMILY_INTEL_NEHALEM:
|
||||
Platform::SystemInfo.processor.type = CPU_Intel_Core2;
|
||||
Platform::SystemInfo.processor.name = StringTable->insert( "Intel 'Nehalem' Core Processor" );
|
||||
break;
|
||||
|
||||
default:
|
||||
// explain why we can't get the processor type.
|
||||
Con::warnf( " Unknown Processor (family, type, subtype): 0x%x\t%d %d", cpufam, cputype, cpusub);
|
||||
// for now, identify it as an x86 processor, because Apple is moving to Intel chips...
|
||||
Platform::SystemInfo.processor.type = CPU_X86Compatible;
|
||||
Platform::SystemInfo.processor.name = StringTable->insert("Unknown Processor, assuming x86 Compatible");
|
||||
break;
|
||||
}
|
||||
// Now we can directly query the system about a litany of "Optional" processor capabilities
|
||||
// and determine the status by using BOTH the 'err' value and the 'lraw' value. If we request
|
||||
// a non-existant feature from SYSCTL(), the 'err' result will be -1; 0 denotes it exists
|
||||
// >>>> BUT <<<<<
|
||||
// it may not be supported, only defined. Thus we need to check 'lraw' to determine if it's
|
||||
// actually supported/implemented by the processor: 0 = no, 1 = yes, others are undefined.
|
||||
procflags = 0;
|
||||
// Seriously this one should be an Assert()
|
||||
err = _getSysCTLvalue<U32>("hw.optional.floatingpoint", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_FPU;
|
||||
// List of chip-specific features
|
||||
err = _getSysCTLvalue<U32>("hw.optional.mmx", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_MMX;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse2", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE2;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse3", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE3;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.supplementalsse3", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE3xt;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse4_1", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE4_1;
|
||||
err = _getSysCTLvalue<U32>("hw.optional.sse4_2", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_SSE4_2;
|
||||
|
||||
// Finally some architecture-wide settings
|
||||
err = _getSysCTLvalue<U32>("hw.ncpu", &lraw);
|
||||
if ((err==0)&&(lraw>1)) procflags |= CPU_PROP_MP;
|
||||
err = _getSysCTLvalue<U32>("hw.cpu64bit_capable", &lraw);
|
||||
if ((err==0)&&(lraw==1)) procflags |= CPU_PROP_64bit;
|
||||
err = _getSysCTLvalue<U32>("hw.byteorder", &lraw);
|
||||
if ((err==0)&&(lraw==1234)) procflags |= CPU_PROP_LE;
|
||||
|
||||
Platform::SystemInfo.processor.properties = procflags;
|
||||
|
||||
Con::printf( "%s, %2.2f GHz", Platform::SystemInfo.processor.name, F32( Platform::SystemInfo.processor.mhz ) / 1000.0 );
|
||||
procflags = CPU_PROP_FPU;
|
||||
detectCpuFeatures(procflags);
|
||||
|
||||
Platform::SystemInfo.processor.properties = procflags;
|
||||
SetProcessoInfo(Platform::SystemInfo.processor, vendor, brandString);
|
||||
|
||||
|
||||
Con::printf("System & Processor Information:");
|
||||
Con::printf(" MacOS Version: %s", [osVersionStr UTF8String]);
|
||||
Con::printf(" Physical memory installed: %d MB", ramMB);
|
||||
Con::printf(" Processor: %s", Platform::SystemInfo.processor.name);
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_MMX)
|
||||
Con::printf( " MMX detected");
|
||||
Con::printf(" MMX detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE)
|
||||
Con::printf( " SSE detected");
|
||||
Con::printf(" SSE detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE2)
|
||||
Con::printf( " SSE2 detected");
|
||||
Con::printf(" SSE2 detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE3)
|
||||
Con::printf( " SSE3 detected");
|
||||
Con::printf(" SSE3 detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE3ex)
|
||||
Con::printf(" SSE3ex detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE4_1)
|
||||
Con::printf( " SSE4.1 detected");
|
||||
Con::printf(" SSE4.1 detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE4_2)
|
||||
Con::printf( " SSE4.2 detected");
|
||||
Con::printf(" SSE4.2 detected");
|
||||
if (Platform::SystemInfo.processor.properties & CPU_PROP_AVX)
|
||||
Con::printf(" AVX detected");
|
||||
|
||||
Con::printf( "" );
|
||||
|
||||
|
|
@ -277,16 +204,38 @@ void Processor::init()
|
|||
Platform::SystemInfoReady.trigger();
|
||||
}
|
||||
|
||||
|
||||
namespace CPUInfo {
|
||||
EConfig CPUCount(U32 &logical, U32 &numCores, U32 &numPhysical) {
|
||||
// todo properly implement this
|
||||
logical = [[NSProcessInfo processInfo] activeProcessorCount];
|
||||
numCores = [[NSProcessInfo processInfo] activeProcessorCount];
|
||||
numPhysical = [[NSProcessInfo processInfo] processorCount];
|
||||
EConfig CPUCount(U32 &logical, U32 &physical) {
|
||||
U32 lraw;
|
||||
int err;
|
||||
|
||||
// todo check for hyperthreading
|
||||
if (numCores > 1)
|
||||
return CONFIG_MultiCoreAndHTNotCapable;
|
||||
return CONFIG_SingleCoreAndHTNotCapable;
|
||||
err = _getSysCTLvalue<U32>("hw.physicalcpu", &lraw);
|
||||
if (err == 0)
|
||||
physical = lraw;
|
||||
else
|
||||
physical = 1;
|
||||
|
||||
err = _getSysCTLvalue<U32>("hw.logicalcpu", &lraw);
|
||||
if (err == 0)
|
||||
{
|
||||
logical = lraw;
|
||||
}
|
||||
else
|
||||
{
|
||||
// fallback to querying the number of cpus. If that fails, then assume same as number of cores
|
||||
err = _getSysCTLvalue<U32>("hw.ncpu", &lraw);
|
||||
if (err == 0)
|
||||
logical = lraw;
|
||||
else
|
||||
logical = physical;
|
||||
}
|
||||
|
||||
const bool smtEnabled = logical > physical;
|
||||
|
||||
if (physical == 1)
|
||||
return smtEnabled ? CONFIG_SingleCoreHTEnabled : CONFIG_SingleCoreAndHTNotCapable;
|
||||
|
||||
return smtEnabled ? CONFIG_MultiCoreAndHTEnabled : CONFIG_MultiCoreAndHTNotCapable;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue