branch: externals/phpinspect
commit 23fbc17d5c1fe67d2a855f7e03427f4665193a42
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>
Fix benchmarks
---
benchmarks/parse-file.el | 158 +++++++++++++++++------------------------------
benchmarks/splay-tree.el | 2 +-
2 files changed, 56 insertions(+), 104 deletions(-)
diff --git a/benchmarks/parse-file.el b/benchmarks/parse-file.el
index 27573e618f..80249b5c00 100644
--- a/benchmarks/parse-file.el
+++ b/benchmarks/parse-file.el
@@ -23,129 +23,81 @@
;;; Code:
-;;(require 'profiler)
-;; (require 'phpinspect-parser)
-;; (require 'phpinspect-buffer)
+(require 'profiler)
+(require 'phpinspect-parser)
+(require 'phpinspect-buffer)
-;; (defun phpinspect-parse-current-buffer ()
-;; (phpinspect-parse-buffer-until-point
-;; (current-buffer)
-;; (point-max)))
+(with-temp-buffer
+ (let* ((here (file-name-directory (macroexp-file-name)))
+ (benchmark-file (or (getenv "PHPINSPECT_BENCHMARK_FILE")
+ (expand-file-name "Response.php" here)))
+ (buffer (phpinspect-claim-buffer (current-buffer)
(phpinspect--make-project
+ :root "/dev/null"
+ :fs
(phpinspect-make-virtual-fs)
+ :autoload
(phpinspect-make-autoloader
+ :fs
(phpinspect-make-virtual-fs)
+
:project-root-resolver (lambda () "/dev/null"))
+ :worker
'nil-worker)))
+ result)
+ (message "Incremental parse (warmup):")
+ (setq result (benchmark-run 1 (progn
+ (insert-file-contents benchmark-file)
+ (phpinspect-buffer-parse buffer))))
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; (let* ((here (file-name-directory (macroexp-file-name)))
-;; (benchmark-file (or (getenv "PHPINSPECT_BENCHMARK_FILE")
-;; (expand-file-name "Response.php" here)))
-;; buffer
-;; result)
+ (message "Incremental parse:")
+ (setq result (benchmark-run 1 (phpinspect-buffer-parse buffer)))
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
+ (garbage-collect)
+ (message "Incremental parse (no edits):")
+ (setq result (benchmark-run 1 (phpinspect-buffer-parse buffer)))
-;; (with-temp-buffer
-;; (insert-file-contents benchmark-file)
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
+ (garbage-collect)
-;; (message "Incremental parse (warmup):")
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :incremental t
:bmap (phpinspect-make-bmap))
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
+ (message "Incremental parse repeat (no edits):")
+ (setq result (benchmark-run 1 (phpinspect-buffer-parse buffer)))
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; (let ((bmap (phpinspect-make-bmap))
-;; (bmap2 (phpinspect-make-bmap)))
-;; (message "Incremental parse:")
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :incremental t
:bmap bmap)
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
+ (message "Incremental parse after buffer edit:")
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr
result) (cadr result))
+ (garbage-collect)
-;; (garbage-collect)
-;; (message "Incremental parse (no edits):")
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :incremental t
-;; :bmap bmap2
-;; :previous-bmap
bmap
-;; :edtrack
(phpinspect-make-edtrack))
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
+ (setq result (benchmark-run 1 (progn
+ ;; Removes closing curly brace of
__construct
+ (goto-char 9062)
+ (delete-char -1)
+ (phpinspect-buffer-parse buffer))))
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr
result) (cadr result))
-;; (garbage-collect)
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; (message "Incremental parse repeat (no edits):")
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :incremental t
-;; :bmap
(phpinspect-make-bmap)
-;; :previous-bmap
bmap2
-;; :edtrack
(phpinspect-make-edtrack))
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr
result) (cadr result))
+ (garbage-collect)
-;; (garbage-collect)
+ (message "Incremental parse after 2 more edits:")
-;; (setq buffer (phpinspect-claim-buffer (current-buffer)))
-;; (let ((edtrack (phpinspect-buffer-edit-tracker buffer))
-;; (bmap (phpinspect-make-bmap))
-;; (bmap-after (phpinspect-make-bmap)))
-;; ;; Fresh
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :incremental t
:bmap bmap)
-;; (phpinspect-parse-current-buffer))
+ (setq result (benchmark-run 1 (progn
+ (insert "{")
+ (phpinspect-buffer-parse buffer))))
-;; ;; (setq token-hits nil
-;; ;; token-misses nil)
-;; (message "Incremental parse after buffer edit:")
-;; ;; Removes closing curly brace of __construct
-;; (goto-char 9062)
-;; (delete-char -1)
-;; (garbage-collect)
-;; ;; (profiler-start 'cpu)
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; ;;(phpinspect-edtrack-register-edit edtrack 9061 9061 1)
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :bmap
bmap-after :incremental t :previous-bmap bmap :edtrack edtrack)
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
+ (with-temp-buffer
+ (insert-file-contents benchmark-file)
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr
result) (cadr result))
-;; (phpinspect-edtrack-clear edtrack)
-;; (insert "{")
+ (garbage-collect)
+ (message "Bare (no token reuse) parse (warmup):")
+ (setq result (benchmark-run 1 (phpinspect-parse-current-buffer)))
-;; ;;(message "Hits: %s, Misses: %s" token-hits token-misses)
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-;; ;;(phpinspect-edtrack-register-edit edtrack 9061 9062 0)
-;; ;; Mark region as edit without length deta
-;; ;;(phpinspect-edtrack-register-edit edtrack 19552 19562 10)
+ (garbage-collect)
+ (message "Bare (no token reuse) parse:")
+ (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
-;; (garbage-collect)
-
-;; ;; (setq token-hits nil
-;; ;; token-misses nil)
-
-
-;; (message "Incremental parse after 2 more edits:")
-;; (phpinspect-with-parse-context (phpinspect-make-pctx :bmap
(phpinspect-make-bmap)
-;; :incremental t
-;; :previous-bmap
bmap-after
-;; :edtrack
edtrack)
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
-
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr
result) (cadr result))
-;; ;;(message "Hits: %s, Misses: %s" token-hits token-misses)
-
-;; ;; (save-current-buffer
-;; ;; (profiler-stop)
-;; ;; (profiler-report)
-;; ;; (profiler-report-write-profile (expand-file-name "profile.txt"
here)))
-
-;; )))
-
-;; (with-temp-buffer
-;; (insert-file-contents benchmark-file)
-
-;; (garbage-collect)
-;; (message "Bare (no token reuse) parse (warmup):")
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer)))
-
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))
-
-;; (garbage-collect)
-;; (message "Bare (no token reuse) parse:")
-;; (setq result (benchmark-run 1 (phpinspect-parse-current-buffer))))
-
-;; (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result)))
+ (message "Elapsed time: %f (%f in %d GC's)" (car result) (caddr result)
(cadr result))))
diff --git a/benchmarks/splay-tree.el b/benchmarks/splay-tree.el
index 21d3e45cec..f2530883eb 100644
--- a/benchmarks/splay-tree.el
+++ b/benchmarks/splay-tree.el
@@ -117,7 +117,7 @@
(message "Elapsed time: %f (%f in %d GC's)"
(car result) (caddr result) (cadr result)))
-(let ((arr (make-bool-vector 1000000 nil))
+(let ((arr (make-bool-vector 1000001 nil))
result)
(message "bool vector 1000000 insertions:")
(garbage-collect)
