Merge pull request #1308 from herbie-fp/load-one-platform

Load one platform at a time

Author: AYadrov

.github/workflows/plugins.yml

@@ -24,5 +24,7 @@ jobs:
       - uses: actions/checkout@master
       - name: "Install dependencies"
         run: make install
+      - name: "Install SoftPosit support"
+        run: raco pkg install softposit-rkt
       - name: "Run posit benchmarks"
-        run: racket infra/ci.rkt --platform softposit --precision posit16 --seed 0 infra/bench/posits.fpcore
+        run: racket infra/ci.rkt --platform infra/softposit.rkt --precision posit16 --seed 0 infra/bench/posits.fpcore

.github/workflows/unit-test.yml

@@ -24,6 +24,9 @@ jobs:
       - uses: actions/checkout@master
       - name: "Install dependencies"
         run: make install
+      # SoftPosit is required to test the softposit platform we use for testing
+      - name: "Install SoftPosit support"
+        run: raco pkg install softposit-rkt
 
       - name: "Test raco fmt compliance"
         run: make fmt && git diff --exit-code

Makefile

@@ -15,7 +15,6 @@ clean:
 	raco pkg remove --force --no-docs egg-herbie-macosm1 && echo "Uninstalled old egg-herbie" || :
 
 update:
-	raco pkg install --skip-installed softposit-rkt
 	raco pkg install --skip-installed --no-docs --auto --name herbie src/
 	raco pkg update --auto rival
 	raco pkg update --name herbie --deps search-auto src/
@@ -59,7 +58,7 @@ start-server:
 		--log infra/server.log --quiet 2>&1
 
 fmt:
-	@raco fmt -i $(shell find egg-herbie/ src/ infra/ -name '*.rkt' -not -path 'src/platforms/*.rkt')
+	@raco fmt -i $(shell find egg-herbie/ src/ infra/ -name '*.rkt' -not -path 'src/platforms/*.rkt' -not -path "infra/softposit.rkt")
 
 herbie.zip herbie.zip.CHECKSUM:
 	raco pkg create src/

infra/ci.rkt

