Franscobec/gpufetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v0.11] Add missing Intel iGPU topologies. Add script to check for missing topo/uarchs

Browse Source
This commit is contained in:
Dr-Noob
2021-12-10 15:55:59 +01:00
parent 5f52f73fe0
commit b6ce96e746
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/check.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash -u
# Checks the difference between supported uarchs
# and uarchs that have their topology available
# in file uarch.cpp
uarchs="$(grep 'CHECK_UARCH' uarch.cpp | cut -d',' -f4-5 | grep 'UARCH_GEN' | tr -d ' ' | sort | uniq)"
topos="$(grep 'CHECK_TOPO' uarch.cpp | cut -d',' -f3,4 | grep 'UARCH_' | tr -d ' ' | sort | uniq)"
echo "$uarchs" > /tmp/uarchs.txt
echo "$topos" > /tmp/topos.txt
meld /tmp/uarchs.txt /tmp/topos.txt
rm -f /tmp/uarchs.txt /tmp/topos.txt

38
src/intel/uarch.cpp
View File

@@ -176,29 +176,31 @@ struct topology_i* get_topology_info(struct uarch* arch) {
// Syntax: (EU per subslice, Subslices, Slices) // Syntax: (EU per subslice, Subslices, Slices)
CHECK_TOPO_START CHECK_TOPO_START
// Gen6 // Gen6
CHECK_TOPO(topo, arch, UARCH_GEN6, GT1, 6, 1, 1) CHECK_TOPO(topo, arch, UARCH_GEN6, GT1, 6, 1, 1)
CHECK_TOPO(topo, arch, UARCH_GEN6, GT2, 6, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN6, GT2, 6, 2, 1)
// Gen7 // Gen7
CHECK_TOPO(topo, arch, UARCH_GEN7, GT1, 6, 1, 1) CHECK_TOPO(topo, arch, UARCH_GEN7, GT1, 6, 1, 1)
CHECK_TOPO(topo, arch, UARCH_GEN7, GT2, 8, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN7, GT2, 8, 2, 1)
CHECK_TOPO(topo, arch, UARCH_GEN7, GT3, 6, 1, 1) CHECK_TOPO(topo, arch, UARCH_GEN7, GT3, 6, 1, 1)
// Gen7.5 // Gen7.5
CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT1, 10, 1, 1) CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT1, 10, 1, 1)
CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT2, 10, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT2, 10, 2, 1)
CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT3, 10, 4, 1) CHECK_TOPO(topo, arch, UARCH_GEN7_5, GT3, 10, 4, 1)
// Gen8 // Gen8
CHECK_TOPO(topo, arch, UARCH_GEN8, GT1, 6, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN8, GT1, 6, 2, 1)
CHECK_TOPO(topo, arch, UARCH_GEN8, GT2, 8, 3, 1) CHECK_TOPO(topo, arch, UARCH_GEN8, GT2, 8, 3, 1)
CHECK_TOPO(topo, arch, UARCH_GEN8, GT3, 8, 6, 2) CHECK_TOPO(topo, arch, UARCH_GEN8, GT3, 8, 6, 2)
// Gen9 // Gen9
CHECK_TOPO(topo, arch, UARCH_GEN9, GT1, 6, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN9, GT1, 6, 2, 1)
CHECK_TOPO(topo, arch, UARCH_GEN9, GT2, 8, 3, 1) CHECK_TOPO(topo, arch, UARCH_GEN9, GT2, 8, 3, 1)
CHECK_TOPO(topo, arch, UARCH_GEN9, GT3, 8, 6, 2) CHECK_TOPO(topo, arch, UARCH_GEN9, GT3, 8, 6, 2)
CHECK_TOPO(topo, arch, UARCH_GEN9, GT4e, 8, 9, 3) CHECK_TOPO(topo, arch, UARCH_GEN9, GT4e, 8, 9, 3)
// Gen9.5 // Gen9.5
CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT1, 6, 2, 1) CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT1, 6, 2, 1)
CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT2, 8, 3, 1) CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT1_5, 6, 3, 1)
CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT3, 8, 6, 2) CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT2, 8, 3, 1)
CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT3, 8, 6, 2)
CHECK_TOPO(topo, arch, UARCH_GEN9_5, GT3e, 8, 6, 2) // Same as GT3, but has eDRAM cache
CHECK_TOPO_END CHECK_TOPO_END
return topo; return topo;