Merge pull request #1341 from herbie-fp/codex/remove-preprocessing-field-from-alts

Remove preprocessing field from alternatives

Author: pavpanchekha

src/core/bsearch.rkt

@@ -52,8 +52,7 @@
 
      ;; We don't want unused alts in our history!
      (define-values (alts* splitpoints*) (remove-unused-alts alts splitpoints))
-     (define preprocessing (alt-preprocessing (first alts*)))
-     (alt expr* (list 'regimes splitpoints*) alts* preprocessing)]))
+     (alt expr* (list 'regimes splitpoints*) alts*)]))
 
 (define (remove-unused-alts alts splitpoints)
   (for/fold ([alts* '()]

src/core/derivations.rkt

@@ -16,13 +16,13 @@
 (define (add-derivations-to altn)
   (match altn
     ; recursive rewrite or simplify, both using egg
-    [(alt expr (list 'rr loc (? egg-runner? runner) #f) `(,prev) preprocessing)
+    [(alt expr (list 'rr loc (? egg-runner? runner) #f) `(,prev))
      (define start-expr (location-get loc (alt-expr prev)))
      (define end-expr (location-get loc expr))
      (define proof
        (and (not (flag-set? 'generate 'egglog)) (egraph-prove runner start-expr end-expr)))
      (define proof* (canonicalize-proof (alt-expr altn) proof loc))
-     (alt expr `(rr ,loc ,runner ,proof*) (list prev) preprocessing)]
+     (alt expr `(rr ,loc ,runner ,proof*) (list prev))]
 
     ; everything else
     [_ altn]))

src/core/mainloop.rkt

@@ -33,6 +33,7 @@
 ;; Starting program for the current run
 (define *start-prog* (make-parameter #f))
 (define *pcontext* (make-parameter #f))
+(define *preprocessing* (make-parameter '()))
 
 ;; These high-level functions give the high-level workflow of Herbie:
 ;; - Initial steps: explain, preprocessing, initialize the alt table
@@ -46,7 +47,8 @@
   (define pcontext* (preprocess-pcontext context pcontext preprocessing))
   (*pcontext* pcontext*)
   (*start-prog* initial)
-  (define start-alt (alt initial 'start '() preprocessing))
+  (*preprocessing* preprocessing)
+  (define start-alt (alt initial 'start '()))
   (^table^ (make-alt-table pcontext start-alt context))
 
   (for ([iteration (in-range (*num-iterations*))]
@@ -55,17 +57,9 @@
   (define alternatives (extract!))
   (timeline-event! 'preprocess)
   (for/list ([altn alternatives])
-    (apply-preprocessing altn context pcontext)))
-
-(define (apply-preprocessing altn context pcontext)
-  (define expr (alt-expr altn))
-  (define initial-preprocessing (alt-preprocessing altn))
-  (define useful-preprocessing
-    (remove-unnecessary-preprocessing expr context pcontext initial-preprocessing))
-  (define expr*
-    (for/fold ([expr expr]) ([preprocessing (in-list (reverse useful-preprocessing))])
-      (compile-preprocessing expr context preprocessing)))
-  (alt expr* 'add-preprocessing (list altn) '()))
+    (define expr (alt-expr altn))
+    (define expr* (compile-useful-preprocessing expr context pcontext (*preprocessing*)))
+    (alt expr* 'add-preprocessing (list altn))))
 
 (define (extract!)
   (timeline-push-alts! '())
@@ -168,7 +162,7 @@
   ;; takes a patch and converts it to a full alt
   (define (reconstruct-alt altn loc0 orig)
     (let loop ([altn altn])
-      (match-define (alt _ event prevs _) altn)
+      (match-define (alt _ event prevs) altn)
       (match event
         ['patch orig]
         [_
@@ -183,7 +177,7 @@
                                location-set-cache
                                (alt-expr orig)
                                (alt-expr altn)))
-         (alt expr* event* (list (loop (first prevs))) (alt-preprocessing orig))])))
+         (alt expr* event* (list (loop (first prevs))))])))
 
   (^patched^ (remove-duplicates
               (reap [sow]

src/core/patch.rkt

@@ -54,7 +54,7 @@
             (for ([i (in-range (*taylor-order-limit*))])
               (define gen (approx spec (hole (representation-name repr) (genexpr))))
               (define idx (mutable-batch-munge! global-batch-mutable gen)) ; Munge gen
-              (sow (alt (batchref global-batch idx) `(taylor ,name ,var) (list altn) '()))))
+              (sow (alt (batchref global-batch idx) `(taylor ,name ,var) (list altn)))))
           (timeline-stop!))
         (batch-copy-mutable-nodes! global-batch global-batch-mutable))) ; Update global-batch
 
@@ -99,7 +99,7 @@
         (for ([batchrefs (in-list batchrefss)]
               [altn (in-list altns)])
           (for ([batchref* (in-list batchrefs)])
-            (sow (alt batchref* (list 'rr runner #f) (list altn) '()))))))
+            (sow (alt batchref* (list 'rr runner #f) (list altn)))))))
 
 (define (run-evaluate altns global-batch)
   (timeline-event! 'sample)
@@ -138,7 +138,7 @@
                [altn (in-list real-altns)]
                #:when (equal? status 'valid))
       (define idx (mutable-batch-munge! global-batch-mutable literal))
-      (alt (batchref global-batch idx) '(evaluate) (list altn) '())))
+      (alt (batchref global-batch idx) '(evaluate) (list altn))))
   (batch-copy-mutable-nodes! global-batch global-batch-mutable)
   final-altns)
 
@@ -179,7 +179,7 @@
           (for ([batchrefs (in-list batchrefss)]
                 [altn (in-list altns)])
             (for ([batchref* (in-list batchrefs)])
-              (sow (alt batchref* (list 'rr runner #f) (list altn) '()))))))
+              (sow (alt batchref* (list 'rr runner #f) (list altn)))))))
 
   (timeline-push! 'outputs (map (compose ~a debatchref alt-expr) rewritten))
   (timeline-push! 'count (length altns) (length rewritten))
@@ -192,7 +192,7 @@
   ; Starting alternatives
   (define start-altns
     (for/list ([root (in-vector (batch-roots global-batch))])
-      (alt (batchref global-batch root) 'patch '() '())))
+      (alt (batchref global-batch root) 'patch '())))
 
   (define evaluations
     (if (flag-set? 'generate 'evaluate)

src/core/preprocess.rkt

@@ -16,7 +16,8 @@
 (provide find-preprocessing
          preprocess-pcontext
          remove-unnecessary-preprocessing
-         compile-preprocessing)
+         compile-preprocessing
+         compile-useful-preprocessing)
 
 (define (has-fabs-impl? repr)
   (get-fpcore-impl 'fabs (repr->prop repr) (list repr)))
@@ -179,3 +180,9 @@
      (define copysign (get-fpcore-impl 'copysign (repr->prop repr) (list repr repr)))
      `(,mul (,copysign ,(literal 1 (representation-name repr)) ,var)
             ,(replace-expression expression var replacement))]))
+
+(define (compile-useful-preprocessing expression context pcontext preprocessing)
+  (define useful-preprocessing
+    (remove-unnecessary-preprocessing expression context pcontext preprocessing))
+  (for/fold ([expr expression]) ([prep (in-list (reverse useful-preprocessing))])
+    (compile-preprocessing expr context prep)))

src/reports/history.rkt

@@ -91,12 +91,12 @@
             (sow (alt-expr altn)))
 
           (match altn
-            [(alt prog 'start (list) _) (void)]
-            [(alt prog 'add-preprocessing `(,prev) _) (loop prev)]
-            [(alt prog `(evaluate ,loc) `(,prev) _) (loop prev)]
-            [(alt _ `(regimes ,splitpoints) prevs _) (for-each loop prevs)]
-            [(alt prog `(taylor ,loc ,pt ,var) `(,prev) _) (loop prev)]
-            [(alt prog `(rr ,loc ,input ,proof) `(,prev) _)
+            [(alt prog 'start (list)) (void)]
+            [(alt prog 'add-preprocessing `(,prev)) (loop prev)]
+            [(alt prog `(evaluate ,loc) `(,prev)) (loop prev)]
+            [(alt _ `(regimes ,splitpoints) prevs) (for-each loop prevs)]
+            [(alt prog `(taylor ,loc ,pt ,var) `(,prev)) (loop prev)]
+            [(alt prog `(rr ,loc ,input ,proof) `(,prev))
              (loop prev)
              (when proof
                (for ([step proof])
@@ -195,10 +195,10 @@
         "N/A"))
 
   (match altn
-    [(alt prog 'start (list) _)
+    [(alt prog 'start (list))
      `#hash((program . ,(fpcore->string (program->fpcore prog ctx))) (type . "start") (error . ,err))]
 
-    [(alt prog `(regimes ,splitpoints) prevs _)
+    [(alt prog `(regimes ,splitpoints) prevs)
      (define intervals
        (for/list ([start-sp (cons (sp -1 -1 #f) splitpoints)]
                   [end-sp splitpoints])
@@ -217,7 +217,7 @@
                         (define mask* (map and-fn mask new-mask))
                         (render-json entry pcontext ctx errcache mask*))))]
 
-    [(alt prog `(taylor ,loc ,pt ,var) `(,prev) _)
+    [(alt prog `(taylor ,loc ,pt ,var) `(,prev))
      `#hash((program . ,(fpcore->string (program->fpcore prog ctx)))
             (type . "taylor")
             (prev . ,(render-json prev pcontext ctx errcache mask))
@@ -226,14 +226,14 @@
             (loc . ,loc)
             (error . ,err))]
 
-    [(alt prog `(evaluate ,loc) `(,prev) _)
+    [(alt prog `(evaluate ,loc) `(,prev))
      `#hash((program . ,(fpcore->string (program->fpcore prog ctx)))
             (type . "evaluate")
             (prev . ,(render-json prev pcontext ctx errcache mask))
             (loc . ,loc)
             (error . ,err))]
 
-    [(alt prog `(rr ,loc ,input ,proof) `(,prev) _)
+    [(alt prog `(rr ,loc ,input ,proof) `(,prev))
      `#hash((program . ,(fpcore->string (program->fpcore prog ctx)))
             (type . "rr")
             (prev . ,(render-json prev pcontext ctx errcache mask))
@@ -243,12 +243,11 @@
             (loc . ,loc)
             (error . ,err))]
 
-    [(alt prog 'add-preprocessing `(,prev) preprocessing)
+    [(alt prog 'add-preprocessing `(,prev))
      `#hash((program . ,(fpcore->string (program->fpcore prog ctx)))
             (type . "add-preprocessing")
             (prev . ,(render-json prev pcontext ctx errcache mask))
-            (error . ,err)
-            (preprocessing . ,(map (curry map symbol->string) preprocessing)))]))
+            (error . ,err))]))
 
 (define (render-proof-json proof pcontext ctx errcache mask)
   (for/list ([step proof])

src/reports/plot.rkt

@@ -182,9 +182,9 @@
   (-> alt? (or/c (listof sp?) #f))
   (let loop ([altn altn])
     (match altn
-      [(alt _ `(regimes ,splitpoints) prevs _) splitpoints]
-      [(alt _ _ (list) _) #f]
-      [(alt _ _ (list prev _ ...) _) (loop prev)])))
+      [(alt _ `(regimes ,splitpoints) prevs) splitpoints]
+      [(alt _ _ (list)) #f]
+      [(alt _ _ (list prev _ ...)) (loop prev)])))
 
 (define (regime-splitpoints altn)
   (map sp-point (drop-right (regime-info altn) 1)))

src/utils/alternative.rkt

@@ -8,10 +8,10 @@
 
 ;; Alts are an expression plus a derivation for it.
 
-(struct alt (expr event prevs preprocessing) #:prefab)
+(struct alt (expr event prevs) #:prefab)
 
 (define (make-alt expr)
-  (alt expr 'start '() '()))
+  (alt expr 'start '()))
 
 (define (alt-cost altn repr)
   (define expr-cost (platform-cost-proc (*active-platform*)))