112b3a0e52
- fix: ekp-param-set silently reset after first justify (now persists;
ekp-param-reset added)
- fix: narrow-width CJK returned empty string (data loss); two-pass
emergency-break strategy guarantees output for any input
- fix: K-P penalties never synced to C module; space-box metrics
divergence between C and Elisp engines
- fix: para cache ignored ekp-latin-lang (stale hyphenation after
language switch) and used collision-prone sxhash keys
- fix: fullwidth letters/digits misclassified as CJK punctuation
- fix: combining chars split from their base char in the tokenizer
- fix: punctuation-wrapped words (word!/(word)/word;) never hyphenated
- fix: renderer double-counted stripped space widths; negative glue
clamped; batch/tty font detection no longer crashes
- feat: real looseness support via (position × line-count) DP
- perf: O(1) line metrics and gap counts via prefix arrays (inner loop
previously allocated O(n) subsequences → O(n³) total); box measurement
dedupe; eq fast-path para lookup; prebuilt per-para glue arrays
→ zh justify 7547ms → 96ms (compiled elisp) / 57ms (C);
range-justify 68.5s → 0.48s / 34ms; C module itself 3–19× faster
- test: 36 batch-safe ERT tests + 300-case property fuzz (C/elisp
byte-identical output, zero content loss) replacing ad-hoc suite
- docs: readme/readme_zh/DEVELOPER/DEVELOPER_ZH/ekp_c-README rewritten
to match the implementation; phase handoff in .phrase/phases/
BREAKING: requires Emacs 29.1+; C module must be rebuilt (v1.1, new
arities); ekp-threshold-factor / ekp-flagged-penalty /
ekp-forced-break-penalty removed; Rust module stubs removed.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
81 lines
3.1 KiB
EmacsLisp
81 lines
3.1 KiB
EmacsLisp
;;; ekp-bench.el --- Benchmarks for EKP -*- lexical-binding: t; -*-
|
|
|
|
;;; Commentary:
|
|
|
|
;; Performance benchmarks over the bundled sample texts. Run:
|
|
;;
|
|
;; # Pure Elisp engine
|
|
;; emacs -Q --batch -L . --eval '(setq ekp-use-c-module nil)' \
|
|
;; -l tests/ekp-bench.el
|
|
;;
|
|
;; # C module engine (build ekp_c first)
|
|
;; emacs -Q --batch -L . \
|
|
;; --eval '(progn (require (quote ekp)) (ekp-c-module-load))' \
|
|
;; -l tests/ekp-bench.el
|
|
;;
|
|
;; In batch mode widths are measured in character columns, so the
|
|
;; numbers are engine-comparable but not identical to GUI timings.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ekp)
|
|
|
|
(defun ekp-bench--read (name)
|
|
(with-temp-buffer
|
|
(insert-file-contents
|
|
(expand-file-name name (expand-file-name "tests" (ekp-root-dir))))
|
|
(buffer-string)))
|
|
|
|
(defun ekp-bench-run (label thunk &optional n)
|
|
"Run THUNK N times (cold caches); report the fastest run."
|
|
(let ((n (or n 3)) (times nil))
|
|
(dotimes (_ n)
|
|
(ekp-clear-caches)
|
|
(garbage-collect)
|
|
(let ((t0 (float-time)))
|
|
(funcall thunk)
|
|
(push (- (float-time) t0) times)))
|
|
(message "%-42s %8.1f ms (min of %d)"
|
|
label (* 1000 (apply #'min times)) n)))
|
|
|
|
(let* ((zh (ekp-bench--read "text-zh.txt"))
|
|
(en (ekp-bench--read "text-en_US.txt"))
|
|
(mix (ekp-bench--read "text-zh-en_US.txt"))
|
|
(zh3 (string-join (list zh zh zh) "\n")))
|
|
(message "== engine: %s ==" (if (and (boundp 'ekp-c-module-loaded)
|
|
ekp-c-module-loaded
|
|
ekp-use-c-module)
|
|
"C" "elisp"))
|
|
(ekp-bench-run "justify zh w=200" (lambda () (ekp-pixel-justify zh 200)))
|
|
(ekp-bench-run "justify zh w=400" (lambda () (ekp-pixel-justify zh 400)))
|
|
(ekp-bench-run "justify en w=200" (lambda () (ekp-pixel-justify en 200)))
|
|
(ekp-bench-run "justify en w=400" (lambda () (ekp-pixel-justify en 400)))
|
|
(ekp-bench-run "justify mix w=300" (lambda () (ekp-pixel-justify mix 300)))
|
|
(ekp-bench-run "justify zh3 w=400" (lambda () (ekp-pixel-justify zh3 400)))
|
|
(ekp-bench-run "range zh 340-380"
|
|
(lambda () (ekp-pixel-range-justify zh 340 380)))
|
|
(ekp-bench-run "range mix 280-320"
|
|
(lambda () (ekp-pixel-range-justify mix 280 320)))
|
|
(ekp-bench-run "para-create zh (all lines)"
|
|
(lambda () (dolist (s (split-string zh "\n"))
|
|
(unless (string-blank-p s) (ekp--get-para s)))))
|
|
;; DP only: paragraphs pre-tokenized, fresh DP each round
|
|
(let ((paras (cl-remove-if #'string-blank-p (split-string zh "\n")))
|
|
(times nil))
|
|
(dolist (s paras) (ekp--get-para s))
|
|
(dotimes (_ 3)
|
|
(dolist (s paras)
|
|
(clrhash (ekp-para-dp-cache (ekp--get-para s))))
|
|
(garbage-collect)
|
|
(let ((t0 (float-time)))
|
|
(dolist (s paras) (ekp-dp-cache s 400))
|
|
(push (- (float-time) t0) times)))
|
|
(message "%-42s %8.1f ms (min of 3)" "DP-only zh w=400 (paras cached)"
|
|
(* 1000 (apply #'min times)))))
|
|
|
|
(message "bench done")
|
|
|
|
(provide 'ekp-bench)
|
|
|
|
;;; ekp-bench.el ends here
|