coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-06 08:46:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rollback util cpuid hybrid detect due to android build errors

Browse Source 
Bug: 438241552
Change-Id: Ie56aa7296e796e44e63d0dd913120b897b12cc9b
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/6843504
Reviewed-by: Wan-Teh Chang <wtc@google.com>
This commit is contained in:
Frank Barchard 2025-08-12 14:08:05 -07:00
parent b7d97d5f3f
commit d71cda1bb0
3 changed files with 8 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: https://chromium.googlesource.com/libyuv/libyuv/ URL: https://chromium.googlesource.com/libyuv/libyuv/
Version: 1915 Version: 1916
License: BSD-3-Clause License: BSD-3-Clause
License File: LICENSE License File: LICENSE
Shipped: yes Shipped: yes

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1915 #define LIBYUV_VERSION 1916
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_

163
util/cpuid.c
View File

@ -8,156 +8,23 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
// For hybrid detect.
#if defined(__linux__) && !defined(_GNU_SOURCE) && \
(defined(__i386__) || defined(__x86_64__))
#define _GNU_SOURCE
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef __linux__ #ifdef __linux__
#include <ctype.h> #include <ctype.h>
#include <pthread.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h> // for sysconf
#include <sched.h> // For hybrid detect CPU_ZERO()
#endif
// For hybrid detect
#if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
defined(_M_X64)
#include <stdbool.h>
#endif // defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
// defined(_M_X64)
#if defined(_WIN32)
#include <windows.h> // for GetSystemInfo
#endif
#if defined(__APPLE__)
#include <sys/sysctl.h> // for sysctlbyname
#endif #endif
#include "libyuv/cpu_id.h" #include "libyuv/cpu_id.h"
#if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ #ifdef __cplusplus
defined(_M_X64) using namespace libyuv;
// Start of Intel Hybrid Detect
// test Intel and AMD cpuid flags for hybrid cpu
void isHybridCPU(bool* isaHybrid) {
int cpu_info[4];
// Check EDX bit 15 for hybrid design indication
CpuId(7, 0, &cpu_info[0]);
int hybrid = (cpu_info[3] >> 15) & 1;
if (hybrid) {
*isaHybrid = true;
} else {
*isaHybrid = false;
}
}
// tests Intel and AMD cpuid flags for performance core
// 0x40 = performance core, 0x20 = efficient core
bool isPerformanceCore(void) {
int cpu_info[4];
// Check EDX bit 15 for hybrid design indication
CpuId(0x1A, 0, &cpu_info[0]);
// core type from eax 24-31
int core_type = (cpu_info[0] >> 24) & 0xFF;
bool isaPCore = core_type != 0x20;
return isaPCore;
}
// TODO(fbarchard): Use common function to query Nth core
#if defined(__linux__)
void* core_thread(void* arg) {
int core_id = *(int*)arg;
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
CPU_SET(core_id, &cpuset);
pthread_t thread = pthread_self();
bool runningCoreThread;
if (pthread_setaffinity_np(thread, sizeof(cpu_set_t), &cpuset) == 0) {
runningCoreThread = true;
} else {
runningCoreThread = false;
}
// confirm affinity
CPU_ZERO(&cpuset);
pthread_getaffinity_np(thread, sizeof(cpu_set_t), &cpuset);
printf("thread running on cpu: ");
for (int i = 0; i < CPU_SETSIZE; i++) {
if (CPU_ISSET(i, &cpuset)) {
printf("%d ", i);
if (runningCoreThread) {
const bool isaPerformanceCore = isPerformanceCore();
if (isaPerformanceCore) {
printf("Core[%d] - Performance\n", i);
} else {
printf("Core[%d] - Efficient\n", i);
}
}
}
}
return NULL;
}
#endif // defined(__linux__)
// Detect cpuid for Nth core
void detectCoreType(int num_cpus) {
#if defined(_WIN32)
for (int i = 0; i < num_cpus; i++) {
HANDLE hThread = NULL;
DWORD_PTR prevThreadPtr = 0;
DWORD_PTR affinityMask = 0;
hThread = GetCurrentThread();
affinityMask = 1ULL << i; // Select core (0-based index)
prevThreadPtr = SetThreadAffinityMask(hThread, affinityMask);
if (prevThreadPtr != 0) {
const bool isaPerformanceCore = isPerformanceCore();
if (isaPerformanceCore) {
printf("Core[%d] - Performance\n", i);
} else {
printf("Core[%d] - Efficient\n", i);
}
} else {
printf("Core[%d] - Error setting affinity\n", i);
}
}
#elif defined(__linux__)
pthread_t thread_id;
int core_id;
for (int i = 0; i < num_cpus; i++) {
core_id = i;
if (pthread_create(&thread_id, NULL, core_thread, &core_id) != 0) {
printf("WARNING: Error creating thread %d\n", i);
fflush(stdout);
return;
}
if (pthread_join(thread_id, NULL) != 0) {
printf("WARNING: Error joining thread %d\n", i);
fflush(stdout);
return;
}
}
#endif #endif
}
// End of Hybrid Detect
#endif // defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
// defined(_M_X64)
#if defined(__linux__) #ifdef __linux__
void KernelVersion(int version[2]) { static void KernelVersion(int* version) {
struct utsname buffer; struct utsname buffer;
int i = 0; int i = 0;
@ -171,11 +38,12 @@ void KernelVersion(int version[2]) {
} }
} }
} }
#endif // defined(__linux__) #endif
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
(void)argc; (void)argc;
(void)argv; (void)argv;
#if defined(__linux__) #if defined(__linux__)
{ {
int kernelversion[2]; int kernelversion[2];
@ -183,23 +51,6 @@ int main(int argc, const char* argv[]) {
printf("Kernel Version %d.%d\n", kernelversion[0], kernelversion[1]); printf("Kernel Version %d.%d\n", kernelversion[0], kernelversion[1]);
} }
#endif // defined(__linux__) #endif // defined(__linux__)
#if defined(_WIN32)
SYSTEM_INFO sysInfo;
GetSystemInfo(&sysInfo);
int num_cpus = (int)sysInfo.dwNumberOfProcessors;
#elif defined(__linux__)
int num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
#elif defined(__APPLE__)
int num_cpus = 0;
size_t num_cpus_len = sizeof(num_cpus);
// Get the number of logical CPU cores
if (sysctlbyname("hw.logicalcpu", &num_cpus, &num_cpus_len, NULL, 0) == -1) {
printf("sysctlbyname failed to get hw.logicalcpu\n");
}
#else
int num_cpus = 0; // unknown OS
#endif
printf("Number of cpus: %d\n", num_cpus);
#if defined(__arm__) || defined(__aarch64__) #if defined(__arm__) || defined(__aarch64__)
int has_arm = TestCpuFlag(kCpuHasARM); int has_arm = TestCpuFlag(kCpuHasARM);
@ -304,8 +155,6 @@ int main(int argc, const char* argv[]) {
cpu_info[3] = 0; cpu_info[3] = 0;
printf("Cpu Vendor: %s\n", (char*)(&cpu_info[0])); printf("Cpu Vendor: %s\n", (char*)(&cpu_info[0]));
detectCoreType(num_cpus);
// CPU Family and Model // CPU Family and Model
// 3:0 - Stepping // 3:0 - Stepping
// 7:4 - Model // 7:4 - Model