Skip to content

Commit 31e29ef

Browse files
committed
update readme
1 parent f5f11cf commit 31e29ef

4 files changed

Lines changed: 20 additions & 8 deletions

File tree

scripts/archive.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ print(max(ids) if ids else 0)
4949
if [ -f "$CURRENT_JSON" ]; then
5050
CPU=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('cpu','unknown'))")
5151
CORES=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('cores','unknown'))")
52+
THREADS=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('threads','unknown'))")
5253
THREADS_PER_CORE=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('threads_per_core','unknown'))")
5354
RAM=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('ram','unknown'))")
5455
RAM_SPEED=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('ram_speed','unknown'))")
@@ -61,8 +62,12 @@ print(max(ids) if ids else 0)
6162
else
6263
echo "Warning: site/data/current.json not found — run benchmark.sh --save first"
6364
CPU=$(lscpu 2>/dev/null | awk -F: '/Model name/ {gsub(/^[ \t]+/, "", $2); print $2; exit}')
64-
CORES=$(nproc 2>/dev/null || echo "unknown")
65+
THREADS=$(nproc 2>/dev/null || echo "unknown")
6566
THREADS_PER_CORE=$(lscpu 2>/dev/null | awk -F: '/Thread\(s\) per core/ {gsub(/^[ \t]+/, "", $2); print $2; exit}')
67+
CORES="$THREADS"
68+
if [ "$THREADS_PER_CORE" -gt 0 ] 2>/dev/null; then
69+
CORES=$((THREADS / THREADS_PER_CORE))
70+
fi
6671
RAM=$(free -h 2>/dev/null | awk '/Mem:/ {print $2}')
6772
RAM_SPEED=$(sudo dmidecode -t memory 2>/dev/null | awk '/Configured Memory Speed:/ && /MHz/ {print $4 " MHz"; exit}')
6873
[ -z "$RAM_SPEED" ] && RAM_SPEED="unknown"
@@ -122,6 +127,7 @@ governor = sys.argv[13]
122127
docker_runtime = sys.argv[14]
123128
threads_per_core = sys.argv[15]
124129
current_json = sys.argv[16]
130+
threads = sys.argv[17]
125131
126132
rounds = []
127133
if os.path.exists(index_path):
@@ -136,6 +142,7 @@ entry = {
136142
'date': date,
137143
'cpu': cpu,
138144
'cores': cores,
145+
'threads': threads,
139146
'ram': ram,
140147
'os': os_info,
141148
'kernel': kernel,
@@ -160,7 +167,7 @@ rounds.append(entry)
160167
161168
with open(index_path, 'w') as f:
162169
json.dump(rounds, f, indent=2)
163-
" "$ROUNDS_DIR/index.json" "$NEXT_ID" "$NAME" "$DATE" "$CPU" "$CORES" "$RAM" "$RAM_SPEED" "$OS_INFO" "$KERNEL" "$COMMIT" "$DOCKER" "$GOVERNOR" "$DOCKER_RUNTIME" "$THREADS_PER_CORE" "$CURRENT_JSON"
170+
" "$ROUNDS_DIR/index.json" "$NEXT_ID" "$NAME" "$DATE" "$CPU" "$CORES" "$RAM" "$RAM_SPEED" "$OS_INFO" "$KERNEL" "$COMMIT" "$DOCKER" "$GOVERNOR" "$DOCKER_RUNTIME" "$THREADS_PER_CORE" "$CURRENT_JSON" "$THREADS"
164171

165172
# Clear current results so the new ongoing round starts fresh
166173
rm -rf "$ROOT_DIR/results"/*
@@ -177,7 +184,7 @@ with open(index_path, 'w') as f:
177184
rm -f "$SITE_DATA/current.json"
178185

179186
echo "[archived] Round $NEXT_ID: $NAME ($DATE)"
180-
echo "[hardware] $CPU ($CORES cores), $RAM RAM"
187+
echo "[hardware] $CPU (${CORES}C/${THREADS}T), $RAM RAM"
181188
echo "[system] $OS_INFO (kernel $KERNEL)"
182189
echo "[commit] $COMMIT"
183190
echo "[file] site/data/rounds/${NEXT_ID}.json"

scripts/benchmark.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,12 @@ with open(data_file, 'w') as out:
128128

129129
# Write current round system info
130130
local cpu=$(lscpu 2>/dev/null | awk -F: '/Model name/ {gsub(/^[ \t]+/, "", $2); print $2; exit}')
131-
local cores=$(nproc 2>/dev/null || echo "unknown")
131+
local threads=$(nproc 2>/dev/null || echo "unknown")
132132
local threads_per_core=$(lscpu 2>/dev/null | awk -F: '/Thread\(s\) per core/ {gsub(/^[ \t]+/, "", $2); print $2; exit}')
133+
local cores="$threads"
134+
if [ "$threads_per_core" -gt 0 ] 2>/dev/null; then
135+
cores=$((threads / threads_per_core))
136+
fi
133137
local ram=$(free -h 2>/dev/null | awk '/Mem:/ {print $2}')
134138
local ram_speed=$(sudo dmidecode -t memory 2>/dev/null | awk '/Configured Memory Speed:/ && /MHz/ {print $4 " MHz"; exit}')
135139
[ -z "$ram_speed" ] && ram_speed="unknown"
@@ -145,6 +149,7 @@ with open(data_file, 'w') as out:
145149
import json, sys, subprocess
146150
147151
d = {'date': sys.argv[1], 'cpu': sys.argv[2], 'cores': sys.argv[3],
152+
'threads': sys.argv[15],
148153
'ram': sys.argv[4], 'os': sys.argv[5], 'kernel': sys.argv[6],
149154
'docker': sys.argv[7], 'commit': sys.argv[8],
150155
'governor': sys.argv[11], 'docker_runtime': sys.argv[12],
@@ -181,7 +186,7 @@ if tcp:
181186
182187
with open(sys.argv[9], 'w') as f:
183188
json.dump(d, f, indent=2)
184-
" "$cur_date" "$cpu" "$cores" "$ram" "$os_info" "$kernel" "$docker_ver" "$commit" "$site_data/current.json" "$ram_speed" "$governor" "$docker_runtime" "$threads_per_core" "$lo_mtu"
189+
" "$cur_date" "$cpu" "$cores" "$ram" "$os_info" "$kernel" "$docker_ver" "$commit" "$site_data/current.json" "$ram_speed" "$governor" "$docker_runtime" "$threads_per_core" "$lo_mtu" "$threads"
185190
echo "[updated] site/data/current.json"
186191
}
187192

site/data/current.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"date": "2026-03-13",
33
"cpu": "AMD Ryzen Threadripper PRO 3995WX 64-Cores",
4-
"cores": "128",
4+
"cores": "64",
5+
"threads": "128",
56
"ram": "251Gi",
67
"os": "Ubuntu 24.04.4 LTS",
78
"kernel": "6.17.0-14-generic",

site/layouts/shortcodes/round-selector.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@
109109

110110
// Always visible: commit + CPU
111111
commitEl.innerHTML = iconGit + ' <code style="font-size:0.75rem;background:rgba(124,58,237,0.08);padding:0.1rem 0.35rem;border-radius:3px;">' + meta.commit + '</code>';
112-
var ramInfo = meta.cores + ' cores';
113-
if (meta.smt) ramInfo += ' (SMT ' + meta.smt + ')';
112+
var ramInfo = meta.cores + 'C/' + (meta.threads || meta.cores) + 'T';
114113
ramInfo += ', ' + meta.ram + ' RAM';
115114
if (meta.ram_speed) ramInfo += ' @ ' + meta.ram_speed;
116115
if (meta.governor) ramInfo += ', governor: ' + meta.governor;

0 commit comments

Comments
 (0)