Skip to content

improve SSTTF script error handling #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

improve SSTTF script error handling #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d5673e
improve SSTTF script error handling
harp-intel Sep 25, 2025
2b1dd03
fix comment
harp-intel Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions internal/report/table_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,11 @@ func sstTFHPTableValues(outputs map[string]script.ScriptOutput) []Field {
continue
}
for j, value := range values {
// confirm value is a number
if _, err := strconv.Atoi(value); err != nil {
slog.Warn("unexpected non-numeric value in line", slog.String("line", line), slog.String("value", value))
return []Field{}
}
if j > 1 {
value = value + "00"
}
Expand Down Expand Up @@ -1393,6 +1398,11 @@ func sstTFLPTableValues(outputs map[string]script.ScriptOutput) []Field {
continue
}
for j, value := range values {
// confirm value is a number
if _, err := strconv.Atoi(value); err != nil {
slog.Warn("unexpected non-numeric value in line", slog.String("line", line), slog.String("value", value))
return []Field{}
}
fields[j].Values = append(fields[j].Values, value+"00")
}
}
Expand Down
67 changes: 59 additions & 8 deletions internal/script/script_defs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,13 +604,27 @@ done
SSTTFHPScriptName: {
Name: SSTTFHPScriptName,
ScriptTemplate: `# Is SST-TF supported?
supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to check if SST-TF is supported" >&2
exit 1
fi
if [[ ! "$supported" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid output from pcm-tpmi when checking support" >&2
exit 1
fi
if [ "$supported" -eq 0 ]; then
echo "SST-TF is not supported"
exit 0
fi
# Is SST-TF enabled?
enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to check if SST-TF is enabled" >&2
exit 1
fi
if [[ ! "$enabled" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid output from pcm-tpmi when checking enabled status" >&2
exit 1
fi
if [ "$enabled" -eq 0 ]; then
echo "SST-TF is not enabled"
exit 0
Expand All @@ -622,7 +636,14 @@ do
# Get the # of cores in this bucket
bithigh=$((i*8+7))
bitlow=$((i*8))
numcores=$(pcm-tpmi 5 0x100 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! numcores=$(pcm-tpmi 5 0x100 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to get number of cores for bucket $i" >&2
exit 1
fi
if [[ ! "$numcores" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid output from pcm-tpmi when getting number of cores for bucket $i" >&2
exit 1
fi
# if the number of cores is 0, skip this bucket
if [ "$numcores" -eq 0 ]; then
continue
Expand All @@ -634,8 +655,15 @@ do
# 5 isa frequencies per bucket (AVX, AVX2, AVX-512, AVX-512 heavy, AMX)
for((j=0; j<5; j++))
do
offset=$((j*8 + 264)) // 264 is 0x108 (SST_TF_INFO_2) AVX
freq=$(pcm-tpmi 5 $offset -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
offset=$((j*8 + 264)) # 264 is 0x108 (SST_TF_INFO_2) AVX
if ! freq=$(pcm-tpmi 5 $offset -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to get frequency for instruction set $j in bucket $i" >&2
exit 1
fi
if [[ ! "$freq" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid frequency value for instruction set $j in bucket $i" >&2
exit 1
fi
echo -n "$freq"
if [ $j -lt 4 ]; then
echo -n ","
Expand All @@ -653,13 +681,29 @@ done
SSTTFLPScriptName: {
Name: SSTTFLPScriptName,
ScriptTemplate: `# Is SST-TF supported?
supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to check if SST-TF is supported" >&2
exit 1
fi
if [[ ! "$supported" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid output from pcm-tpmi when checking support" >&2
exit 1
fi

if [ "$supported" -eq 0 ]; then
echo "SST-TF is not supported"
exit 0
fi
# Is SST-TF enabled?
enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to check if SST-TF is enabled" >&2
exit 1
fi
if [[ ! "$enabled" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid output from pcm-tpmi when checking enabled status" >&2
exit 1
fi

if [ "$enabled" -eq 0 ]; then
echo "SST-TF is not enabled"
exit 0
Expand All @@ -670,7 +714,14 @@ for((j=0; j<5; j++))
do
bithigh=$((j*8+23))
bitlow=$((j*8+16))
freq=$(pcm-tpmi 5 0xF8 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
if ! freq=$(pcm-tpmi 5 0xF8 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
echo "Error: Failed to get frequency for instruction set $j" >&2
exit 1
fi
if [[ ! "$freq" =~ ^[0-9]+$ ]]; then
echo "Error: Invalid frequency value for instruction set $j" >&2
exit 1
fi
echo -n "$freq"
if [ $j -ne 4 ]; then
echo -n ","
Expand Down