Merge pull request #1291 from herbie-fp/unused-stuff

Minor reorganizations

Author: pavpanchekha

src/core/egg-herbie.rkt

@@ -312,7 +312,7 @@
   (egg-parsed->expr (flatten-let egg-expr) ctx (context-repr ctx)))
 
 (module+ test
-  (*context* (make-debug-context '(x y z)))
+  (define ctx (make-debug-context '(x y z)))
 
   (define test-exprs
     (list (cons '(+.f64 y x) '(+.f64 $var1 $var0))
@@ -327,12 +327,12 @@
 
   (let ([egg-graph (make-egraph-data)])
     (for ([(in expected-out) (in-dict test-exprs)])
-      (define out (expr->egg-expr in (*context*)))
-      (define computed-in (egg-expr->expr out (*context*)))
+      (define out (expr->egg-expr in ctx))
+      (define computed-in (egg-expr->expr out ctx))
       (check-equal? out expected-out)
       (check-equal? computed-in in)))
 
-  (*context* (make-debug-context '(x a b c r)))
+  (set! ctx (make-debug-context '(x a b c r)))
   (define extended-expr-list
     ; specifications
     (list '(/ (- (exp x) (exp (neg x))) 2)
@@ -355,8 +355,8 @@
 
   (let ([egg-graph (make-egraph-data)])
     (for ([expr extended-expr-list])
-      (define egg-expr (expr->egg-expr expr (*context*)))
-      (check-equal? (egg-expr->expr egg-expr (*context*)) expr))))
+      (define egg-expr (expr->egg-expr expr ctx))
+      (check-equal? (egg-expr->expr egg-expr ctx) expr))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Proofs
@@ -1282,7 +1282,7 @@
 ;;     - scheduler: `(scheduler . <name>)` [default: backoff]
 ;;        - `simple`: run all rules without banning
 ;;        - `backoff`: ban rules if the fire too much
-(define (make-egraph batch roots reprs schedule #:context [ctx (*context*)])
+(define (make-egraph batch roots reprs schedule ctx)
   (define (oops! fmt . args)
     (apply error 'verify-schedule! fmt args))
   ; verify the schedule

src/core/egglog-herbie.rkt

@@ -65,7 +65,7 @@
 ;;     - scheduler: `(scheduler . <name>)` [default: backoff]
 ;;        - `simple`: run all rules without banning
 ;;        - `backoff`: ban rules if the fire too much
-(define (make-egglog-runner batch roots reprs schedule #:context [ctx (*context*)])
+(define (make-egglog-runner batch roots reprs schedule ctx)
   (define (oops! fmt . args)
     (apply error 'verify-schedule! fmt args))
   ; verify the schedule

src/core/explain.rkt

@@ -35,11 +35,10 @@
     [(symbol? expr) #f]
     [else #t]))
 
-(define (actual-errors expr pcontext)
+(define (actual-errors expr ctx pcontext)
   (match-define (cons subexprs pt-errorss)
     (parameterize ([*pcontext* pcontext])
-      (flip-lists (hash->list (first (compute-local-errors (list (all-subexpressions expr))
-                                                           (*context*)))))))
+      (flip-lists (hash->list (first (compute-local-errors (list (all-subexpressions expr)) ctx))))))
 
   (define pt-worst-subexpr
     (append* (reap [sow]
@@ -503,9 +502,9 @@
                             oflow-hash
                             uflow-hash)
 
-  (define tcount-hash (actual-errors expr pctx))
+  (define tcount-hash (actual-errors expr ctx pctx))
 
-  (define repr (repr-of expr (*context*)))
+  (define repr (repr-of expr ctx))
   (define (values->json vs repr)
     (map (lambda (value) (value->json value repr)) (vector->list vs)))
 

src/core/patch.rkt

@@ -84,8 +84,8 @@
 
   (define runner
     (if (flag-set? 'generate 'egglog)
-        (make-egglog-runner input-batch (batch-roots input-batch) reprs schedule)
-        (make-egraph global-batch roots reprs schedule)))
+        (make-egglog-runner input-batch (batch-roots input-batch) reprs schedule (*context*))
+        (make-egraph global-batch roots reprs schedule (*context*))))
 
   (define batchrefss
     (if (flag-set? 'generate 'egglog)
@@ -164,8 +164,8 @@
 
   (define runner
     (if (flag-set? 'generate 'egglog)
-        (make-egglog-runner input-batch (batch-roots input-batch) reprs schedule)
-        (make-egraph global-batch roots reprs schedule)))
+        (make-egglog-runner input-batch (batch-roots input-batch) reprs schedule (*context*))
+        (make-egraph global-batch roots reprs schedule (*context*))))
 
   (define batchrefss
     (if (flag-set? 'generate 'egglog)

src/core/preprocess.rkt

@@ -7,10 +7,7 @@
          "../utils/common.rkt"
          "../utils/float.rkt"
          "../utils/timeline.rkt"
-         "../utils/float.rkt"
          "batch.rkt"
-         "egglog-herbie.rkt"
-         "../config.rkt"
          "egg-herbie.rkt"
          "points.rkt"
          "programs.rkt"
@@ -77,7 +74,8 @@
     (make-egraph batch
                  (batch-roots batch)
                  (make-list (vector-length (batch-roots batch)) (context-repr ctx))
-                 `((,rules . ((node . ,(*node-limit*)))))))
+                 `((,rules . ((node . ,(*node-limit*)))))
+                 ctx))
 
   ;; collect equalities
   (for/list ([(ident spec*) (in-dict identities)]