From f92a6c506aaf842cfae25759c3f0249070792158 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Tue, 8 Nov 2016 19:51:40 +0100 Subject: [PATCH] benchs: handle Athlon X4 device names and remove double spaces in some intel cpus --- web/yaamp/modules/bench/functions.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/yaamp/modules/bench/functions.php b/web/yaamp/modules/bench/functions.php index c9b3f08..ce4c2bd 100644 --- a/web/yaamp/modules/bench/functions.php +++ b/web/yaamp/modules/bench/functions.php @@ -93,7 +93,7 @@ function formatCudaArch($arch) function formatCPU($row) { - $device = $row['device']; + $device = preg_replace('/[ \t]+/', ' ', $row['device']); if (strpos($device, '(R)')) { // from /proc/cpuinfo (or vendor cpuid) $device = str_replace('(R)', '', $device); @@ -107,8 +107,10 @@ function formatCPU($row) $device = str_replace(' Stepping ', '.', $device); $device = str_replace(' GenuineIntel', ' Intel', $device); $device = str_replace(' AuthenticAMD', ' AMD', $device); - $device = str_replace(' Quad-Core Processor','', $device); - $device = str_replace(' Dual-Core Processor','', $device); + $device = str_replace(' Quad-Core','', $device); + $device = str_replace(' Dual-Core','', $device); + $device = str_replace(' Quad Core','', $device); + $device = str_replace(' Dual Core','', $device); $device = str_replace(' Processor', '', $device); if (strpos($device, 'Intel64') !== false && strpos($device, ' Intel')) { $device = str_replace(' Intel','', $device); @@ -125,6 +127,7 @@ function formatCPU($row) $device = str_replace(' APU with AMD Radeon','', $device); $device = str_replace(' version ',' ', $device); $device = preg_replace('/(HD|R\d) Graphics/','', $device); + $device = preg_replace('/ 0$/', '', $device); // VIA Nano processor U2250 (1.6GHz Capable) $device = str_replace(' (1.6GHz Capable)','', $device); if (stristr($device, 'Virtual CPU') || stristr($device, 'QEMU')) { @@ -145,7 +148,6 @@ function getChipName($row) $device = str_ireplace(' V3', 'v3', $device); $device = str_ireplace(' V4', 'v4', $device); $device = str_ireplace(' V5', 'v5', $device); - $device = preg_replace('/ 0$/', '', $device); if (strpos($device, 'AMD Athlon ')) { return str_replace('AMD ', '', $device); }