basedpl 0.1.83__tar.gz → 0.1.84__tar.gz

basedpl-0.1.84/.config/nextest.toml

@@ -0,0 +1,39 @@
+# `cargo nextest run` runs each test in its own process and every binary at once. The threads of one process take turns at its one session (`src/eval.rs`), so separate processes are what run tests in parallel.
+[profile.default]
+# A test running past 5 s is reported as slow. One still running at 30 s is stopped and fails.
+slow-timeout = { period = "5s", terminate-after = 6 }
+fail-fast = false
+
+[test-groups]
+timed = { max-threads = 1 }
+
+# The reference runner starts one child process per core. It starts first and runs with nothing beside it, so no timing runs beside it.
+[[profile.default.overrides]]
+filter = 'binary(reference)'
+threads-required = 'num-cpus'
+priority = 100
+
+# Memory-bound timings run with nothing beside them.
+[[profile.default.overrides]]
+filter = 'binary(speed) and test(=timed_images)'
+threads-required = 'num-cpus'
+test-group = 'timed'
+priority = -100
+
+# Other timings run one at a time, beside light correctness tests, after every other test has started.
+[[profile.default.overrides]]
+filter = 'binary(speed) and test(/^timed_/)'
+test-group = 'timed'
+priority = -100
+
+# Optional selection excluding timings, used by focused cross-repo diagnostics. It gives reference one slot because this selection contains no timing tests.
+[profile.untimed]
+default-filter = 'not (binary(speed) and test(/^timed_/))'
+
+[[profile.untimed.overrides]]
+filter = 'binary(reference)'
+threads-required = 1
+
+# Optional timing-only selection. An explicit cross-repo ('untimed', 'timed', 'speed') run uses this after correctness and before rustymath timings. Plain run_tests uses default and includes everything.
+[profile.timed]
+default-filter = 'binary(speed) and test(/^timed_/)'

{basedpl-0.1.83 → basedpl-0.1.84}/.github/workflows/test.yml

@@ -17,6 +17,7 @@ jobs:
       # `tests/highlighting.mjs` reads the TextMate grammar through `shiki`, which `package.json` pins.
       - run: npm ci
       - uses: dtolnay/rust-toolchain@stable
+      - uses: taiki-e/install-action@nextest
       # The repository has no `Cargo.lock`. Creating one first makes rust-cache's key change when a dependency publishes a new version.
       - run: cargo generate-lockfile
       - uses: Swatinem/rust-cache@v2
@@ -30,7 +31,7 @@ jobs:
       - run: node tests/input.mjs
       - run: node tests/highlighting.mjs
         if: ${{ !cancelled() }}
-      - run: cargo test --release
+      - run: cargo nextest run --cargo-profile release -E 'not binary(speed)'
         if: ${{ !cancelled() }}
       - run: pytest -q
         if: ${{ !cancelled() }}

{basedpl-0.1.83 → basedpl-0.1.84}/Cargo.lock