@@ -2,7 +2,6 @@
 
 (require "../src/utils/common.rkt"
          "../src/core/points.rkt"
-         "../src/syntax/load-plugin.rkt"
          "../src/utils/alternative.rkt"
          "../src/api/sandbox.rkt"
          "../src/syntax/read.rkt"
@@ -27,12 +26,9 @@
                   (cons var (representation-name repr)))]))
 
 (define (run-tests . bench-dirs)
-  (define default-precision
-    (if (*precision*)
-        (representation-name (*precision*))
-        (*default-precision*)))
+  (activate-platform! (*platform-name*))
   (define tests
-    (parameterize ([*default-precision* default-precision])
+    (parameterize ([*default-precision* (*precision*)])
       (append-map load-tests bench-dirs)))
   (define seed (pseudo-random-generator->vector (current-pseudo-random-generator)))
   (printf "Running Herbie on ~a tests, seed: ~a\n" (length tests) seed)
@@ -41,7 +37,7 @@
     (printf "~a/~a\t" (~a (+ 1 i) #:width 3 #:align 'right) (length tests))
     (define the-test*
       (if (*precision*)
-          (override-test-precision the-test (*precision*))
+          (override-test-precision the-test (get-representation (*precision*)))
           the-test))
     (define result (run-herbie 'improve the-test* #:seed seed))
     (match-define (job-result _ test status time timeline profile warnings backend) result)
@@ -93,30 +89,22 @@
 
 (module+ main
   ;; Load all the plugins
-  (load-herbie-plugins)
-
   (define seed (random 1 (expt 2 31)))
   (set-seed! seed)
 
-  (command-line #:program "ci.rkt"
-                #:once-each
-                [("--seed")
-                 rs
-                 "The random seed to use in point generation. If false (#f), a random seed is used'"
-                 (define given-seed (read (open-input-string rs)))
-                 (when given-seed
-                   (set-seed! given-seed))]
-                [("--platform")
-                 platform
-                 "Which platform to use for tests"
-                 (activate-platform! (string->symbol platform))]
-                [("--precision")
-                 prec
-                 "Which precision to use for tests"
-                 (*precision* (get-representation (string->symbol prec)))]
-                [("--num-iters")
-                 num
-                 "The number of iterations to use for the main loop"
-                 (*num-iterations* (string->number num))]
-                #:args bench-dir
-                (exit (if (apply run-tests bench-dir) 0 1))))
+  (command-line
+   #:program "ci.rkt"
+   #:once-each [("--seed")
+                rs
+                "The random seed to use in point generation. If false (#f), a random seed is used'"
+                (define given-seed (read (open-input-string rs)))
+                (when given-seed
+                  (set-seed! given-seed))]
+   [("--platform") platform "Which platform to use for tests" (*platform-name* platform)]
+   [("--precision") prec "Which precision to use for tests" (*precision* (string->symbol prec))]
+   [("--num-iters")
+    num
+    "The number of iterations to use for the main loop"
+    (*num-iterations* (string->number num))]
+   #:args bench-dir
+   (exit (if (apply run-tests bench-dir) 0 1))))

infra/merge.rkt

@@ -5,8 +5,8 @@
          "../src/utils/profile.rkt"
          "../src/api/datafile.rkt"
          "../src/reports/timeline.rkt"
-         "../src/syntax/load-plugin.rkt"
-         "../src/reports/common.rkt")
+         "../src/reports/common.rkt"
+         "../src/syntax/platform.rkt")
 
 (define (merge-timelines outdir . dirs)
   (define tls
@@ -36,7 +36,6 @@
                          (curry write-json (profile->json joint-pf))))
 
 (define (merge-reports outdir . dirs)
-  (load-herbie-builtins)
   (define rss
     (filter (conjoin (negate eof-object?) identity)
             (for/list ([dir (in-list dirs)])
@@ -53,6 +52,7 @@
 
 (module+ main
   (command-line #:args (outdir . dirs)
+                (activate-platform! (*platform-name*))
                 (apply merge-reports outdir dirs)
                 (apply merge-timelines outdir dirs)
                 (apply merge-profiles outdir dirs)

src/platforms/softposit.rkt renamed to infra/softposit.rkt

@@ -6,9 +6,10 @@
 (require math/flonum
          math/bigfloat
          softposit-rkt
-         "../utils/float.rkt"  ; for shift/unshift
+         "../src/utils/float.rkt"  ; for shift/unshift
          rival
-         "../syntax/platform.rkt")
+         "../src/syntax/platform.rkt")
+(provide platform)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; utils ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -86,7 +87,7 @@
 
 (define cost 1)
 
-(define softposit-platform
+(define platform
   (make-empty-platform 'softposit #:if-cost 1))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REPRESENTATIONS ;;;;;;;;;;;;;;;;;;;;;;;
@@ -180,21 +181,21 @@
                        #:total-bits 64
                        #:special-value? nan?))
 
-(platform-register-representation! softposit-platform #:repr bool     #:cost cost)
-(platform-register-representation! softposit-platform #:repr posit8   #:cost cost)
-(platform-register-representation! softposit-platform #:repr posit16  #:cost cost)
-(platform-register-representation! softposit-platform #:repr posit32  #:cost cost)
-(platform-register-representation! softposit-platform #:repr quire8   #:cost cost)
-(platform-register-representation! softposit-platform #:repr quire16  #:cost cost)
-(platform-register-representation! softposit-platform #:repr quire32  #:cost cost)
-(platform-register-representation! softposit-platform #:repr binary64 #:cost cost)
+(platform-register-representation! platform #:repr bool     #:cost cost)
+(platform-register-representation! platform #:repr posit8   #:cost cost)
+(platform-register-representation! platform #:repr posit16  #:cost cost)
+(platform-register-representation! platform #:repr posit32  #:cost cost)
+(platform-register-representation! platform #:repr quire8   #:cost cost)
+(platform-register-representation! platform #:repr quire16  #:cost cost)
+(platform-register-representation! platform #:repr quire32  #:cost cost)
+(platform-register-representation! platform #:repr binary64 #:cost cost)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; OPERATORS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; BOOLEAN IMPLS ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (platform-register-implementations!
- softposit-platform
+ platform
  ([TRUE  ()                      bool (TRUE)    (const true)  (! TRUE)  cost]
   [FALSE ()                      bool (FALSE)   (const false) (! FALSE) cost]
   [not   ([x : bool])            bool (not x)   not           (not x)   cost]
@@ -205,7 +206,7 @@
 
 ; ([name           ([var : repr] ...)                          otype   spec          fl                fpcore                           cost])
 (platform-register-implementations!
- softposit-platform
+ platform
  (; Posit8
   [neg.p8          ([x : posit8])                              posit8  (neg x)       posit8-neg        (! :precision posit8 (- x))        cost]
   [+.p8            ([x : posit8]  [y : posit8])                posit8  (+ x y)       posit8-add        (! :precision posit8 (+ x y))      cost]
@@ -257,7 +258,7 @@
 
 ; ([name             ([var : repr] ...) otype  spec fl             fpcore                        cost])
 (platform-register-implementations!
- softposit-platform
+ platform
  (; Posit/float implementations
   [binary64->posit8  ([x : binary64]) posit8   x double->posit8   (! :precision posit8 (cast x))   cost]
   [binary64->posit16 ([x : binary64]) posit16  x double->posit16  (! :precision posit16 (cast x))  cost]
@@ -280,12 +281,12 @@
   [posit16->quire16  ([x : posit16])  quire16  x posit16->quire16 (! :precision quire16 (cast x))  cost]
   [posit32->quire32  ([x : posit32])  quire32  x posit32->quire32 (! :precision quire32 (cast x))  cost]))
 
-(register-platform! softposit-platform)
+(register-platform! platform)
 
 (module+ main
-  (display-platform softposit-platform))
+  (display-platform platform))
 
 ;; Do not run this file during testing
 (module test racket/base
   )
-  
+  

src/api/demo.rkt

@@ -18,6 +18,7 @@
          "../syntax/types.rkt"
          "../syntax/read.rkt"
          "../syntax/sugar.rkt"
+         "../syntax/platform.rkt"
          "../utils/common.rkt"
          "../utils/errors.rkt"
          "../utils/float.rkt"
@@ -520,6 +521,7 @@
   (*demo-output* output)
   (*demo-prefix* prefix)
   (*demo-log* log)
+  (activate-platform! (*platform-name*))
   (server-start threads)
 
   (serve/servlet dispatch

src/api/run.rkt

@@ -38,12 +38,14 @@
         (table-row-conversions row)))
 
 (define (make-report bench-dirs #:dir dir #:threads threads)
+  (activate-platform! (*platform-name*))
   (define tests (reverse (sort (append-map load-tests bench-dirs) test<?)))
   (run-tests tests #:dir dir #:threads threads))
 
 (define (rerun-report json-file #:dir dir #:threads threads)
   (define data (call-with-input-file json-file read-datafile))
   (define tests (map extract-test (report-info-tests data)))
+  (activate-platform! (*platform-name*))
   (*flags* (report-info-flags data))
   (set-seed! (report-info-seed data))
   (*num-points* (report-info-points data))

src/api/server.rkt

@@ -3,11 +3,11 @@
 (require openssl/sha1)
 (require (only-in xml write-xexpr))
 
-(require "../syntax/load-plugin.rkt"
-         "../syntax/read.rkt"
+(require "../syntax/read.rkt"
          "../syntax/sugar.rkt"
          "../syntax/syntax.rkt"
          "../syntax/types.rkt"
+         "../syntax/platform.rkt"
          "../utils/alternative.rkt"
          "../utils/common.rkt"
          "../utils/errors.rkt"
@@ -174,8 +174,7 @@
                          *platform-name*
                          *loose-plugins*
                          *functions*)
-   (parameterize ([current-error-port (open-output-nowhere)]) ; hide output
-     (load-herbie-plugins))
+   (activate-platform! (*platform-name*))
    ; not sure if the above code is actaully needed.
    (define busy-workers (make-hash))
    (define waiting-workers (make-hash))
@@ -296,8 +295,7 @@
                          *platform-name*
                          *loose-plugins*
                          *functions*)
-   (parameterize ([current-error-port (open-output-nowhere)]) ; hide output
-     (load-herbie-plugins))
+   (activate-platform! (*platform-name*))
    (define worker-thread
      (thread (λ ()
                (let loop ()

src/api/shell.rkt

@@ -1,6 +1,7 @@
 #lang racket
 
-(require "../syntax/read.rkt"
+(require "../syntax/platform.rkt"
+         "../syntax/read.rkt"
          "../utils/common.rkt"
          "server.rkt")
 (provide run-shell
@@ -40,6 +41,7 @@
 
 (define (run-improve input output #:threads [threads #f])
   (define seed (get-seed))
+  (activate-platform! (*platform-name*))
   (define tests (load-tests input))
   (server-start threads)
   (define ids
@@ -57,6 +59,7 @@
 
 (define (run-shell)
   (define seed (get-seed))
+  (activate-platform! (*platform-name*))
   (server-start #f)
   (eprintf "Find help on https://herbie.uwplse.org/, exit with ~a\n"
            (match (system-type 'os)