mirror of https://github.com/pbatard/rufus.git
Browse Source
[misc] arch/cpu refactoring
[misc] arch/cpu refactoring
* Move the cpu.c/cpu.h in more logical places and remove these sources files. * Add detection for LoongArch64 EFI bootloaders. * Pass the detected CPU arch when invoking Fido. * Also fix some Bled Coverity warnings.pull/2636/head
Pete Batard
8 months ago
No known key found for this signature in database
GPG Key ID: 38E0CF5E69EDD671
16 changed files with 121 additions and 260 deletions
-
2.vs/rufus.vcxproj
-
6.vs/rufus.vcxproj.filters
-
2src/Makefile.am
-
19src/Makefile.in
-
9src/bled/header_verbose_list.c
-
1src/bled/libbb.h
-
123src/cpu.c
-
79src/cpu.h
-
87src/hash.c
-
4src/iso.c
-
5src/missing.h
-
11src/net.c
-
3src/parser.c
-
8src/rufus.c
-
12src/rufus.h
-
10src/rufus.rc
@ -1,123 +0,0 @@ |
|||
/* |
|||
* Rufus: The Reliable USB Formatting Utility |
|||
* CPU features detection |
|||
* Copyright © 2022 Pete Batard <pete@akeo.ie> |
|||
* Copyright © 2022 Jeffrey Walton <noloader@gmail.com> |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
|||
*/ |
|||
|
|||
#include "cpu.h" |
|||
|
|||
#if (defined(CPU_X86_SHA1_ACCELERATION) || defined(CPU_X86_SHA256_ACCELERATION)) |
|||
#if defined(RUFUS_MSC_VERSION) |
|||
#include <intrin.h> |
|||
#elif (defined(RUFUS_GCC_VERSION) || defined(RUFUS_CLANG_VERSION)) |
|||
#include <x86Intrin.h> |
|||
#elif defined(RUFUS_INTEL_VERSION) |
|||
#include <immintrin.h> |
|||
#endif |
|||
#endif |
|||
|
|||
BOOL cpu_has_sha1_accel = FALSE; |
|||
BOOL cpu_has_sha256_accel = FALSE; |
|||
|
|||
/* |
|||
* Three elements must be in place to make a meaningful call to the |
|||
* DetectSHA###Acceleration() calls. First, the compiler must support |
|||
* the underlying intrinsics. Second, the platform must provide a |
|||
* cpuid() function. And third, the cpu must actually support the SHA-1 |
|||
* and SHA-256 instructions. |
|||
* |
|||
* If any of the conditions are not met, then DetectSHA###Acceleration() |
|||
* returns FALSE. |
|||
*/ |
|||
|
|||
/* |
|||
* Detect if the processor supports SHA-1 acceleration. We only check for |
|||
* the three ISAs we need - SSSE3, SSE4.1 and SHA. We don't check for OS |
|||
* support or XSAVE because that's been enabled since Windows 2000. |
|||
*/ |
|||
BOOL DetectSHA1Acceleration(void) |
|||
{ |
|||
#if defined(CPU_X86_SHA1_ACCELERATION) |
|||
#if defined(_MSC_VER) |
|||
uint32_t regs0[4] = {0,0,0,0}, regs1[4] = {0,0,0,0}, regs7[4] = {0,0,0,0}; |
|||
const uint32_t SSSE3_BIT = 1u << 9; /* Function 1, Bit 9 of ECX */ |
|||
const uint32_t SSE41_BIT = 1u << 19; /* Function 1, Bit 19 of ECX */ |
|||
const uint32_t SHA_BIT = 1u << 29; /* Function 7, Bit 29 of EBX */ |
|||
|
|||
__cpuid(regs0, 0); |
|||
const uint32_t highest = regs0[0]; /*EAX*/ |
|||
|
|||
if (highest >= 0x01) { |
|||
__cpuidex(regs1, 1, 0); |
|||
} |
|||
if (highest >= 0x07) { |
|||
__cpuidex(regs7, 7, 0); |
|||
} |
|||
|
|||
return (regs1[2] /*ECX*/ & SSSE3_BIT) && (regs1[2] /*ECX*/ & SSE41_BIT) && (regs7[1] /*EBX*/ & SHA_BIT) ? TRUE : FALSE; |
|||
#elif defined(__GNUC__) || defined(__clang__) |
|||
/* __builtin_cpu_supports available in GCC 4.8.1 and above */ |
|||
return __builtin_cpu_supports("ssse3") && __builtin_cpu_supports("sse4.1") && __builtin_cpu_supports("sha") ? TRUE : FALSE; |
|||
#elif defined(__INTEL_COMPILER) |
|||
/* https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_may_i_use_cpu_feature */ |
|||
return _may_i_use_cpu_feature(_FEATURE_SSSE3|_FEATURE_SSE4_1|_FEATURE_SHA) ? TRUE : FALSE; |
|||
#else |
|||
return FALSE; |
|||
#endif |
|||
#else |
|||
return FALSE; |
|||
#endif |
|||
} |
|||
|
|||
/* |
|||
* Detect if the processor supports SHA-256 acceleration. We only check for |
|||
* the three ISAs we need - SSSE3, SSE4.1 and SHA. We don't check for OS |
|||
* support or XSAVE because that's been enabled since Windows 2000. |
|||
*/ |
|||
BOOL DetectSHA256Acceleration(void) |
|||
{ |
|||
#if defined(CPU_X86_SHA256_ACCELERATION) |
|||
#if defined(_MSC_VER) |
|||
uint32_t regs0[4] = {0,0,0,0}, regs1[4] = {0,0,0,0}, regs7[4] = {0,0,0,0}; |
|||
const uint32_t SSSE3_BIT = 1u << 9; /* Function 1, Bit 9 of ECX */ |
|||
const uint32_t SSE41_BIT = 1u << 19; /* Function 1, Bit 19 of ECX */ |
|||
const uint32_t SHA_BIT = 1u << 29; /* Function 7, Bit 29 of EBX */ |
|||
|
|||
__cpuid(regs0, 0); |
|||
const uint32_t highest = regs0[0]; /*EAX*/ |
|||
|
|||
if (highest >= 0x01) { |
|||
__cpuidex(regs1, 1, 0); |
|||
} |
|||
if (highest >= 0x07) { |
|||
__cpuidex(regs7, 7, 0); |
|||
} |
|||
|
|||
return (regs1[2] /*ECX*/ & SSSE3_BIT) && (regs1[2] /*ECX*/ & SSE41_BIT) && (regs7[1] /*EBX*/ & SHA_BIT) ? TRUE : FALSE; |
|||
#elif defined(__GNUC__) || defined(__clang__) |
|||
/* __builtin_cpu_supports available in GCC 4.8.1 and above */ |
|||
return __builtin_cpu_supports("ssse3") && __builtin_cpu_supports("sse4.1") && __builtin_cpu_supports("sha") ? TRUE : FALSE; |
|||
#elif defined(__INTEL_COMPILER) |
|||
/* https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_may_i_use_cpu_feature */ |
|||
return _may_i_use_cpu_feature(_FEATURE_SSSE3|_FEATURE_SSE4_1|_FEATURE_SHA) ? TRUE : FALSE; |
|||
#else |
|||
return FALSE; |
|||
#endif |
|||
#else |
|||
return FALSE; |
|||
#endif |
|||
} |
|||
@ -1,79 +0,0 @@ |
|||
/* |
|||
* Rufus: The Reliable USB Formatting Utility |
|||
* CPU features detection |
|||
* Copyright © 2022 Pete Batard <pete@akeo.ie> |
|||
* Copyright © 2022 Jeffrey Walton <noloader@gmail.com> |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
|||
*/ |
|||
|
|||
/* |
|||
* Primarily added to support SHA instructions on x86 machines. |
|||
* SHA acceleration is becoming as ubiquitous as AES acceleration. |
|||
* SHA support was introduced in Intel Goldmont architecture, like |
|||
* Celeron J3455 and Pentium J4205. The instructions are now present |
|||
* in AMD Ryzen 3 (Zen architecture) and above, and Intel Core |
|||
* 10th-gen processors (Ice Lake), 11th-gen processors (Rocket Lake) |
|||
* and above. |
|||
* |
|||
* Typical benchmarks for x86 SHA acceleration is about a 6x to 10x |
|||
* speedup over a C/C++ implementation. The rough measurements are |
|||
* 1.0 to 1.8 cpb for SHA-1, and 1.5 to 2.5 cpb for SHA-256. On a |
|||
* Celeron J3455, that's 1.1 GB/s for SHA-1 and 800 MB/s for SHA-256. |
|||
* On a 10th-gen Core i5, that's about 1.65 GB/s for SHA-1 and about |
|||
* 1.3 GB/s for SHA-256. |
|||
*/ |
|||
|
|||
#include "rufus.h" |
|||
|
|||
#pragma once |
|||
|
|||
#ifdef _MSC_VER |
|||
#define RUFUS_MSC_VERSION (_MSC_VER) |
|||
#if (RUFUS_MSC_VERSION < 1900) |
|||
#error "Your compiler is too old to build this application" |
|||
#endif |
|||
#endif |
|||
|
|||
#if defined(__GNUC__) |
|||
#define RUFUS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) |
|||
#if (RUFUS_GCC_VERSION < 40900) |
|||
#error "Your compiler is too old to build this application" |
|||
#endif |
|||
#endif |
|||
|
|||
#ifdef __INTEL_COMPILER |
|||
#define RUFUS_INTEL_VERSION (__INTEL_COMPILER) |
|||
#if (RUFUS_INTEL_VERSION < 1600) |
|||
#error "Your compiler is too old to build this application" |
|||
#endif |
|||
#endif |
|||
|
|||
#if defined(__clang__) |
|||
#define RUFUS_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) |
|||
#if (RUFUS_CLANG_VERSION < 30400) |
|||
#error "Your compiler is too old to build this application" |
|||
#endif |
|||
#endif |
|||
|
|||
#if (defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || \ |
|||
defined(_X86_) || defined(__I86__) || defined(__x86_64__)) |
|||
#define CPU_X86_SHA1_ACCELERATION 1 |
|||
#define CPU_X86_SHA256_ACCELERATION 1 |
|||
#endif |
|||
|
|||
extern BOOL cpu_has_sha1_accel, cpu_has_sha256_accel; |
|||
|
|||
extern BOOL DetectSHA1Acceleration(void); |
|||
extern BOOL DetectSHA256Acceleration(void); |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue