diff --git a/web/yaamp/modules/bench/functions.php b/web/yaamp/modules/bench/functions.php index 28c1b25..3bda4d7 100644 --- a/web/yaamp/modules/bench/functions.php +++ b/web/yaamp/modules/bench/functions.php @@ -154,6 +154,9 @@ function getChipName($row) if (strpos($device, 'AMD Athlon ')) { return str_replace('AMD ', '', $device); } + $device = preg_replace('/AMD (A6\-[1-9]+) APU .+/','\1', $device); + $device = preg_replace('/AMD (E[\d]*\-[\d]+) APU .+/','\1', $device); + $device = preg_replace('/AMD (A[\d]+\-[\d]+[KP]*) Radeon .+/','\1', $device); $words = explode(' ', $device); $chip = array_pop($words); if (strpos($device, 'Fam.')) $chip = '-'; // WIN ENV @@ -170,8 +173,15 @@ function getChipName($row) $chip = str_replace('GeForce ','', $chip); $chip = str_replace('GT ','', $chip); $chip = str_replace('GTX ','', $chip); + $chip = str_replace('650 Ti BOOST','650 Ti', $chip); $chip = str_replace(' (Pascal)',' Pascal', $chip); $chip = preg_replace('/ASUS ([6-9]\d\dM)/','\1', $chip); // ASUS 940M + $chip = preg_replace('/MSI ([6-9]\d\dM)/','\1', $chip); // MSI 840M + $chip = preg_replace('/MSI ([6-9]\d\dMX)/','\1', $chip); // MSI 940MX + if (strpos($chip, 'P106-100') !== false || strpos($chip, 'CMP3-1') !== false) + $chip = 'P106-100'; + if (strpos($chip, 'P104-100') !== false || strpos($chip, 'CMP4-1') !== false) + $chip = 'P104-100'; } }