raco fmt + baseline updated with precision vector to match Rival for fairness in comparison

Author: AYadrov

eval/run.rkt

@@ -3,10 +3,12 @@
 (require racket/match
          racket/function
          racket/flonum)
+
 (require "machine.rkt"
          "adjust.rkt"
          "../mpfr.rkt"
          "../ops/all.rkt")
+
 (provide rival-machine-load
          rival-machine-run
          rival-machine-return

infra/format-mathematica.rkt

@@ -134,18 +134,30 @@
      (define new-data
        (struct-copy mdata
                     data
-                    [rival-samplable (if is-samplable (+ rival-samplable 1) rival-samplable)]
+                    [rival-samplable
+                     (if is-samplable
+                         (+ rival-samplable 1)
+                         rival-samplable)]
                     [rival-movability
-                     (if (and rival-no-error is-immovable) (+ rival-movability 1) rival-movability)]
+                     (if (and rival-no-error is-immovable)
+                         (+ rival-movability 1)
+                         rival-movability)]
                     [rival-possible
                      (if (and rival-no-error (not is-samplable) (not is-immovable))
                          (+ rival-possible 1)
                          rival-possible)]
                     [mathematica-samplable
-                     (if m-samplable? (+ mathematica-samplable 1) mathematica-samplable)]
+                     (if m-samplable?
+                         (+ mathematica-samplable 1)
+                         mathematica-samplable)]
                     [mathematica-unsamplable
-                     (if (not m-samplable?) (+ mathematica-unsamplable 1) mathematica-unsamplable)]
-                    [mathematica-error (if m-error? (+ mathematica-error 1) mathematica-error)]))
+                     (if (not m-samplable?)
+                         (+ mathematica-unsamplable 1)
+                         mathematica-unsamplable)]
+                    [mathematica-error
+                     (if m-error?
+                         (+ mathematica-error 1)
+                         mathematica-error)]))
      (hash-set! bench-to-mdata suite new-data)
      (collect-mathematica port rival-port bench-to-mdata (+ sofar 1) examples-port)]
     [else bench-to-mdata]))

infra/generate-points.rkt

