Display accelerator counts

Author: JonasRegehr

growlibm/count_accelerators.sh

@@ -53,8 +53,13 @@
 
 (define sorted-pairs (sort scored-pairs > #:key fourth))
 
-(define fpcore (with-input-from-string (first (first sorted-pairs)) read))
-(define link (second (first sorted-pairs)))
+(when (null? sorted-pairs)
+  (displayln "No accelerators discovered in this iteration.")
+  (exit 0))
+
+(define chosen-pair (first sorted-pairs))
+(define fpcore (with-input-from-string (first chosen-pair) read))
+(define link (second chosen-pair))
 (define ctx (context (free-variables fpcore) 
                      (get-representation 'binary64) 
                      (make-list (length (free-variables fpcore)) 
@@ -86,9 +91,24 @@
    (displayln operator-strf32))
   #:exists 'append)
 
-(with-output-to-file "reports/report_info.txt"
-  (lambda ()
-    (displayln (format "~a, ~a" link spec)))
-  #:exists 'append)
+(define accelerators-path "reports/accelerators.json")
+
+(define new-entry (hash 'name link 'spec (format "~a" spec)))
+
+(define updated-accelerators
+  (let ([previous
+         (if (file-exists? accelerators-path)
+             (let ([data (call-with-input-file accelerators-path read-json)])
+               (cond
+                 [(vector? data) (vector->list data)]
+                 [(list? data) data]
+                 [else '()]))
+             '())])
+    (append previous (list new-entry))))
+
+(call-with-output-file accelerators-path
+  (lambda (out)
+    (write-json updated-accelerators out))
+  #:exists 'truncate)
 
 (displayln (format "adding accelerator ~a, with spec: ~a" link spec))

growlibm/extend-platform.rkt

@@ -130,23 +130,13 @@
 (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.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.txt")
-  (lambda ()
-    (printf "deduped length, ~a\n"(length deduplicated-pairs)))
-  #:exists 'append)
-
 (define sorted-pairs (sort deduplicated-pairs (lambda (p1 p2) (> (cdr p1) (cdr p2)))))
 (define first-2000 (take sorted-pairs (min (length sorted-pairs) 2000)))
 
-(define filtered (filter (lambda (p) (< 0.1 (get-error (car p)))) first-2000))
-;;; (define filtered first-1000)
+;;; (define filtered (filter (lambda (p) (< 0.1 (get-error (car p)))) first-2000))
+(define filtered first-2000)
 (define first-500 (take filtered (min (length filtered) 500)))
 (define fpcores-out (map to-fpcore-str first-500))
 (define counts-out (map to-count-print first-500))

growlibm/generate-candidates.rkt

@@ -1,11 +1,13 @@
 import json
+import html
 
 START_REPORT_PATH = 'reports/start/results.json'
 END_REPORT_PATH = 'reports/end/results.json'
 START_FOLDER = 'start'
 END_FOLDER = 'end'
 OUTPUT_FILE = 'reports/index.html'
 NUM_ITERATIONS = 10 
+ACCELERATORS_PATH = 'reports/accelerators.json'
 
 def calculate_end_accuracy(data):
     total_end = 0
@@ -17,17 +19,55 @@ def calculate_end_accuracy(data):
         return 0.0
     return 100 - (100 * (total_end / max_accuracy))
 
+def load_report(path):
+    with open(path, 'r') as f:
+        return json.load(f)
+
 def get_accuracy_str(path):
-    try:
-        with open(path, 'r') as f:
-            data = json.load(f)
-        percent = calculate_end_accuracy(data)
-        return f"{percent:.1f}%"
-    except (FileNotFoundError, json.JSONDecodeError):
-        return "N/A"
+    report = load_report(path)
+    percent = calculate_end_accuracy(report)
+    return f"{percent:.1f}%"
+
+def load_accelerators(path):
+    with open(path, 'r') as f:
+        data = json.load(f)
+    if isinstance(data, dict):
+        return [data]
+    if isinstance(data, (list, tuple, set)):
+        return list(data)
+    return []
+
+
+def format_accelerator_rows(accelerators, counts):
+    if not accelerators:
+        return '<tr><td colspan="3">No accelerators recorded.</td></tr>'
+    rows = []
+    for acc in accelerators:
+        name = html.escape(str(acc.get("name", "")))
+        spec = html.escape(str(acc.get("spec", "")))
+        count = counts.get(acc.get("name"), 0)
+        rows.append(f'<tr><td>{name}</td><td><code>{spec}</code></td><td>{count}</td></tr>')
+    return "".join(rows)
+
+end_report = load_report(END_REPORT_PATH)
 
 start_accuracy_str = get_accuracy_str(START_REPORT_PATH)
 end_accuracy_str = get_accuracy_str(END_REPORT_PATH)
+accelerators = load_accelerators(ACCELERATORS_PATH)
+
+def read_text(path):
+    with open(path, 'r') as f:
+        return f.read()
+
+report_paths = [END_REPORT_PATH] + [f"reports/iter{i}/results.json" for i in range(NUM_ITERATIONS)]
+report_texts = [read_text(p) for p in report_paths]
+counts = {
+    acc_name: sum(text.count(acc_name) for text in report_texts)
+    for acc_name in [str(acc.get("name", "")) for acc in accelerators]
+    if acc_name
+}
+
+accelerator_rows = format_accelerator_rows(accelerators, counts)
 
 table_rows = "".join([
     f'<tr><td><a href="iter{i}/">iter{i}</a></td><td>{get_accuracy_str(f"reports/iter{i}/results.json")}</td></tr>'
@@ -45,12 +85,21 @@ 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.txt">More Info</a></p>
     
     <h2>Overall Summary</h2>
     <p><strong>Start:</strong> {start_accuracy_str} - <a href="{START_FOLDER}/">Folder</a></p>
     <p><strong>End:</strong> {end_accuracy_str} - <a href="{END_FOLDER}/">Folder</a></p>
     
+    <h2>Accelerators</h2>
+    <table border="1" style="border-collapse:collapse; width:100%; max-width:900px;">
+        <tr>
+            <th>Name</th>
+            <th>Spec</th>
+            <th>Uses</th>
+        </tr>
+        {accelerator_rows}
+    </table>
+    
     <h2>Grow Platform Iterations</h2>
     <table border="1" style="border-collapse:collapse; width:300px;">
         <tr>
@@ -65,4 +114,3 @@ def get_accuracy_str(path):
 
 with open(OUTPUT_FILE, 'w') as f:
     f.write(html_content)
-

growlibm/generate-html.py

@@ -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/tmerc4.fpcore"
+BENCHDIR="bench/pbrt"
 REPORTDIR="reports"
 NUMITERS=10
 
@@ -54,8 +54,5 @@ racket -y "src/main.rkt" report \
 # 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