added in some fallback for intel/amd microarchitecture detections to avoid too

many blank items.

As specific ids are generated, these fallbacks should be used less and less over
time.
This commit is contained in:
Harald Hope 2017-07-28 20:30:21 -07:00
parent 910be36724
commit 3f5dbc48fb
2 changed files with 17 additions and 1 deletions

14
inxi
View file

@ -4382,6 +4382,7 @@ get_cpu_architecture()
1|2)arch='K7';;
3|4)arch='K7 Thunderbird';;
6|7|8|A)arch='K7 Palomino+';;
*)arch='K7';;
esac
;;
F)
@ -4389,6 +4390,7 @@ get_cpu_architecture()
4|5|7|8|B|C|E|F|14|15|17|18|1B|1C|1F)arch='K8';;
21|23|24|25|27|28|2C|2F)arch='K8 rev.E';;
41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|7F|C1)arch='K8 rev.F+';;
*)arch='K8';;
esac
;;
10)
@ -4404,11 +4406,13 @@ get_cpu_architecture()
12)
case $3 in
1)arch='K10';;
*)arch='K10';;
esac
;;
14)
case $3 in
1|2)arch='Bobcat';;
*)arch='Bobcat';;
esac
;;
15)
@ -4416,17 +4420,20 @@ get_cpu_architecture()
1)arch='Bulldozer';;
2|10|13)arch='Piledriver';;
30)arch='Steamroller';;
*)arch='Bulldozer';;
esac
;;
16)
case $3 in
0)arch='Jaguar';;
30)arch='Puma';;
*)arch='Jaguar';;
esac
;;
17)
case $3 in
1)arch='Zen';;
*)arch='Zen';;
esac
;;
esac
@ -4503,6 +4510,7 @@ get_cpu_architecture()
case $3 in
0|1|2)arch='Netburst';;
3|4|6)arch='Netburst Prescott';; # Nocona
*)arch='Netburst';;
esac
;;
esac
@ -4841,7 +4849,7 @@ get_cpu_data_bsd()
if [[ -n $Dmesg_Boot_Data ]];then
cpu_max=$( gawk -F ':' '
BEGIN {
IGNORECASE=1
IGNORECASE=1
}
# NOTE: freebsd may say: 2300-MHz, so check for dash as well
$1 ~ /^(CPU|cpu0)$/ {
@ -4872,6 +4880,10 @@ get_cpu_data_bsd()
bSwitchFs="false"
min=0
max=0
type=""
family=""
model_nu=""
rev=""
}
/^hw.model/ && ( bsdVersion != "darwin" ) {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF )

View file

@ -5,7 +5,11 @@ Script Date: 2017-07-28
-----------------------------------
Changes:
-----------------------------------
New version, tarball, man page. More cpu arch fixes, and added stepping/release info
as well so you can see which revision of the cpu microarchitecture your cpu has.
Also fixed a few random vm id issues, I found cases where systemd believes it's bochs
but it is actually kvm, so now the systemd data is not fully trusted, but is confirmed.
-----------------------------------
-- Harald Hope - Fri, 28 Jul 2017 18:39:19 -0700