@@ -99,16 +99,14 @@ checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "basedpl"
-version = "0.1.83"
+version = "0.1.84"
 dependencies = [
  "base64 0.23.1",
+ "basedpl-image",
+ "basedpl-jit",
+ "basedpl-testkit",
  "bytemuck",
  "chrono",
- "cranelift-codegen",
- "cranelift-frontend",
- "cranelift-jit",
- "cranelift-module",
- "cranelift-native",
  "csv",
  "fancy-regex",
  "flate2",
@@ -116,7 +114,6 @@ dependencies = [
  "globset",
  "half",
  "icu_normalizer",
- "image",
  "js-sys",
  "json5",
  "nix",
@@ -125,12 +122,12 @@ dependencies = [
  "num-rational",
  "num-traits",
  "plotters",
- "png",
  "psm",
  "rand",
  "roxmltree",
  "rustix",
  "rustymath",
+ "rustymath-timing",
  "serde",
  "serde_json",
  "sha2 0.11.1",
@@ -147,10 +144,11 @@ dependencies = [
 
 [[package]]
 name = "basedpl-cli"
-version = "0.1.83"
+version = "0.1.84"
 dependencies = [
  "async-trait",
  "basedpl",
+ "basedpl-testkit",
  "ctrlc",
  "kernmini",
  "rustyline",
@@ -159,11 +157,33 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "basedpl-image"
+version = "0.1.84"
+dependencies = [
+ "flate2",
+ "image",
+ "png",
+]
+
+[[package]]
+name = "basedpl-jit"
+version = "0.1.84"
+dependencies = [
+ "cranelift-codegen",
+ "cranelift-frontend",
+ "cranelift-jit",
+ "cranelift-module",
+ "cranelift-native",
+ "rustymath",
+]
+
 [[package]]
 name = "basedpl-py"
-version = "0.1.83"
+version = "0.1.84"
 dependencies = [
  "basedpl",
+ "basedpl-testkit",
  "ctrlc",
  "kernmini",
  "num-bigint",
@@ -173,16 +193,30 @@ dependencies = [
  "rustyline",
  "rustymath",
  "rustymath-buffer",
+ "rustymath-timing",
+ "serde_json",
+]
+
+[[package]]
+name = "basedpl-testkit"
+version = "0.1.84"
+dependencies = [
+ "basedpl",
+ "rustymath",
+ "rustymath-timing",
  "serde_json",
+ "tempfile",
 ]
 
 [[package]]
 name = "basedpl-wasm"
-version = "0.1.83"
+version = "0.1.84"
 dependencies = [
  "basedpl",
+ "basedpl-testkit",
  "js-sys",
  "rustymath",
+ "rustymath-timing",
  "serde_json",
  "talc",
  "wasm-bindgen",
@@ -266,20 +300,6 @@ name = "bytemuck"
 version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.9",
-]
 
 [[package]]
 name = "byteorder-lite"
@@ -872,7 +892,6 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
- "bytemuck",
  "cfg-if",
  "crunchy",
  "num-traits",
@@ -1149,9 +1168,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libz-sys"
-version = "1.1.31"
+version = "1.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff20308ecabd635a2dc1dd5834a86c462cca20efba1d5d3ddab1f8aea3455cb2"
+checksum = "69965d2409bff8c8cea3829009fff66a86f05a0570656552ef70f616e8e4bd85"
 dependencies = [
  "cc",
  "pkg-config",
@@ -1303,7 +1322,6 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
- "bytemuck",
  "num-traits",
 ]
 
@@ -1687,9 +1705,32 @@ dependencies = [
 
 [[package]]
 name = "rustymath"
-version = "0.1.55"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15db2c2f2672139ec1efd4de9f7dae652a6b1e00ae30ded2e3157c53934f549"
+dependencies = [
+ "num-complex",
+ "num-traits",
+ "rustymath-core",
+ "rustymath-kernels",
+]
+
+[[package]]
+name = "rustymath-buffer"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6afd7ae962d7b12267666a967b2f16fb053e6a199947c8a0ca86d5e4e0db480a"
+dependencies = [
+ "num-rational",
+ "pyo3",
+ "rustymath",
+]
+
+[[package]]
+name = "rustymath-core"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f6cf34181562715d225bf4c7493c0e8f061a78cd8976ab7fcc8731698973c3"
+checksum = "d3e084d95673de445a509775b3197f152743f7266f8b5ff0915ba84483cf73fb"
 dependencies = [
  "foldhash",
  "half",
@@ -1707,14 +1748,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustymath-buffer"
-version = "0.1.55"
+name = "rustymath-kernels"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49a20ff13e04774294f25ad9565eda8f593d0e628d161be3aaeb6298d984c61"
+checksum = "c9a90e340c52d1252a09315a79148ae5f347f13abf347c6eaa2bab19bf101621"
 dependencies = [
+ "half",
+ "num-complex",
  "num-rational",
- "pyo3",
- "rustymath",
+ "num-traits",
+ "rustymath-core",
+]
+
+[[package]]
+name = "rustymath-timing"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77242720683f2c6f20cd32ce2fb407c6dbca0f3d7677d9a4a3823f35303b1747"
+dependencies = [
+ "libc",
+ "rustymath-core",
 ]
 
 [[package]]
@@ -2466,7 +2519,7 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
 [[package]]
 name = "xtask"
-version = "0.1.83"
+version = "0.1.84"
 dependencies = [
  "anyhow",
  "serde_json",

{basedpl-0.1.83 → basedpl-0.1.84}/Cargo.toml

@@ -1,24 +1,26 @@
 [workspace]
-members = ["py"]
+members = ["image", "jit", "py", "testkit"]
 
 [workspace.metadata.fastfmt]
 join_comments = true
 
 [workspace.package]
-version = "0.1.83"
+version = "0.1.84"
 edition = "2024"
 rust-version = "1.98"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-rustymath = { version = ">=0.1.55, <1", default-features = false }
+rustymath = { version = ">=0.1.56, <1", default-features = false }
 rustymath-buffer = ">=0.1.55, <1"
+rustymath-timing = ">=0.1.56, <1"
 pyo3 = ">=0.29.2, <1"
 pyo3-build-config = ">=0.29.2, <1"
 ctrlc = ">=3.5.2, <4"
 kernmini = ">=0.1.22, <1"
 # Custom bindings override Emacs Alt-digit prefixes in this fork.
 rustyline = { git = "https://github.com/AnswerDotAI/rustyline.git", branch = "master", default-features = false, features = ["custom-bindings", "with-file-history"] }
+flate2 = { version = ">=1.1.10, <2", default-features = false, features = ["zlib"] }
 
 [package]
 name = "basedpl"
@@ -33,11 +35,6 @@ doctest = false
 # Without a unit-test build, `cargo test` compiles the library only once.
 test = false
 
-# Plain `cargo test` skips the timing suite; `cargo test --test speed` runs it.
-[[test]]
-name = "speed"
-test = false
-
 [profile.test]
 inherits = "release"
 
@@ -51,6 +48,10 @@ incremental = true
 # Line tables change with every shifted line and recompile the code below it.
 debug = false
 
+[profile.quick]
+inherits = "release"
+lto = "off"
+
 [profile.dist]
 inherits = "release"
 lto = "thin"
@@ -75,11 +76,12 @@ serde = ">=1.0.229, <2"
 serde_json = { version = "1", features = ["arbitrary_precision", "preserve_order"] }
 unicode-width = { version = ">=0.2.2, <1", default-features = false }
 num-rational = ">=0.4.2, <1"
-num-complex = { version = ">=0.4.6, <1", features = ["bytemuck"] }
+num-complex = ">=0.4.6, <1"
 num-bigint = ">=0.4.6, <0.5"
 num-traits = ">=0.2.19, <1"
-half = { version = ">=2.7.1, <3", features = ["num-traits", "bytemuck"] }
+half = { version = ">=2.7.1, <3", features = ["num-traits"] }
 rustymath.workspace = true
+basedpl-image = { path = "image" }
 strength_reduce = ">=0.2.4, <1"
 rand = { version = ">=0.10.2, <1", features = ["chacha"] }
 # AnswerDotAI's fork measures text with a canvas, which works in a Web Worker: plotters-rs/plotters#746.
@@ -100,13 +102,10 @@ nix = { version = ">=0.31.3, <1", default-features = false, features = ["user"]
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
 # The Mac build links the zlib that macOS ships, in place of compiling `miniz_oxide`.
-flate2 = { version = ">=1.1.10, <2", default-features = false, features = ["zlib"] }
+flate2.workspace = true
 
 [target.'cfg(not(target_vendor = "apple"))'.dependencies]
 flate2 = ">=1.1.10, <2"
-# Macs decode and encode images through ImageIO instead.
-image = { version = ">=0.25.6, <1", default-features = false, features = ["png", "jpeg"] }
-png = ">=0.18.1, <1"
 
 [target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
 chrono = { version = ">=0.4.45, <0.5", features = ["unstable-locales"] }
@@ -114,12 +113,7 @@ icu_normalizer = ">=2, <3"
 fancy-regex = "0.20"
 walkdir = ">=2.5.0, <3"
 globset = ">=0.4.20, <1"
-# Cranelift compiles a typed program's loops while BPL runs. The browser build has no JIT.
-cranelift-codegen = { version = "0.137", default-features = false, features = ["std", "host-arch"] }
-cranelift-frontend = "0.137"
-cranelift-jit = "0.137"
-cranelift-module = "0.137"
-cranelift-native = "0.137"
+basedpl-jit = { path = "jit" }
 
 # The browser build. `build.rs` sets `cfg(web)` for the same target.
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
@@ -132,5 +126,9 @@ wasm-bindgen = ">=0.2.129, <0.3"
 # `eval::room` reads the stack pointer for the room left on the browser's main stack, where stacker reports none.
 psm = ">=0.1.32, <0.2"
 
+[dev-dependencies]
+basedpl-testkit = { path = "testkit" }
+rustymath-timing.workspace = true
+
 [build-dependencies]
 serde_json = "1"