@@ -15,7 +15,9 @@
      (define bindings (map cons vars (map unfold-let vals)))
      (replace-vars bindings (unfold-let body))]
     [`(let* () ,body) (unfold-let body)]
-    [`(let* ([,var ,val] ,rest ...) ,body)
+    [`(let* ([,var ,val]
+             ,rest ...)
+        ,body)
      (replace-vars (list (cons var (unfold-let val))) (unfold-let `(let* ,rest ,body)))]
     [`(,head ,args ...) (cons head (map unfold-let args))]
     [x x]))
@@ -65,7 +67,10 @@
              (cons suite-name (rest result))))))
 
 (define (load-tests path)
-  (define path* (if (string? path) (string->path path) path))
+  (define path*
+    (if (string? path)
+        (string->path path)
+        path))
   (apply append
          (for/list ([fname (directory-list path* #:build? true)]
                     #:when (or (directory-exists? fname)

infra/interval-evaluate.rkt

@@ -89,7 +89,9 @@
     [else (lambda xs #f)]))
 
 (define (convert-number expression use-mpfi?)
-  (if use-mpfi? (iv expression) (mk-ival (bf expression))))
+  (if use-mpfi?
+      (iv expression)
+      (mk-ival (bf expression))))
 
 (define (interval-evaluate expression variables point use-mpfi?)
   (cond

infra/report.rkt

@@ -56,7 +56,12 @@
   (apply min (map (lambda (d) (if (number? d) d +inf.0)) data)))
 
 (define (get-bold-index data good)
-  (define processed (map (lambda (d) (if (number? d) (exact->inexact d) d)) data))
+  (define processed
+    (map (lambda (d)
+           (if (number? d)
+               (exact->inexact d)
+               d))
+         data))
   (cond
     [(equal? good 'none) (length processed)]
     [(or (equal? good 'min) (equal? good 'max))
@@ -75,7 +80,9 @@
   (define strings (map latex-format-item data))
   (define-values (before after) (split-at strings bold-index))
   (define modified-after
-    (if (> (length after) 0) (cons (make-latex-bold (first after)) (rest after)) empty))
+    (if (> (length after) 0)
+        (cons (make-latex-bold (first after)) (rest after))
+        empty))
   (append before modified-after))
 
 (define (make-latex-row data #:good [good 'none])
@@ -181,7 +188,10 @@
   (equal? bigfloat '+nan.bf))
 
 (define (output-var name val port [comment ""])
-  (define comment-string (if (equal? comment "") "" (format "% ~a" comment)))
+  (define comment-string
+    (if (equal? comment "")
+        ""
+        (format "% ~a" comment)))
   (fprintf port "\\newcommand{\\~a}{~a\\xspace}~a\n" name val comment-string))
 
 (define (round1 num)

infra/run-baseline.rkt

@@ -21,6 +21,7 @@
                    outputs
                    discs
                    registers
+                   precisions
                    [profile-ptr #:mutable]
                    profile-instruction
                    profile-number
@@ -46,6 +47,7 @@
                     roots
                     discs
                     registers
+                    precisions
                     0
                     (make-vector (*rival-profile-executions*))
                     (make-vector (*rival-profile-executions*))
@@ -76,8 +78,11 @@
        (raise (exn:rival:unsamplable "Unsamplable input" (current-continuation-marks) pt))]
       [else (loop (* 2 prec))])))
 
+(define (baseline-machine-adjust machine)
+  (vector-fill! (baseline-machine-precisions machine) (bf-precision)))
+
 (define (baseline-machine-full machine inputs)
-  ; no adjust here
+  (baseline-machine-adjust machine)
   (baseline-machine-load machine inputs)
   (baseline-machine-run machine)
   (baseline-machine-return machine))
@@ -89,15 +94,17 @@
   (define ivec (baseline-machine-instructions machine))
   (define varc (vector-length (baseline-machine-arguments machine)))
   (define vregs (baseline-machine-registers machine))
-  (define precision (bf-precision))
-
-  (parameterize ([bf-precision precision])
-    (for ([instr (in-vector ivec)] [n (in-naturals varc)])
-      (define start (current-inexact-milliseconds))
-      (vector-set! vregs n (apply-instruction instr vregs))
-      (define name (object-name (car instr)))
-      (define time (- (current-inexact-milliseconds) start))
-      (baseline-machine-record machine name n precision time))))
+  (define precisions (baseline-machine-precisions machine))
+
+  (for ([instr (in-vector ivec)]
+        [n (in-naturals varc)]
+        [precision (in-vector precisions)])
+    (define start (current-inexact-milliseconds))
+    (parameterize ([bf-precision precision])
+      (vector-set! vregs n (apply-instruction instr vregs)))
+    (define name (object-name (car instr)))
+    (define time (- (current-inexact-milliseconds) start))
+    (baseline-machine-record machine name n precision time)))
 
 (define (apply-instruction instr regs)
   ;; By special-casing the 0-3 instruction case,
@@ -123,7 +130,9 @@
   (define stuck? #f)
   (define fvec
     (for/vector #:length (vector-length rootvec)
-                ([root (in-vector rootvec)] [disc (in-list discs)] [n (in-naturals)])
+                ([root (in-vector rootvec)]
+                 [disc (in-list discs)]
+                 [n (in-naturals)])
       (define out (vector-ref vregs root))
       (define lo ((discretization-convert disc) (ival-lo out)))
       (define hi ((discretization-convert disc) (ival-hi out)))

infra/run-sollya.rkt

@@ -221,7 +221,9 @@
          (match-define (list result sollya-time) (string-split s "\n"))
          (list dt
                (seconds->ms sollya-time)
-               (if (string-contains? result "-") (fl -inf.0) (fl +inf.0))
+               (if (string-contains? result "-")
+                   (fl -inf.0)
+                   (fl +inf.0))
                'valid))]
 
       ; Valid output