johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-29 07:53:37 +02:00
Code Issues Releases Wiki Activity

Add CpuIdEx function to pass inputs in ecx register (required for E.g. leaf4) (#77)

Browse Source
This commit is contained in:
Artem Alekseev 2019-06-21 15:13:29 +03:00 committed by Guillaume Chatelet
parent 3ee4a9e801
commit bfb4cf99cc
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/cpuid_x86.h
View File

@ -26,8 +26,7 @@ typedef struct {
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
} Leaf; } Leaf;
// Retrieves the leaf for a particular cpuid. Leaf CpuIdEx(uint32_t leaf_id, int ecx);
Leaf CpuId(uint32_t leaf_id);
// Returns the eax value of the XCR0 register. // Returns the eax value of the XCR0 register.
uint32_t GetXCR0Eax(void); uint32_t GetXCR0Eax(void);

20
src/cpuinfo_x86.c
View File

@ -33,9 +33,9 @@
#include <cpuid.h> #include <cpuid.h>
Leaf CpuId(uint32_t leaf_id) { Leaf CpuIdEx(uint32_t leaf_id, int ecx) {
Leaf leaf; Leaf leaf;
__cpuid_count(leaf_id, 0, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx); __cpuid_count(leaf_id, ecx, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx);
return leaf; return leaf;
} }
@ -53,10 +53,10 @@ uint32_t GetXCR0Eax(void) {
#include <immintrin.h> #include <immintrin.h>
#include <intrin.h> // For __cpuidex() #include <intrin.h> // For __cpuidex()
Leaf CpuId(uint32_t leaf_id) { Leaf CpuIdEx(uint32_t leaf_id, int ecx) {
Leaf leaf; Leaf leaf;
int data[4]; int data[4];
__cpuid(data, leaf_id); __cpuidex(data, leaf_id, ecx);
leaf.eax = data[0]; leaf.eax = data[0];
leaf.ebx = data[1]; leaf.ebx = data[1];
leaf.ecx = data[2]; leaf.ecx = data[2];
@ -70,16 +70,24 @@ uint32_t GetXCR0Eax(void) { return _xgetbv(0); }
#error "Unsupported compiler, x86 cpuid requires either GCC, Clang or MSVC." #error "Unsupported compiler, x86 cpuid requires either GCC, Clang or MSVC."
#endif #endif
static Leaf CpuId(uint32_t leaf_id) {
return CpuIdEx(leaf_id, 0);
}
static const Leaf kEmptyLeaf; static const Leaf kEmptyLeaf;
static Leaf SafeCpuId(uint32_t max_cpuid_leaf, uint32_t leaf_id) { static Leaf SafeCpuIdEx(uint32_t max_cpuid_leaf, uint32_t leaf_id, int ecx) {
if (leaf_id <= max_cpuid_leaf) { if (leaf_id <= max_cpuid_leaf) {
return CpuId(leaf_id); return CpuIdEx(leaf_id, ecx);
} else { } else {
return kEmptyLeaf; return kEmptyLeaf;
} }
} }
static Leaf SafeCpuId(uint32_t max_cpuid_leaf, uint32_t leaf_id) {
return SafeCpuIdEx(max_cpuid_leaf, leaf_id, 0);
}
#define MASK_XMM 0x2 #define MASK_XMM 0x2
#define MASK_YMM 0x4 #define MASK_YMM 0x4
#define MASK_MASKREG 0x20 #define MASK_MASKREG 0x20

5
test/cpuinfo_x86_test.cc
View File

@ -25,7 +25,7 @@ namespace cpu_features {
class FakeCpu { class FakeCpu {
public: public:
Leaf CpuId(uint32_t leaf_id) const { Leaf CpuIdEx(uint32_t leaf_id, int ecx) const {
const auto itr = cpuid_leaves_.find(leaf_id); const auto itr = cpuid_leaves_.find(leaf_id);
EXPECT_TRUE(itr != cpuid_leaves_.end()) << "Missing leaf " << leaf_id; EXPECT_TRUE(itr != cpuid_leaves_.end()) << "Missing leaf " << leaf_id;
return itr->second; return itr->second;
@ -48,7 +48,8 @@ class FakeCpu {
auto* g_fake_cpu = new FakeCpu(); auto* g_fake_cpu = new FakeCpu();
extern "C" Leaf CpuId(uint32_t leaf_id) { return g_fake_cpu->CpuId(leaf_id); } extern "C" Leaf CpuIdEx(uint32_t leaf_id, int ecx) { return g_fake_cpu->CpuIdEx(leaf_id, ecx); }
extern "C" uint32_t GetXCR0Eax(void) { return g_fake_cpu->GetXCR0Eax(); } extern "C" uint32_t GetXCR0Eax(void) { return g_fake_cpu->GetXCR0Eax(); }
namespace { namespace {