Merge main

.github/workflows/benchmark.yaml

@@ -6,22 +6,32 @@ on:
 jobs:
   benchmark:
     name: Benchmark
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - runs-on: ubuntu-latest
+          - runs-on: macos-latest
+          - runs-on: windows-latest
+      fail-fast: false
+    runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v4
 
       - uses: ./.github/actions/detect-and-install-rust-toolchain
 
-      - uses: ./.github/actions/install-buildit
+      # - uses: ./.github/actions/install-buildit
 
-      - name: Cache tmp.sample
-        uses: actions/cache@v3
-        timeout-minutes: 1
-        continue-on-error: true
-        with:
-          path: ./tmp.sample
-          key: tmp.sample-${{ github.job }}-${{ runner.os }}
-          restore-keys: tmp.sample-${{ github.job }}-${{ runner.os }}
+      # - name: Cache tmp.sample
+      #   uses: actions/cache@v3
+      #   timeout-minutes: 1
+      #   continue-on-error: true
+      #   with:
+      #     path: ./tmp.sample
+      #     key: tmp.sample-${{ github.job }}-${{ runner.os }}
+      #     restore-keys: tmp.sample-${{ github.job }}-${{ runner.os }}
 
-      - name: Benchmark
-        run: buildit benchmark
+      - name: Run arena allocator benchmark
+        run: cargo bench
+
+      # - name: Benchmark
+      #   run: buildit benchmark

.gitignore

@@ -22,3 +22,10 @@ target_coverage/
 
 # Artifacts
 artifacts/
+
+# Merge artifacts
+*.orig
+*_BACKUP_*.*
+*_BASE_*.*
+*_LOCAL_*.*
+*_REMOTE_*.*

Cargo.toml

@@ -27,6 +27,10 @@ name = "space-bench"
 path = "src/space_bench.rs"
 required-features = ["bench"]
 
+[[bench]]
+name = "arenas"
+harness = false
+
 [features]
 # Uncomment the "default = ..." below to include the nightly features in the build by default, and in the Rust
 # analyzer. If you do so then you will have to add "+nightly" to cargo commands, e.g. "cargo +nightly build".
@@ -44,13 +48,19 @@ crossterm = { version = "^0.27.0", optional = true }
 dirs = { version = "^5.0.1", optional = true }
 log = { version = "^0.4.20", optional = true }
 log4rs = { version = "^1.2.0", optional = true }
+page_size = "^0.6.0"
 ratatui = { version = "^0.23.0", default-features = false, features = ["crossterm"], optional = true }
 rayon = "^1.7.0"
 serde = { version = "^1.0.188", features = ["derive"], optional = true }
 serde_yaml = { version = "^0.9.25", optional = true }
 unicode-segmentation = "^1.10.1"
 
 [dev-dependencies]
+bumpalo = { version = "^3.14.0", features = ["collections"] }
+bumpalo-herd = "^0.1.2"
+criterion = "^0.5.1"
+id-arena = { version = "^2.2.1", features = ["rayon"] }
+memory-stats = "^1.1.0"
 regex = "^1.9.5"
 rstest = "^0.18.2"
 uuid = { version = "^1.4.1", features = ["v4"] }