johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-27 23:22:31 +02:00
Code Issues Releases Wiki Activity

GCC does not discover all cpu features. Fixes #22

Browse Source
This commit is contained in:
Guillaume Chatelet 2018-02-13 10:12:21 +01:00
parent 9df2d78b8d
commit 7634420f31
3 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -38,8 +38,7 @@ add_library(cpu_features
include/internal/string_view.h include/internal/string_view.h
include/cpu_features_macros.h include/cpu_features_macros.h
src/linux_features_aggregator.c src/linux_features_aggregator.c
src/cpuid_x86_clang.c src/cpuid_x86_clang_gcc.c
src/cpuid_x86_gcc.c
src/cpuid_x86_msvc.c src/cpuid_x86_msvc.c
src/cpuinfo_aarch64.c src/cpuinfo_aarch64.c
src/cpuinfo_arm.c src/cpuinfo_arm.c

8
src/cpuid_x86_clang.c → src/cpuid_x86_clang_gcc.c
View File

@ -14,7 +14,9 @@
#include "internal/cpuid_x86.h" #include "internal/cpuid_x86.h"
#if defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_CLANG) #if defined(CPU_FEATURES_ARCH_X86)
#if defined(CPU_FEATURES_COMPILER_CLANG) || defined(CPU_FEATURES_COMPILER_GCC)
#include <cpuid.h> #include <cpuid.h>
Leaf CpuId(uint32_t leaf_id) { Leaf CpuId(uint32_t leaf_id) {
@ -29,4 +31,6 @@ uint32_t GetXCR0Eax(void) {
return eax; return eax;
} }
#endif // defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_CLANG) #endif // defined(CPU_FEATURES_COMPILER_CLANG) ||
// defined(CPU_FEATURES_COMPILER_GCC)
#endif // defined(CPU_FEATURES_ARCH_X86)

32
src/cpuid_x86_gcc.c
View File

@ -1,32 +0,0 @@
// Copyright 2017 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "internal/cpuid_x86.h"
#if defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_GCC)
#include <cpuid.h>
Leaf CpuId(uint32_t leaf_id) {
Leaf leaf;
__cpuid(leaf_id, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx);
return leaf;
}
uint32_t GetXCR0Eax(void) {
uint32_t eax, edx;
__asm("XGETBV" : "=a"(eax), "=d"(edx) : "c"(0));
return eax;
}
#endif // defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_GCC)