Add count_accelerators and run on pbrt

Author: JonasRegehr

growlibm/count_accelerators.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+    echo "Error: Incorrect number of arguments."
+    echo "Usage: $0 <accelerators_file> <search_file>"
+    exit 1
+fi
+
+ACCELERATORS_FILE=$1
+SEARCH_FILE=$2
+TEMP_FILE=$(mktemp)
+
+if [ ! -f "$ACCELERATORS_FILE" ]; then
+    echo "Error: Accelerator file not found at '$ACCELERATORS_FILE'"
+    exit 1
+fi
+
+if [ ! -f "$SEARCH_FILE" ]; then
+    echo "Error: Search file not found at '$SEARCH_FILE'"
+    exit 1
+fi
+
+while IFS= read -r line || [[ -n "$line" ]]; do
+    if [[ "$line" =~ ^[0-9]+- ]]; then
+        accelerator_id=$(echo "$line" | cut -d',' -f1)
+
+        count=$(grep -o -w "$accelerator_id" "$SEARCH_FILE" | wc -l)
+
+        echo "$line, $count" >> "$TEMP_FILE"
+    else
+        echo "$line" >> "$TEMP_FILE"
+    fi
+done < "$ACCELERATORS_FILE"
+
+mv "$TEMP_FILE" "$ACCELERATORS_FILE"

growlibm/extend-platform.rkt

@@ -76,7 +76,7 @@
    (displayln operatorStr))
   #:exists 'append)
 
-(with-output-to-file "reports/report_info.csv"
+(with-output-to-file "reports/report_info.txt"
   (lambda ()
     (displayln (format "~a, ~a" link spec)))
   #:exists 'append)

growlibm/generate-candidates.rkt

@@ -130,14 +130,14 @@
 (define renamed-subexprs (map rename-vars filtered-again))
 (define pairs (hash->list (count-frequencies renamed-subexprs)))
 
-(with-output-to-file (string-append report-dir "/report_info.csv")
+(with-output-to-file (string-append report-dir "/report_info.txt")
   (lambda ()
     (printf "og length, ~a\n"(length pairs)))
   #:exists 'replace)
 
 (define deduplicated-pairs (hash->list (deduplicate pairs)))
 
-(with-output-to-file (string-append report-dir "/report_info.csv")
+(with-output-to-file (string-append report-dir "/report_info.txt")
   (lambda ()
     (printf "deduped length, ~a\n"(length deduplicated-pairs)))
   #:exists 'append)

growlibm/generate-html.py

@@ -1,6 +1,5 @@
 import json
 
-# --- 1. Configuration ---
 START_REPORT_PATH = 'reports/start/results.json'
 END_REPORT_PATH = 'reports/end/results.json'
 START_FOLDER = 'start'
@@ -46,7 +45,7 @@ def get_accuracy_str(path):
     <h1>GrowLibm Report</h1>
     <p><a href="grow_platform.txt">Grow Platform</a></p>
     <p><a href="candidates.txt">Candidates</a></p>
-    <p><a href="report_info.csv">More Info</a></p>
+    <p><a href="report_info.txt">More Info</a></p>
     
     <h2>Overall Summary</h2>
     <p><strong>Start:</strong> {start_accuracy_str} - <a href="{START_FOLDER}/">Folder</a></p>

infra/nightly.sh

@@ -8,7 +8,7 @@ export PATH="$PATH:$HOME/.cargo/bin/"
 
 # Seed is fixed for the whole day; this way two branches run the same seed
 SEED=$(date "+%Y%j")
-BENCHDIR="bench/"
+BENCHDIR="bench/graphics/pbrt.fpcore"
 REPORTDIR="reports"
 NUMITERS=10
 
@@ -21,11 +21,12 @@ racket -y "src/main.rkt" report \
         --dump-exprs \
         --platform "no-accelerators" \
         --disable "generate:evaluate" \
-        "$BENCHDIR" "$REPORTDIR"/"start" > "$REPORTDIR/expr_dump.txt"
+        "$BENCHDIR" \
+        "$REPORTDIR/start" > "$REPORTDIR/expr_dump.txt"
 
 # generate accelerator candidates
 racket -y growlibm/generate-candidates.rkt "$REPORTDIR"
-
+ 
 racket -y growlibm/to-json.rkt 
 # extend platform loop
 for ((i = 0; i < $NUMITERS; i++)) do
@@ -35,9 +36,10 @@ for ((i = 0; i < $NUMITERS; i++)) do
             --threads 4 \
             --disable "generate:taylor" \
             --disable "generate:evaluate" \
-            "$REPORTDIR/candidates.txt" "$REPORTDIR"/"iter$i" 
+            "$REPORTDIR/candidates.txt" \
+            "$REPORTDIR/iter$i" 
 
-    racket -y "growlibm/extend-platform.rkt"  "$REPORTDIR"/"iter$i/results.json" 
+    racket -y "growlibm/extend-platform.rkt"  "$REPORTDIR/iter$i/results.json" 
 done
 
 # run herbie again with expanded platform
@@ -46,10 +48,14 @@ racket -y "src/main.rkt" report \
         --platform "grow" \
         --threads 4 \
         --disable "generate:evaluate" \
-        "$BENCHDIR" "$REPORTDIR"/"end"
+        "$BENCHDIR" \
+        "$REPORTDIR/end"
 
 # print the new platform
 cat "src/platforms/grow.rkt" > "$REPORTDIR/grow_platform.txt"
 
+chmod +x growlibm/count_accelerators.sh
+growlibm/count_accelerators.sh "$REPORTDIR/report_info.txt" "$REPORTDIR/end/results.json"
+
 # generate the html report page
 python3 growlibm/generate-html.py