@@ -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]
122127docker_runtime = sys.argv[14]
123128threads_per_core = sys.argv[15]
124129current_json = sys.argv[16]
130+ threads = sys.argv[17]
125131
126132rounds = []
127133if 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
161168with 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"
0 commit comments