Merge pull request #1280 from herbie-fp/remove-obsolete-timeline

General-purpose cleanup across Herbie

Author: pavpanchekha

AGENT.md

@@ -1,21 +1,17 @@
 
 # Testing
 
-- Before presenting any code run `make fmt` to format the code. This
-  is mandatory and PRs that don't follow the coding style are
-  rejected.
-- As a quick test to make sure everything is working, you can run
-  `racket src/main.rkt report bench/tutorial.fpcore tmp`; this should
-  take about 5-10 seconds and all of the tests should pass, getting
-  basically perfect accuracy.
-- You can also run the unit tests with `raco test src/`, but these
-  aren't very complete; focus more on the full run from the previous
-  bullet point.
+- Run `make fmt` to format the code before presentingcode. This is
+  mandatory and PRs that don't follow the coding style are rejected.
+- Run `racket src/main.rkt report bench/tutorial.fpcore tmp` to test
+  that your changes work; this should take about 5-10 seconds and all
+  of the tests should pass, getting basically perfect accuracy.
+- You can also run the unit tests with `raco test <file>`, when unit
+  tests exist. Often they don't.
 
 # PRs
 
-- PR descriptions should be in full sentences one to a few paragraphs
-  paragraphs in length. For all but the most trivial fixes, describe
-  the current behavior and why you changed it.
+- PR descriptions should be 1-3 paragraphs in length. Describe the
+  current behavior and why you changed it. Avoid bullet points.
 - Be explicit about the expected impact: "should be faster", "should
-  be more accurate", "pure refactor, not changes", and so on.
+  be more accurate", "pure refactor, no changes", and so on.

infra/merge.rkt

