GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-12 09:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix EIGEN_CPUID for i386 & PIC, still remains to fix the MSVC version

Browse Source
This commit is contained in:
Gael Guennebaud 2010-06-24 09:29:43 +02:00
parent 98fec45d3c
commit 8beb60bf63
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Eigen/src/Core/util/Memory.h
View File

@ -589,14 +589,15 @@ public:
#if defined(__GNUC__) #if defined(__GNUC__)
# if defined(__PIC__) && defined(__i386__) # if defined(__PIC__) && defined(__i386__)
# define EIGEN_CPUID(abcd,func) \ # define EIGEN_CPUID(abcd,func,id) \
__asm__ __volatile__ ("xchgl %%ebx, %%esi;cpuid; xchgl %%ebx,%%esi": "=a" (abcd[0]), "=S" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func)); __asm__ __volatile__ ("xchgl %%ebx, %%esi;cpuid; xchgl %%ebx,%%esi": "=a" (abcd[0]), "=S" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id));
# else # else
# define EIGEN_CPUID(abcd,func,id) \ # define EIGEN_CPUID(abcd,func,id) \
__asm__ __volatile__ ("cpuid": "=a" (abcd[0]), "=b" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id) ); __asm__ __volatile__ ("cpuid": "=a" (abcd[0]), "=b" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id) );
# endif # endif
#elif defined(_MSC_VER) // TODO fix MSVC cpuid
# define EIGEN_CPUID(abcd,func) __cpuid((int*)abcd,func) // #elif defined(_MSC_VER)
// # define EIGEN_CPUID(abcd,func) __cpuid((int*)abcd,func)
#endif #endif
inline bool ei_cpuid_is_vendor(int abcd[4], const char* vendor) inline bool ei_cpuid_is_vendor(int abcd[4], const char* vendor)
@ -620,9 +621,9 @@ inline void ei_queryCacheSizes_intel(int& l1, int& l2, int& l3)
int partitions = (abcd[1] & 0x003FF000) >> 12; // B[21:12] int partitions = (abcd[1] & 0x003FF000) >> 12; // B[21:12]
int line_size = (abcd[1] & 0x00000FFF) >> 0; // B[11:0] int line_size = (abcd[1] & 0x00000FFF) >> 0; // B[11:0]
int sets = (abcd[2]); // C[31:0] int sets = (abcd[2]); // C[31:0]
int cache_size = (ways+1) * (partitions+1) * (line_size+1) * (sets+1); int cache_size = (ways+1) * (partitions+1) * (line_size+1) * (sets+1);
switch(cache_level) switch(cache_level)
{ {
case 1: l1 = cache_size; break; case 1: l1 = cache_size; break;
@ -651,7 +652,7 @@ inline void ei_queryCacheSizes(int& l1, int& l2, int& l3)
{ {
#ifdef EIGEN_CPUID #ifdef EIGEN_CPUID
int abcd[4]; int abcd[4];
// identify the CPU vendor // identify the CPU vendor
EIGEN_CPUID(abcd,0x0,0); EIGEN_CPUID(abcd,0x0,0);
//if(abcd[1]==GenuineIntel[0] && abcd[2]==GenuineIntel[1] && abcd[3]==GenuineIntel[2]) //if(abcd[1]==GenuineIntel[0] && abcd[2]==GenuineIntel[1] && abcd[3]==GenuineIntel[2])
@ -662,7 +663,7 @@ inline void ei_queryCacheSizes(int& l1, int& l2, int& l3)
else else
// by default let's use Intel's API // by default let's use Intel's API
ei_queryCacheSizes_intel(l1,l2,l3); ei_queryCacheSizes_intel(l1,l2,l3);
// here is the list of other vendors: // here is the list of other vendors:
// ||ei_cpuid_is_vendor(abcd,"VIA VIA VIA ") // ||ei_cpuid_is_vendor(abcd,"VIA VIA VIA ")
// ||ei_cpuid_is_vendor(abcd,"CyrixInstead") // ||ei_cpuid_is_vendor(abcd,"CyrixInstead")