AWS instance name is a "CPU" arch in WebUI

Author: astavonin

perf-tracking/tools/benchexport/export.go

@@ -465,6 +465,32 @@ func getBenchmarkSourceFile(name string) string {
 	return "perf-tracking/benchmarks/core/allocation_test.go"
 }
 
+// exportVersionWithCPU exports a single version's benchmarks to JSON, applying
+// cpuFallback when the benchmark file lacks a cpu: line.
+func exportVersionWithCPU(inputFile, version, outputFile, cpuFallback string) error {
+	versionData, err := parseBenchmarkFile(inputFile, version)
+	if err != nil {
+		return fmt.Errorf("failed to parse benchmark file: %w", err)
+	}
+	if versionData.Metadata.System.CPU == "" && cpuFallback != "" {
+		versionData.Metadata.System.CPU = cpuFallback
+	}
+
+	jsonData, err := json.MarshalIndent(versionData, "", "  ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal JSON: %w", err)
+	}
+	if err := os.MkdirAll(filepath.Dir(outputFile), 0755); err != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
+	}
+	if err := os.WriteFile(outputFile, jsonData, 0644); err != nil {
+		return fmt.Errorf("failed to write output file: %w", err)
+	}
+	fmt.Printf("  Output: %s\n", outputFile)
+	fmt.Printf("  ✓ Exported %d benchmarks\n\n", len(versionData.Benchmarks))
+	return nil
+}
+
 // exportVersion exports a single version's benchmarks to JSON
 func exportVersion(inputFile, version, outputFile string) error {
 	fmt.Printf("Exporting Go %s...\n", version)
@@ -580,7 +606,8 @@ func getReliability(maxCV float64) string {
 // This makes every export additive: pre-existing version files are never dropped.
 // defaultPlatform is used when the platform cannot be auto-detected from the
 // benchmark files (e.g. files lack OS/arch metadata).
-func exportAll(resultsDir, outputDir, defaultPlatform string) error {
+// cpuOverride is used as a fallback when benchmark files lack a cpu: line.
+func exportAll(resultsDir, outputDir, defaultPlatform, cpuOverride string) error {
 	fmt.Println("=== Exporting All Versions ===")
 
 	entries, err := os.ReadDir(resultsDir)
@@ -683,7 +710,7 @@ func exportAll(resultsDir, outputDir, defaultPlatform string) error {
 		platformDir := filepath.Join(outputDir, platform)
 		outputFile := filepath.Join(platformDir, fmt.Sprintf("go%s.json", version))
 
-		if err := exportVersion(latestFile, version, outputFile); err != nil {
+		if err := exportVersionWithCPU(latestFile, version, outputFile, cpuOverride); err != nil {
 			fmt.Printf("  Error: %v\n", err)
 			continue
 		}

perf-tracking/tools/benchexport/main.go

@@ -156,16 +156,17 @@ func main() {
 	resultsDir := flag.String("results-dir", "", "Results directory (for --export-all)")
 	outputDir := flag.String("output-dir", "", "Output directory (for --export-all)")
 	platform := flag.String("platform", "linux-amd64", "Platform identifier used when auto-detection from files fails (for --export-all)")
+	cpuOverride := flag.String("cpu", "", "CPU identifier used as fallback when benchmark files lack a cpu: line (for --export-all and --export)")
 
 	flag.Parse()
 
 	// Export mode
 	if *exportAllFlag {
 		if *resultsDir == "" || *outputDir == "" {
-			fmt.Println("Usage: benchexport --export-all --results-dir <dir> --output-dir <dir> [--platform <os-arch>]")
+			fmt.Println("Usage: benchexport --export-all --results-dir <dir> --output-dir <dir> [--platform <os-arch>] [--cpu <label>]")
 			os.Exit(1)
 		}
-		if err := exportAll(*resultsDir, *outputDir, *platform); err != nil {
+		if err := exportAll(*resultsDir, *outputDir, *platform, *cpuOverride); err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
 		}

perf-tracking/tools/bootstrap.sh

@@ -200,8 +200,8 @@ echo "=== Step 8: System check ==="
 BENCHMARK_RESULT="failed: system check"
 
 # Wait for the 1-minute load average to settle after Go installation
-echo "→ Waiting 60s for load average to settle after installations..."
-sleep 60
+echo "→ Waiting 90s for load average to settle after installations..."
+sleep 90
 
 runuser -l ec2-user -c "cd $REPO_DIR && perf-tracking/tools/system-check.sh"
 echo "✓ System check passed"