@@ -13,8 +13,7 @@
     (filter (conjoin (negate eof-object?) identity)
             (for/list ([dir (in-list dirs)])
               (with-handlers ([exn? (const #f)])
-                (define tl (call-with-input-file (build-path outdir dir "timeline.json") read-json))
-                (timeline-relink dir tl)))))
+                (call-with-input-file (build-path outdir dir "timeline.json") read-json)))))
   (define info (call-with-input-file (build-path outdir (first dirs) "results.json") read-datafile))
   (define joint-tl (apply timeline-merge tls))
   (call-with-output-file (build-path outdir "timeline.json")

src/api/datafile.rkt

@@ -35,8 +35,7 @@
   #:prefab)
 
 (struct report-info (date commit branch seed flags points iterations tests merged-cost-accuracy)
-  #:prefab
-  #:mutable)
+  #:prefab)
 
 (define (make-report-info tests #:seed [seed #f])
   (report-info (current-date)
@@ -228,9 +227,6 @@
                               cost-accuracy)))
                (hash-ref json 'merged-cost-accuracy null)))
 
-(define (unique? a)
-  (or (null? a) (andmap (curry equal? (car a)) (cdr a))))
-
 (define (merge-datafiles dfs #:dirs [dirs #f])
   (when (null? dfs)
     (error 'merge-datafiles "Cannot merge no datafiles"))
@@ -239,7 +235,7 @@
                           report-info-flags
                           report-info-points
                           report-info-iterations))]
-        #:unless (unique? (map f dfs)))
+        #:unless (<= (set-count (list->set (map f dfs))) 1))
     (error 'merge-datafiles "Cannot merge datafiles at different ~a" f))
   (unless dirs
     (set! dirs (map (const #f) dfs)))

src/api/run.rkt

@@ -56,13 +56,10 @@
             (define out
               (with-handlers ([exn? (const #f)])
                 (call-with-input-file (build-path dir (table-row-link res) name) read-json)))
-            (and out (not (eof-object? out)) (cons (table-row-link res) out)))))
-
-(define (merge-timeline-jsons tl)
-  (apply timeline-merge (map timeline-relink (dict-keys tl) (dict-values tl))))
+            (and out (not (eof-object? out)) out))))
 
 (define (merge-profile-jsons ps)
-  (profile->json (apply profile-merge (map json->profile (dict-values ps)))))
+  (profile->json (apply profile-merge (map json->profile ps))))
 
 (define (generate-bench-report result bench-name test-number dir total-tests)
   (define report-path (bench-folder-path bench-name test-number))
@@ -105,7 +102,7 @@
   (copy-file (web-resource "report.css") (build-path dir "report.css") #t)
   (copy-file (web-resource "logo-car.png") (build-path dir "logo-car.png") #t)
   (copy-file (web-resource "report.html") (build-path dir "index.html") #t)
-  (define timeline (merge-timeline-jsons (read-json-files info dir "timeline.json")))
+  (define timeline (apply timeline-merge (read-json-files info dir "timeline.json")))
   (call-with-output-file (build-path dir "timeline.json")
                          (curry write-json timeline)
                          #:exists 'replace)

src/api/sandbox.rkt

@@ -28,7 +28,6 @@
 (provide run-herbie
          get-table-data-from-hash
          *reeval-pts*
-         *timeout*
          (struct-out job-result)
          (struct-out improve-result)
          (struct-out alt-analysis))
@@ -92,10 +91,6 @@
   (define end-errs (map cdr sorted-end-exprs))
   (define end-data (map alt-analysis alternatives end-errs))
 
-  ;; bundle up the result
-  (timeline-adjust! 'regimes 'name (test-name test))
-  (timeline-adjust! 'regimes 'link ".")
-
   (improve-result preprocessing test-pcontext* start-alt-data target-alt-data end-data))
 
 (define (get-cost test)

src/config.rkt

@@ -40,7 +40,40 @@
                        branches)]
         [dump . ()]))
 
-(define (check-flag-deprecated! category flag)
+(define (flag-deprecated? category flag)
+  (match* (category flag)
+    [('precision 'double) #t]
+    [('precision 'fallback) #t]
+    [('setup 'simplify) #t]
+    [('generate 'better-rr) #t]
+    [('generate 'simplify) #t]
+    [('reduce 'simplify) #t]
+    [('reduce 'avg-error) #t]
+    [('localize 'costs) #t]
+    [('localize 'errors) #t]
+    [(_ _) #f]))
+
+; `hash-copy` returns a mutable hash, which makes `dict-update` invalid
+(define *flags* (make-parameter (make-immutable-hash (hash->list default-flags))))
+
+(define (flag-set? class flag)
+  (set-member? (dict-ref (*flags*) class) flag))
+
+(define (enable-flag! category flag)
+  (when (flag-deprecated? category flag)
+    (warn-flag-deprecated! category flag))
+  (define (update cat-flags)
+    (set-add cat-flags flag))
+  (*flags* (dict-update (*flags*) category update)))
+
+(define (disable-flag! category flag)
+  (when (flag-deprecated? category flag)
+    (warn-flag-deprecated! category flag))
+  (define (update cat-flags)
+    (set-remove cat-flags flag))
+  (*flags* (dict-update (*flags*) category update)))
+
+(define (warn-flag-deprecated! category flag)
   (match* (category flag)
     [('precision 'double)
      (eprintf "The precision:double option has been removed.\n")
@@ -80,31 +113,6 @@
      (eprintf "See <herbie://herbie.uwplse.org/doc/~a/options.html> for more.\n" *herbie-version*)]
     [(_ _) (void)]))
 
-(define (enable-flag! category flag)
-  (check-flag-deprecated! category flag)
-  (define (update cat-flags)
-    (set-add cat-flags flag))
-  (*flags* (dict-update (*flags*) category update)))
-
-(define (disable-flag! category flag)
-  (check-flag-deprecated! category flag)
-  (define (update cat-flags)
-    (set-remove cat-flags flag))
-  (*flags* (dict-update (*flags*) category update)))
-
-(define (flag-set? class flag)
-  (set-member? (dict-ref (*flags*) class) flag))
-
-(define (flag-deprecated? category flag)
-  (match* (category flag)
-    [('precision 'double) #t]
-    [('precision 'fallback) #t]
-    [('generate 'better-rr) #t]
-    [(_ _) #f]))
-
-; `hash-copy` returns a mutable hash, which makes `dict-update` invalid
-(define *flags* (make-parameter (make-immutable-hash (hash->list default-flags))))
-
 (define (changed-flags)
   (filter identity
           (for*/list ([(class flags) all-flags]
@@ -130,8 +138,6 @@
 ;; The maximum number of consecutive skipped points for sampling valid points
 (define *max-skipped-points* (make-parameter 100))
 
-(define *max-bsearch-bits* (make-parameter 48))
-
 ;; Maximum MPFR precision allowed during exact evaluation
 (define *max-mpfr-prec* (make-parameter 10000))
 
@@ -140,9 +146,6 @@
 (define *proof-max-length* (make-parameter 200))
 (define *proof-max-string-length* (make-parameter 10000))
 
-;; In localization, the maximum number of locations returned
-(define *localize-expressions-limit* (make-parameter 4))
-
 ;; How long of a Taylor series to generate; too long and we time out
 (define *taylor-order-limit* (make-parameter 4))
 
@@ -175,6 +178,20 @@
 ;; The number of iterations for the egglog search
 (define *default-egglog-iter-limit* (make-parameter 50))
 
+;;; The random seed
+
+(define the-seed #f)
+
+(define (get-seed)
+  (or the-seed (error "Seed is not set yet!")))
+
+(define (set-seed! seed)
+  "Reset the random number generator to a new seed"
+  (set! the-seed seed)
+  (if (vector? seed)
+      (current-pseudo-random-generator (vector->pseudo-random-generator seed))
+      (random-seed seed)))
+
 ;;; About Herbie:
 
 (define (run-command cmd)

src/core/bsearch.rkt

@@ -69,7 +69,7 @@
 ;; Invariant: (pred p1) and (not (pred p2))
 (define (binary-search-floats pred p1 p2 repr)
   (cond
-    [(<= (ulps->bits (ulp-difference p1 p2 repr)) (*max-bsearch-bits*))
+    [(<= (ulps->bits (ulp-difference p1 p2 repr)) (*binary-search-accuracy*))
      (timeline-push! 'stop "narrow-enough" 1)
      (values p1 p2)]
     [else
@@ -151,7 +151,7 @@
   (define (left-point p1 p2)
     (define left ((representation-repr->bf repr) p1))
     (define right ((representation-repr->bf repr) p2))
-    (define out
+    (define out ; TODO: Try using bigfloat-pick-point here?
       (if (bfnegative? left)
           (bigfloat-interval-shortest left (bfmin (bf/ left 2.bf) right))
           (bigfloat-interval-shortest left (bfmin (bf* left 2.bf) right))))

src/core/preprocess.rkt

@@ -164,7 +164,7 @@
     [(< (length result) (length preprocessing))
      (remove-unnecessary-preprocessing expression context pcontext result #:removed newly-removed)]
     [else
-     (timeline-push! 'remove-preprocessing (map ~a newly-removed))
+     (timeline-push! 'symmetry (map ~a result))
      result]))
 
 (define (preprocessing-<=? expression context pcontext preprocessing1 preprocessing2)

src/core/taylor.rkt

@@ -113,8 +113,6 @@
 
 (define/reset log-cache (make-hash '((1 . ((1 -1 1))))))
 
-(define/reset series-cache (make-hash))
-
 (define (n-sum-to n k)
   (hash-ref! (n-sum-to-cache)
              (cons n k)

src/main.rkt

@@ -1,12 +1,11 @@
 #lang racket
 
 (require racket/lazy-require)
-(require "utils/common.rkt"
+(require "config.rkt"
          "utils/multi-command-line.rkt"
          "utils/errors.rkt"
          "syntax/load-plugin.rkt"
-         "syntax/platform.rkt"
-         "api/sandbox.rkt")
+         "syntax/platform.rkt")
 
 ;; Load all the plugins
 (load-herbie-plugins)