Merge pull request #1315 from herbie-fp/fix-distribute-platforms

pavpanchekha · web-flow · commit a180a353c8b9 · 2025-07-07T16:44:06.000-06:00
Add `load-platform.rkt` to load platforms, even when distributing a binary
diff --git a/infra/ci.rkt b/infra/ci.rkt
@@ -6,7 +6,8 @@
          "../src/api/sandbox.rkt"
          "../src/syntax/read.rkt"
          "../src/syntax/types.rkt"
-         "../src/syntax/platform.rkt")
+         "../src/syntax/platform.rkt"
+         "../src/syntax/load-platform.rkt")
 
 (define *precision* (make-parameter #f))
 
diff --git a/infra/merge.rkt b/infra/merge.rkt
@@ -6,7 +6,8 @@
          "../src/api/datafile.rkt"
          "../src/reports/timeline.rkt"
          "../src/reports/common.rkt"
-         "../src/syntax/platform.rkt")
+         "../src/syntax/platform.rkt"
+         "../src/syntax/load-platform.rkt")
 
 (define (merge-timelines outdir . dirs)
   (define tls
diff --git a/infra/softposit.rkt b/infra/softposit.rkt
@@ -281,8 +281,6 @@
   [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! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/api/demo.rkt b/src/api/demo.rkt
@@ -19,6 +19,7 @@
          "../syntax/read.rkt"
          "../syntax/sugar.rkt"
          "../syntax/platform.rkt"
+         "../syntax/load-platform.rkt"
          "../utils/common.rkt"
          "../utils/errors.rkt"
          "../utils/float.rkt"
diff --git a/src/api/run.rkt b/src/api/run.rkt
@@ -8,6 +8,7 @@
          "../syntax/sugar.rkt"
          "../syntax/types.rkt"
          "../syntax/platform.rkt"
+         "../syntax/load-platform.rkt"
          "../utils/common.rkt"
          "../utils/profile.rkt"
          "../utils/timeline.rkt"
diff --git a/src/api/sandbox.rkt b/src/api/sandbox.rkt
@@ -8,6 +8,7 @@
          "../syntax/syntax.rkt"
          "../syntax/sugar.rkt"
          "../syntax/types.rkt"
+         "../syntax/load-platform.rkt"
          "../core/localize.rkt"
          "../utils/alternative.rkt"
          "../core/compiler.rkt"
diff --git a/src/api/server.rkt b/src/api/server.rkt
@@ -8,6 +8,7 @@
          "../syntax/syntax.rkt"
          "../syntax/types.rkt"
          "../syntax/platform.rkt"
+         "../syntax/load-platform.rkt"
          "../utils/alternative.rkt"
          "../utils/common.rkt"
          "../utils/errors.rkt"
diff --git a/src/api/shell.rkt b/src/api/shell.rkt
@@ -1,6 +1,7 @@
 #lang racket
 
 (require "../syntax/platform.rkt"
+         "../syntax/load-platform.rkt"
          "../syntax/read.rkt"
          "../utils/common.rkt"
          "server.rkt")
diff --git a/src/config.rkt b/src/config.rkt
@@ -161,7 +161,7 @@
 (define *default-precision* (make-parameter 'binary64))
 
 ;; The platform that Herbie will evaluate with.
-(define *platform-name* (make-parameter 'c))
+(define *platform-name* (make-parameter "c"))
 
 ;; Plugins loaded locally rather than through Racket.
 (define *loose-plugins* (make-parameter '()))
diff --git a/src/core/egg-herbie.rkt b/src/core/egg-herbie.rkt
@@ -310,7 +310,8 @@
   (egg-parsed->expr (flatten-let egg-expr) ctx (context-repr ctx)))
 
 (module+ test
-  (require "../utils/float.rkt")
+  (require "../utils/float.rkt"
+           "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
   (define ctx (context '(x y z) <binary64> (make-list 3 <binary64>)))
 
diff --git a/src/core/egglog-herbie-tests.rkt b/src/core/egglog-herbie-tests.rkt
@@ -309,7 +309,8 @@
            "rules.rkt"
            "../config.rkt"
            "../syntax/platform.rkt"
-           "../utils/float.rkt")
+           "../utils/float.rkt"
+           "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
 
   (define batch
diff --git a/src/core/regimes.rkt b/src/core/regimes.rkt
@@ -149,7 +149,8 @@
     (list-ref errs (si-cidx (findf (lambda (x) (< i (si-pidx x))) split-indices)))))
 
 (module+ test
-  (require "../syntax/platform.rkt")
+  (require "../syntax/platform.rkt"
+           "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
   (define ctx (context '(x) <binary64> (list <binary64>)))
   (define pctx (mk-pcontext '(#(0.5) #(4.0)) '(1.0 1.0)))
diff --git a/src/core/sampling.rkt b/src/core/sampling.rkt
@@ -32,7 +32,8 @@
 
 (module+ test
   (require rackunit)
-  (require "../syntax/platform.rkt")
+  (require "../syntax/platform.rkt"
+           "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
   (define binary64 (get-representation 'binary64))
   (define pre '(and (and (<= 0 a) (<= a 1)) (and (<= 0 b) (<= b 1))))
diff --git a/src/core/test-rules.rkt b/src/core/test-rules.rkt
@@ -8,6 +8,7 @@
          "rules.rkt"
          "programs.rkt"
          "../syntax/platform.rkt"
+         "../syntax/load-platform.rkt"
          "sampling.rkt")
 
 (activate-platform! (*platform-name*))
diff --git a/src/main.rkt b/src/main.rkt
@@ -5,16 +5,9 @@
 (require "config.rkt"
          "utils/multi-command-line.rkt"
          "utils/errors.rkt"
-         "syntax/platform.rkt")
+         "syntax/load-platform.rkt")
 
 ;; Define the built-in platforms to force bundling them
-(define-runtime-module-path herbie10-platform "platforms/herbie10.rkt")
-(define-runtime-module-path herbie20-platform "platforms/herbie20.rkt")
-(define-runtime-module-path c-platform "platforms/c.rkt")
-(define-runtime-module-path racket-platform "platforms/racket.rkt")
-(define-runtime-module-path math-platform "platforms/math.rkt")
-(define-runtime-module-path rival-platform "platforms/rival.rkt")
-
 (lazy-require ["api/demo.rkt" (run-demo)]
               ["api/run.rkt" (make-report rerun-report)]
               ["api/shell.rkt" (run-shell run-improve)])
diff --git a/src/platforms/c.rkt b/src/platforms/c.rkt
@@ -262,8 +262,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/platforms/herbie10.rkt b/src/platforms/herbie10.rkt
@@ -275,8 +275,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/platforms/herbie20.rkt b/src/platforms/herbie20.rkt
@@ -275,8 +275,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/platforms/math.rkt b/src/platforms/math.rkt
@@ -161,8 +161,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/platforms/racket.rkt b/src/platforms/racket.rkt
@@ -213,8 +213,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/platforms/rival.rkt b/src/platforms/rival.rkt
@@ -217,8 +217,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; REGISTER PLATFORM ;;;;;;;;;;;;;;;;;;;;;
 
-(register-platform! platform)
-
 (module+ main
   (display-platform platform))
 
diff --git a/src/syntax/load-platform.rkt b/src/syntax/load-platform.rkt
@@ -0,0 +1,41 @@
+#lang racket
+(require racket/runtime-path)
+(require "../config.rkt"
+         "../utils/errors.rkt"
+         "platform.rkt")
+(provide activate-platform!)
+
+(define-runtime-module-path herbie10-platform "../platforms/herbie10.rkt")
+(define-runtime-module-path herbie20-platform "../platforms/herbie20.rkt")
+(define-runtime-module-path c-platform "../platforms/c.rkt")
+(define-runtime-module-path racket-platform "../platforms/racket.rkt")
+(define-runtime-module-path math-platform "../platforms/math.rkt")
+(define-runtime-module-path rival-platform "../platforms/rival.rkt")
+
+(define default-platforms
+  (hash "herbie10"
+        herbie10-platform
+        "herbie20"
+        herbie20-platform
+        "c"
+        c-platform
+        "racket"
+        racket-platform
+        "math"
+        math-platform
+        "rival"
+        rival-platform))
+
+(define platforms (make-hash))
+
+(define (activate-platform! name)
+  (define path (hash-ref default-platforms name name))
+  (define platform (hash-ref! platforms name (lambda () (dynamic-require path 'platform))))
+
+  (unless platform
+    (raise-herbie-error "unknown platform `~a`, found (~a)"
+                        name
+                        (string-join (map ~a (hash-keys platforms)) ", ")))
+
+  (*platform-name* name)
+  (*active-platform* platform))
diff --git a/src/syntax/platform.rkt b/src/syntax/platform.rkt
@@ -9,7 +9,6 @@
          "syntax.rkt")
 
 (provide *active-platform*
-         activate-platform!
          platform-lifting-rules
          platform-lowering-rules
          platform-copy
@@ -37,7 +36,6 @@
          platform-register-implementation!
          platform-register-implementations!
          display-platform
-         register-platform!
          make-operator-impl
          make-representation)
 
@@ -60,50 +58,19 @@
          (fprintf port "#<platform:~a>" (platform-name p))
          (fprintf port "#<platform>")))])
 
-;; Platform table, mapping name to platform
-(define platforms (make-hash))
-
 ;; Active platform
 (define *active-platform* (make-parameter #f))
 
-(define-runtime-path platform-dir "../platforms/")
-
-(define (load-platform! name)
-  (if (or (string-contains? name "/") (string-contains? name "."))
-      (dynamic-require name 'platform)
-      (dynamic-require (build-path platform-dir (format "~a.rkt" name)) 'platform)))
-
-;; Loads a platform.
-(define (activate-platform! name)
-  (define platform (hash-ref! platforms name (lambda () (load-platform! (~a name)))))
-
-  (unless platform
-    (raise-herbie-error "unknown platform `~a`, found (~a)"
-                        name
-                        (string-join (map ~a (hash-keys platforms)) ", ")))
-
-  (*platform-name* name)
-  (*active-platform* platform))
-
 (define (platform-copy platform)
   (struct-copy $platform
                platform
                [representations (hash-copy (platform-representations platform))]
                [implementations (hash-copy (platform-implementations platform))]))
 
-;; Registers a platform under identifier `name`.
-(define (register-platform! platform)
-  (define name (platform-name platform))
-  (when (hash-has-key? platforms name)
-    (error 'register-platform! "platform already registered ~a" name))
-  (hash-set! platforms name (platform-copy platform)))
-
 (define (make-empty-platform name #:if-cost [if-cost #f])
   (define reprs (make-hash))
   (define repr-costs (make-hash))
   (define impls (make-hash))
-  (when (hash-has-key? platforms name)
-    (error 'make-empty-platform "platform with name ~a is already registered" name))
   (unless if-cost
     (error 'make-empty-platform "Platform ~a is missing cost for if function" name))
   (set! if-cost (platform/parse-if-cost if-cost))
diff --git a/src/syntax/read.rkt b/src/syntax/read.rkt
@@ -185,7 +185,7 @@
                #:when (eq? key ':alt))
       (match (parse-platform-name val) ; plat-name is symbol or #f
         ; If plat-name extracted, check if name matches
-        [(? symbol? plat-name) (cons val (equal? plat-name (*platform-name*)))]
+        [(? symbol? plat-name) (cons val (equal? (~a plat-name) (*platform-name*)))]
         ; try to lower
         [#f
          (with-handlers ([exn:fail:user:herbie:missing? (lambda (e) (cons val #f))])
@@ -279,7 +279,8 @@
 
 (module+ test
   (require rackunit
-           "../utils/float.rkt")
+           "../utils/float.rkt"
+           "../syntax/load-platform.rkt")
 
   (activate-platform! (*platform-name*))
   (define precision 'binary64)
diff --git a/src/syntax/syntax-check.rkt b/src/syntax/syntax-check.rkt
@@ -199,6 +199,7 @@
 ;; testing FPCore format
 (module+ test
   (require rackunit)
+  (require "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
 
   (define (get-errs stx)
diff --git a/src/syntax/test-syntax.rkt b/src/syntax/test-syntax.rkt
@@ -7,7 +7,8 @@
 (module+ test
   (require rackunit
            math/bigfloat
-           "../config.rkt")
+           "../config.rkt"
+           "../syntax/load-platform.rkt")
 
   (activate-platform! (*platform-name*))
   (define platform (platform-copy (*active-platform*)))
diff --git a/src/syntax/type-check.rkt b/src/syntax/type-check.rkt
@@ -137,7 +137,8 @@
 
 (module+ test
   (require rackunit)
-  (require "platform.rkt")
+  (require "platform.rkt"
+           "../syntax/load-platform.rkt")
   (activate-platform! (*platform-name*))
 
   ;; Dummy representation registration
