Starting more specialization of primitives, inline drops

Cargo.toml

@@ -56,10 +56,9 @@ clap = { version = "4.5.39", features = ["derive"] }
 clap_complete = "4.5.52"
 steel-doc = { path = "./crates/steel-doc", version = "0.8.2" }
 mimalloc = { version = "0.1.47", optional = true }
-snmalloc-rs = { version = "0.3.8", optional = true, default-features = false, features = [
+snmalloc-rs = { version = "0.7.4", optional = true, default-features = false, features = [
     "build_cc",
     "usewait-on-address",
-    "native-cpu",
     "lto"
 ] }
 

benchmarks/ack/ack.py

@@ -9,10 +9,10 @@ def ack1(M, N):
 
 
 start = time.time()
-for i in range(50):
+for i in range(10000):
     ack1(3, 3)
 end = time.time()
 
-print(int(round((end - start) * 1000)))
+# print(int(round((end - start) * 1000)))
 
-# print(end - start)
+print(end - start)

benchmarks/ack/ack.scm

@@ -11,7 +11,7 @@
 ; (set! ackermann ackermann)
 
 (define (loop x)
-  (if (equal? x 100)
+  (if (equal? x 10000)
       #true
       (begin
         (ackermann 3 3)
@@ -22,7 +22,7 @@
 
 ; (ackermann 1 1)
 
-(loop 50)
+; (loop 50)
 
 ; 0     DynSuperInstruction : 0       ;; m
 ; 1     LOADINT0            : 563     ;; 0

benchmarks/bin-trees/bin-trees.scm

@@ -27,35 +27,13 @@
       (leaf item)
       (let ([item2 (* item 2)]
             [d2 (- d 1)])
-        ; (stdout-simple-displayln item)
         (node (make (- item2 1) d2) item (make item2 d2)))))
 
 (define (check t)
-  (if (leaf? t)
-      1
-      (+ 1 (+ (check (node-left t)) (check (node-right t))))))
-
-; (set! check check)
-; (set! make make)
-; (set! leaf leaf)
-; (set! leaf? leaf?)
-
-; (inspect check)
-; (#%jit-compile-2 make)
-; (#%jit-compile-2 check)
-; (#%jit-compile-2 leaf)
-; (#%jit-compile-2 leaf?)
-
-; (set! make make)
-; (set! check check)
+  (if (leaf? t) 1 (+ 1 (+ (check (node-left t)) (check (node-right t))))))
 
 (define (iterate n m d sum)
-  ; (stdout-simple-displayln n " " m " " d " " sum)
-  (if (equal? n m)
-      sum
-      (iterate (+ n 1) m d (+ sum (check (make n d))))))
-
-; (inspect iterate)
+  (if (equal? n m) sum (iterate (+ n 1) m d (+ sum (check (make n d))))))
 
 (define (max x y)
   (if (> x y) x y))
@@ -74,42 +52,7 @@
     (let ([stretch-depth (+ max-depth 1)])
       (displayln "stretch tree of depth " stretch-depth " check: " (check (make 0 stretch-depth))))
     (let ([long-lived-tree (make 0 max-depth)])
-      ; (begin
-      ; (define end )
-
       (loop 4 (add1 max-depth) max-depth min-depth)
-
-      ; )
-
       (displayln "long lived tree of depth " max-depth " check: " (check long-lived-tree)))))
 
-; (inspect iterate)
-
-; (set! iterate iterate)
-
-; (#%jit-compile-2 iterate)
-; (#%jit-compile-2 max)
-; (#%jit-compile-2 loop)
-; (#%jit-compile-2 main)
-
-; (inspect make)
-; (define foo (make 0 2))
-; (displayln foo)
-; (displayln node)
-; (displayln (check foo))
-
-
-; (stdout-simple-displayln (make 0 4))
-
-(main 20)
-; (inspect make)
-
-; (displayln (make 0 2))
-
-; (main 3)
-
-; (main 21)
-; (main 21)
-
-; (command-line #:args (n)
-;               (main (string->number n)))
+(main 12)

benchmarks/fib/fib.scm

@@ -1,14 +1,15 @@
 (provide fib
          ; jitfib
-         jit-fib
-         add-two
-         loop
-         jit-loop
-         assoc2
-         fake-car
-         test-alloc-stuff
-         map1
-         big-list)
+         ; jit-fib
+         ; add-two
+         ; loop
+         ; jit-loop
+         ; assoc2
+         ; fake-car
+         ; test-alloc-stuff
+         ; map1
+         ; big-list
+         )
 
 ;; This should return an int, and should always
 ;; return an int - we should be able to do
@@ -18,11 +19,11 @@
       1
       (+ (fib (- n 1)) (fib (- n 2)))))
 
-(define (jit-fib n)
-  ;; Loop unrolling would do so much, assuming we can do that easily
-  (if (<= n 2)
-      1
-      (+ (jit-fib (- n 1)) (jit-fib (- n 2)))))
+(fib 38)
+
+; (define (jit-fib n)
+;   ;; Loop unrolling would do so much, assuming we can do that easily
+;   (if (<= n 2) 1 (+ (jit-fib (- n 1)) (jit-fib (- n 2)))))
 
 ; (define jitfib (#%jit-compile jit-fib))
 ; (define jitfib jit-fib)
@@ -34,11 +35,11 @@
 ;; Replace it on the stack
 ; (#%jit-compile-2 jit-fib)
 
-(define (add-two x y)
-  (split-many (string-append x y) " "))
+; (define (add-two x y)
+;   (split-many (string-append x y) " "))
 
-(define (fake-car x)
-  (car x))
+; (define (fake-car x)
+;   (car x))
 
 ; (#%jit-compile-2 fake-car)
 
@@ -48,65 +49,59 @@
 ; (define (add-two x y)
 ;   (string-append x y))
 
-(define (loop x y)
-  (if (= x y)
-      x
-      (loop (+ x 1) y)))
-
-(define (jit-loop x y)
-  (if (= x y)
-      (to-string x)
-      (jit-loop (+ x 1) y)))
-
-(define (assoc2 obj lst)
-  (cond
-    [(null? lst) #f]
-    [(equal? (car (car lst)) obj) (car lst)]
-    [else (assoc2 obj (cdr lst))]))
-
-(define (test-alloc-stuff obj)
-  (stdout-simple-displayln obj)
-  (unbox (box obj)))
-
-(define big-list (map (lambda (x) (cons x x)) (range 0 10)))
-
-(define (map1 func accum lst)
-  ; (stdout-simple-displayln accum)
-  (if (null? lst)
-      (reverse accum)
-      (map1 func (cons (func (car lst)) accum) (cdr lst))))
-
-; (set! map1 map1)
-
-; (#%jit-compile-2 test-alloc-stuff)
-
-;; TODO: Fix the inlining issue with free identifiers
 ; (define (loop x y)
-;   (if (= x y)
-;       x
-;       (loop (+ x 1))))
-
-(define (loop1 count)
-  (if (= count 100)
-      (assoc 99999 big-list)
-      (begin
-        (assoc 99999 big-list)
-        (loop1 (+ 1 count)))))
-
-(define (loop2 count)
-  (if (= count 100)
-      (assoc 99999 big-list)
-      (begin
-        (assoc2 99999 big-list)
-        (loop2 (+ 1 count)))))
-
-(provide test-assoc)
-(define (test-assoc)
-  (loop1 0))
-
-(provide test-assoc2)
-(define (test-assoc2)
-  (loop2 0))
+;   (if (= x y) x (loop (+ x 1) y)))
+
+; (define (jit-loop x y)
+;   (if (= x y) (to-string x) (jit-loop (+ x 1) y)))
+
+; (define (assoc2 obj lst)
+;   (cond
+;     [(null? lst) #f]
+;     [(equal? (car (car lst)) obj) (car lst)]
+;     [else (assoc2 obj (cdr lst))]))
+
+; (define (test-alloc-stuff obj)
+;   (stdout-simple-displayln obj)
+;   (unbox (box obj)))
+
+; (define big-list (map (lambda (x) (cons x x)) (range 0 10)))
+
+; (define (map1 func accum lst)
+;   ; (stdout-simple-displayln accum)
+;   (if (null? lst) (reverse accum) (map1 func (cons (func (car lst)) accum) (cdr lst))))
+
+; ; (set! map1 map1)
+
+; ; (#%jit-compile-2 test-alloc-stuff)
+
+; ;; TODO: Fix the inlining issue with free identifiers
+; ; (define (loop x y)
+; ;   (if (= x y)
+; ;       x
+; ;       (loop (+ x 1))))
+
+; (define (loop1 count)
+;   (if (= count 100)
+;       (assoc 99999 big-list)
+;       (begin
+;         (assoc 99999 big-list)
+;         (loop1 (+ 1 count)))))
+
+; (define (loop2 count)
+;   (if (= count 100)
+;       (assoc 99999 big-list)
+;       (begin
+;         (assoc2 99999 big-list)
+;         (loop2 (+ 1 count)))))
+
+; (provide test-assoc)
+; (define (test-assoc)
+;   (loop1 0))
+
+; (provide test-assoc2)
+; (define (test-assoc2)
+;   (loop2 0))
 
 ; (displayln (fib 10))
 

benchmarks/map/map.py

@@ -1,3 +1,11 @@
-lst = [x + 1 for x in range(0, 10000)]
+import time
 
-print(len(lst))
+base_range = list(range(0, 100000))
+
+results = []
+
+start = time.time()
+for i in range(1000):
+    results.append([x + 1 for x in base_range])
+end = time.time()
+print((end - start) * 1000)

benchmarks/map/map.scm

@@ -1,3 +1,18 @@
-(define lst (map (lambda (x) (+ x 1)) (range 0 10000)))
+(define r (range 0 100000))
 
-(displayln (length lst))
+(define results (mutable-vector))
+
+(define (loop x)
+  (if (= x 100)
+      void
+      (begin
+        (vector-push! results (map (lambda (x) (+ x 1)) r))
+        (loop (+ x 1)))))
+
+(provide run)
+(define (run)
+  (loop 0))
+
+; (define lst (map (lambda (x) (+ x 1)) r))
+
+; (displayln (length lst))

crates/steel-core/Cargo.toml

@@ -24,7 +24,9 @@ futures-task = "0.3.28"
 serde_json = "1.0.108"
 serde = { version = "1.0.193", features = ["derive", "rc"] }
 bincode = "1.3.3"
-im-lists = "0.12.1"
+# im-lists = "0.12.1"
+
+im-lists = { path = "../../../im-lists" }
 
 strsim = "0.11.0"
 steel-quickscope = { path = "../quickscope", version = "0.3.2" }
@@ -41,6 +43,9 @@ rustc-hash = "2.1.1"
 steel-gen = { path = "../steel-gen", version = "0.8.2" }
 steel-parser = { path = "../steel-parser", version = "0.8.2" }
 steel-derive = { path = "../steel-derive", version = "0.8.2" }
+
+steel-vec = { path = "../steel-vec", version = "0.8.2" }
+
 cargo-steel-lib = { path = "../cargo-steel-lib", version = "0.8.2", optional = true }
 chrono = { version = "0.4.23", default-features = false, features = ["std", "clock"], optional = true }
 env_home = "0.1.0"
@@ -66,10 +71,13 @@ steel-rc = { path = "../steel-rc", version = "0.8.2", optional = true }
 abi_stable = { version = "0.11.2", optional = true }
 async-ffi = { version = "0.5.0", features = ["abi_stable"], optional = true }
 # Cranelift JIT
-cranelift = { version = "0.119", optional = true }
-cranelift-module = { version = "0.119", optional = true }
-cranelift-jit = { version = "0.119", optional = true }
-cranelift-native = { version = "0.119", optional = true }
+cranelift = { version = "0.130", optional = true }
+cranelift-module = { version = "0.130", optional = true }
+cranelift-jit = { version = "0.130", optional = true }
+cranelift-native = { version = "0.130", optional = true }
+object = { version = "*" }
+target-lexicon = "*"
+rustix = { version = "1", features = ["thread"] }
 
 anyhow = { version = "1", optional = true }
 
@@ -110,6 +118,9 @@ icu_casemap = "2.0.0"
 
 thin-vec = { version = "0.2.14", features = ["serde"] }
 
+[target.'cfg(target_os = "linux")'.dependencies]
+wasmtime-jit-debug = { version = "34", optional = true, features = ["perf_jitdump"] }
+
 [target.'cfg(target_family = "wasm")'.dependencies]
 getrandom = { version = "0.3.1", features = ["wasm_js"] }
 js-sys = "0.3.69"
@@ -161,7 +172,7 @@ biased = ["dep:steel-rc"]
 
 
 ffi-format = []
-jit2 = ["dep:cranelift", "dep:cranelift-module", "dep:cranelift-jit", "dep:cranelift-native"]
+jit2 = ["dep:cranelift", "dep:cranelift-module", "dep:cranelift-jit", "dep:cranelift-native", "dep:wasmtime-jit-debug"]
 
 [[bench]]
 name = "my_benchmark"