From 6e2fb203279947f6f76a80192fe9bb1de76c3704 Mon Sep 17 00:00:00 2001
From: Erikas <erkexzcx@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:53:20 +0300
Subject: [PATCH] misc fixes

---
 benchmark_data.go        | 6 +++++-
 static/js/benchmark.js   | 2 +-
 templates/benchmark.tmpl | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/benchmark_data.go b/benchmark_data.go
index cef8591..5c9bbdc 100644
--- a/benchmark_data.go
+++ b/benchmark_data.go
@@ -8,6 +8,7 @@ import (
 	"encoding/gob"
 	"errors"
 	"fmt"
+	"math"
 	"math/big"
 	"mime/multipart"
 	"os"
@@ -197,6 +198,7 @@ func readMangoHudFile(scanner *bufio.Scanner) (*BenchmarkData, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse GPU mem clock value '%s': %v", record[7], err)
 		}
+		val = math.Round(val*2*100000) / 100000 // multiply by 2 (so it represents actual core clocks) and round to 5 decimal places
 		benchmarkData.DataGPUMemClock = append(benchmarkData.DataGPUMemClock, val)
 
 		val, err = strconv.ParseFloat(record[8], 64)
@@ -263,7 +265,7 @@ func readAfterburnerFile(scanner *bufio.Scanner) (*BenchmarkData, error) {
 		return nil, errors.New("failed to read file (err ab2)")
 	}
 	benchmarkData.SpecOS = "Windows" // Hardcode
-	benchmarkData.SpecCPU = truncateString(strings.TrimSpace(record[2]))
+	benchmarkData.SpecGPU = truncateString(strings.TrimSpace(record[2]))
 
 	// 3rd line contain headers for benchmark data. We need to pay attention to their order
 	if !scanner.Scan() {
@@ -380,6 +382,7 @@ func readAfterburnerFile(scanner *bufio.Scanner) (*BenchmarkData, error) {
 			if err != nil {
 				return nil, fmt.Errorf("failed to parse Memory usage value '%s': %v", record[8], err)
 			}
+			val = math.Round(val/1024*100000) / 100000 // divide by 1024 and round to 5 decimal places
 			benchmarkData.DataGPUVRAMUsed = append(benchmarkData.DataGPUVRAMUsed, val)
 		}
 
@@ -396,6 +399,7 @@ func readAfterburnerFile(scanner *bufio.Scanner) (*BenchmarkData, error) {
 			if err != nil {
 				return nil, fmt.Errorf("failed to parse RAM usage value '%s': %v", record[10], err)
 			}
+			val = math.Round(val/1024*100000) / 100000 // divide by 1024 and round to 5 decimal places
 			benchmarkData.DataRAMUsed = append(benchmarkData.DataRAMUsed, val)
 		}
 
diff --git a/static/js/benchmark.js b/static/js/benchmark.js
index 4183efb..c9a004c 100644
--- a/static/js/benchmark.js
+++ b/static/js/benchmark.js
@@ -242,7 +242,7 @@ createChart('cpuTempChart', 'CPU Temperature', '', '°C', cpuTempDataArrays);
 createChart('gpuTempChart', 'GPU Temperature', '', '°C', gpuTempDataArrays);
 createChart('gpuCoreClockChart', 'GPU Core Clock', '', 'MHz', gpuCoreClockDataArrays);
 createChart('gpuMemClockChart', 'GPU Memory Clock', '', 'MHz', gpuMemClockDataArrays);
-createChart('gpuVRAMUsedChart', 'GPU VRAM Usage', '', '%', gpuVRAMUsedDataArrays, 100);
+createChart('gpuVRAMUsedChart', 'GPU VRAM Usage', '', 'GB', gpuVRAMUsedDataArrays);
 createChart('gpuPowerChart', 'GPU Power', '', 'W', gpuPowerDataArrays);
 createChart('ramUsedChart', 'RAM Usage', '', 'GB', ramUsedDataArrays);
 createChart('swapUsedChart', 'SWAP Usage', '', 'GB', swapUsedDataArrays);
diff --git a/templates/benchmark.tmpl b/templates/benchmark.tmpl
index 6093cf5..2c7d5a1 100644
--- a/templates/benchmark.tmpl
+++ b/templates/benchmark.tmpl
@@ -46,8 +46,8 @@
                 <tr>
                     <th scope="col">Label</th>
                     <th scope="col">OS</th>
-                    <th scope="col">CPU</th>
                     <th scope="col">GPU</th>
+                    <th scope="col">CPU</th>
                     <th scope="col">RAM</th>
                     <th scope="col">OS specific</th>
                 </tr>