mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.22.2
This commit is contained in:
kyodev
parent
f01769249d
commit
ad070311b4
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.22.1
|
||||
date="02/11/2017"
|
||||
version=2.22.2
|
||||
date="03/11/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getInfo"
|
||||
|
|
@ -1242,9 +1242,10 @@ figet_batt(){ #v2 01/11/2017
|
|||
}
|
||||
|
||||
# assigne $fg_cpu (3 lignes description cpu), fg_nb_threads, $fg_cpu_arch, $fg_uarch
|
||||
figet_cpu(){ #v2 02/11/2017
|
||||
figet_cpu(){ #v2 03/11/2017
|
||||
local cpuinfo speedNom speedMax speedMin speedCpu cpu1 cpu2 cpu3 var_temp vendor family model
|
||||
local defaut_model="modèle non répertorié" defaut_family="famille non répertoriée"
|
||||
local defaut_vendor="fabricant non répertorié"
|
||||
cpuinfo="$(cat /proc/cpuinfo)"
|
||||
# speed
|
||||
speedNom=$(gawk -F ':' '/cpu MHz/ {printf "%.2f", $2/1000;exit}' <<< "$cpuinfo")
|
||||
|
|
@ -1265,25 +1266,28 @@ figet_cpu(){ #v2 02/11/2017
|
|||
/cpu cores/ { procCore=sprintf("%d",$2); if (procCore>1) pllc="s" }
|
||||
/siblings/ { procThread=sprintf("%d",$2); if (procThread>1) pllt="s" }
|
||||
/microcode/ { sub(/^ /,"",$2); microCode=$2 }
|
||||
END { print nbCpu" x "cpu " (" procCore "core" pllc ", " procThread "thread" pllt ") {" speedCpu "} microcode:" microCode }
|
||||
' <<< "$cpuinfo "
|
||||
END {
|
||||
printf nbCpu" x "cpu " (" procCore "core" pllc ", " procThread "thread" pllt;
|
||||
print ") {" speedCpu "} microcode:" microCode
|
||||
}' <<< "$cpuinfo "
|
||||
)
|
||||
cpu2=$(
|
||||
gawk -F ':' '
|
||||
/^vendor_id/{gsub(/ /,"",$2);vendor=$2}; /^cpu family/{family=$2};
|
||||
/^vendor_id/{gsub(/ /,"",$2);vendor=$2}
|
||||
/^cpu family/{family=$2}
|
||||
/^model[^ ]/{model=$2}; /^stepping/{rev=$2}
|
||||
END {model=sprintf("%s(0x%.2X)",model,model);
|
||||
print "{fréq. mini/nominale/maxi} " vendor" famille" family", modèle"model", révision" rev}
|
||||
' <<< "$cpuinfo"
|
||||
END {
|
||||
code=sprintf("{0x%.2X|0x%.2X}",family,model);
|
||||
print "{fréq. mini/nominale/maxi} " vendor" famille" family", modèle"model,code", révision" rev
|
||||
}' <<< "$cpuinfo"
|
||||
)
|
||||
cpu3=$(
|
||||
gawk -F ':' '
|
||||
/address sizes/ { gsub(/ bits/,"b",$2); sub(/physical/,"physique",$2);
|
||||
sub(/virtual/,"virtuel",$2); sub(/^ | $/,"",$2); add=$2 }
|
||||
sub(/virtual/,"virtuel",$2); sub(/^ | $/,"",$2); add=$2 }
|
||||
/cache size/ {gsub(/ /,"",$2); gsub(/B/,"o",$2); gsub(/K/,"k",$2); cache=$2}
|
||||
/bogomips/ { bogomips=sprintf("%d",$2) }
|
||||
END { print add ", bogomips: " bogomips ", cache: " cache }
|
||||
' <<< "$cpuinfo"
|
||||
END { print add ", bogomips: " bogomips ", cache: " cache }' <<< "$cpuinfo"
|
||||
)
|
||||
fg_cpu=$(echo -e "$cpu1\n$cpu2\n$cpu3")
|
||||
fg_nb_threads=$(grep -c '^processor' <<< $cpuinfo)
|
||||
|
|
@ -1298,6 +1302,7 @@ figet_cpu(){ #v2 02/11/2017
|
|||
var_temp=$(grep -m1 '^model' /proc/cpuinfo) # model cpuinfo
|
||||
var_temp=${var_temp#*: } # extraction valeur model
|
||||
model=$(printf "%.2X" $var_temp) # conversion hexa model
|
||||
{
|
||||
case ${vendor,,} in
|
||||
*intel*)
|
||||
case $family in
|
||||
|
|
@ -1340,14 +1345,57 @@ figet_cpu(){ #v2 02/11/2017
|
|||
37 | 4A | 4D | 5A) fg_uarch="Intel Atom Silvermont 22nm";;
|
||||
4C | 5D | 5F) fg_uarch="Intel Atom Airmont 14nm";;
|
||||
# Knights-series cores
|
||||
0x57) fg_uarch="Intel knights_landing";;
|
||||
0x85) fg_uarch="Intel knights_mill";;
|
||||
57) fg_uarch="Intel knights_landing";;
|
||||
85) fg_uarch="Intel knights_mill";;
|
||||
*) fg_uarch="Intel $defaut_model";;
|
||||
esac ;;
|
||||
*) fg_uarch="Intel $defaut_family";;
|
||||
esac ;;
|
||||
*amd*)
|
||||
case $family in
|
||||
04) # arch_x86
|
||||
case $model in
|
||||
03 | 07 | 08 | 09 | 0A) fg_uarch="AMD Am486";; # années 90
|
||||
0E | 0F) fg_uarch="AMD Am5x86, 350nm";; # 1995-1999
|
||||
*) fg_uarch="AMD ?86 $defaut_model";;
|
||||
esac ;;
|
||||
05) # arch_x86
|
||||
case $model in
|
||||
00 | 01 | 02 | 03) fg_uarch="AMD K5 SSA/5 ou 5k86, 350nm";; # 1996
|
||||
06 | 07) fg_uarch="AMD K6 350, 250nm";; # 1997-1998
|
||||
08) fg_uarch="AMD K6-2, 250nm";; # 1998-1999
|
||||
09 | 0D) fg_uarch="AMD K6-3 Sharptooth, 250, 180nm";; # 1999-2000
|
||||
*) fg_uarch="AMD K5/K6 $defaut_model";;
|
||||
esac ;;
|
||||
06) fg_uarch="AMD K7 Athlon, 250, 180, 130nm, (Classic/T-Bird/Palomino/T-Bred/Barton and Thorton";; # arch_x86 1999-2005
|
||||
0F) # 2003-?
|
||||
case $model in
|
||||
0? | 1?) fg_uarch="AMD K8 Hammer (SledgeHammer), 130-65nm";;
|
||||
2?) fg_uarch="AMD K8 Hammer (SledgeHammer) (rev.E), 130-65nm";;
|
||||
4? | 5? | 6? | 7? | C?) fg_uarch="AMD K8 Hammer (SledgeHammer) (rev.F+), 130-65nm";;
|
||||
*) fg_uarch="AMD K8 Hammer (SledgeHammer) $defaut_model";;
|
||||
esac ;;
|
||||
10) fg_uarch="AMD Barcelona K10, 65, 45, 32nm";; # 2007-2012 Agena, Toliman, Thuban, Deneb, Heka, Callisto, Regor, Propus APU: Llano
|
||||
11) fg_uarch="AMD Turion X2 Ultra/Puma mobile, dérivée K8/K10, 65, 45nm";; # mixture of K8/K10 designs with lower power consumption
|
||||
12) fg_uarch="AMD Fusion, dérivée K10, 32nm";; # Llano
|
||||
15)
|
||||
case $model in
|
||||
00 | 01) fg_uarch="AMD Bulldozer 1ère génération, 32nm";; # 2011- success to K10,
|
||||
02 | 1?) fg_uarch="AMD Piledriver (Enhanced Bulldozer) (Bulldozer 2e génération), 32nm";; # 2012- APU: Trinity, Richland
|
||||
3?) fg_uarch="AMD Steamroller (Bulldozer 3e génération), 28nm";; # 2014- APU: Kaveri
|
||||
6? | 7?) fg_uarch="AMD Excavator (Bulldozer 4e génération), 28nm";; # 2015- gén. finale APU: Carrizo, Bristol Ridge, Stoney Ridge
|
||||
*) fg_uarch="AMD Bulldozer, $defaut_model";;
|
||||
esac ;;
|
||||
17)
|
||||
case $model in
|
||||
*) "AMD Zen, 14nm";; # 2017- APU: Raven Ridge
|
||||
esac ;;
|
||||
*) fg_uarch="AMD $defaut_family";;
|
||||
esac ;;
|
||||
*) fg_uarch="$defaut_vendor"
|
||||
esac
|
||||
fg_uarch+=" {0x$family|0x$model}"
|
||||
}
|
||||
[ "$fg_uarch" ] && fg_uarch+=" {0x$family|0x$model}"
|
||||
}
|
||||
|
||||
figet_de(){ # thanks neofetch, assigne $fg_de #30/10/2017
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
* f__wcv
|
||||
|
||||
|
||||
## 2.22.2 03/11/2017
|
||||
|
||||
nouveau: µarchitecture proc amd
|
||||
|
||||
## 2.22.1 02/11/2017
|
||||
|
||||
nouveau: µarchitecture proc intel
|
||||
|
|
|
|||
Loading…
Reference in New Issue