
Also, simplify some time-related Lisp timestamp code while we’re in the neighborhood. * lisp/battery.el (battery-linux-proc-acpi) (battery-linux-sysfs, battery-upower, battery-bsd-apm): * lisp/calendar/timeclock.el (timeclock-seconds-to-string) (timeclock-log, timeclock-last-period) (timeclock-entry-length, timeclock-entry-list-span) (timeclock-find-discrep, timeclock-generate-report): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/completion.el (cmpl-hours-since-origin): * lisp/ecomplete.el (ecomplete-decay-1): * lisp/emacs-lisp/ert.el (ert--results-update-stats-display) (ert--results-update-stats-display-maybe): * lisp/emacs-lisp/timer-list.el (list-timers): * lisp/emacs-lisp/timer.el (timer-until) (timer-event-handler): * lisp/erc/erc-backend.el (erc-server-send-ping) (erc-server-send-queue, erc-handle-parsed-server-response) (erc-handle-unknown-server-response): * lisp/erc/erc-track.el (erc-buffer-visible): * lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p) (erc-cmd-PING, erc-send-current-line): * lisp/eshell/em-pred.el (eshell-pred-file-time): * lisp/eshell/em-unix.el (eshell-show-elapsed-time): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp): * lisp/gnus/gnus-int.el (gnus-backend-trace): * lisp/gnus/gnus-sum.el (gnus-user-date): * lisp/gnus/mail-source.el (mail-source-delete-crash-box): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/ibuf-ext.el (ibuffer-mark-old-buffers): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/mouse.el (mouse--down-1-maybe-follows-link) (mouse--click-1-maybe-follows-link): * lisp/mpc.el (mpc--faster-toggle): * lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE) (rcirc-sentinel): * lisp/net/tramp-cache.el (tramp-get-file-property): * lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p) (tramp-maybe-open-connection): * lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): * lisp/org/org-clock.el (org-clock-resolve): (org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum): * lisp/org/org-timer.el (org-timer-start) (org-timer-pause-or-continue, org-timer-seconds): * lisp/org/org.el (org-evaluate-time-range): * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): * lisp/pixel-scroll.el (pixel-scroll-in-rush-p): * lisp/play/hanoi.el (hanoi-move-ring): * lisp/proced.el (proced-format-time): * lisp/progmodes/cpp.el (cpp-progress-message): * lisp/progmodes/flymake.el (flymake--handle-report): * lisp/progmodes/js.el (js--wait-for-matching-output): * lisp/subr.el (progress-reporter-do-update): * lisp/term/xterm.el (xterm--read-event-for-query): * lisp/time.el (display-time-update, emacs-uptime): * lisp/tooltip.el (tooltip-delay): * lisp/url/url-cookie.el (url-cookie-parse-file-netscape): * lisp/url/url-queue.el (url-queue-prune-old-entries): * lisp/url/url.el (url-retrieve-synchronously): * lisp/xt-mouse.el (xterm-mouse-event): Avoid double-rounding of time-related values. Simplify. * lisp/calendar/icalendar.el (icalendar--decode-isodatetime): When hoping for the best (unlikely), use a better decoded time. (icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time. * lisp/calendar/timeclock.el (timeclock-when-to-leave): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/desktop.el (desktop-create-buffer): * lisp/emacs-lisp/benchmark.el (benchmark-elapse): * lisp/gnus/gnus-art.el (article-lapsed-string): * lisp/gnus/gnus-group.el (gnus-group-timestamp-delta): * lisp/gnus/nnmail.el (nnmail-expired-article-p): * lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles): * lisp/nxml/rng-maint.el (rng-time-function): * lisp/org/org-clock.el (org-clock-get-clocked-time) (org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle): * lisp/org/org-habit.el (org-habit-insert-consistency-graphs): * lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info) (vhdl-fix-case-region-1): Use time-since instead of open-coding most of it. * lisp/erc/erc-dcc.el (erc-dcc-get-sentinel): * lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt): Now obsolete. All uses changed. (erc-time-diff): Accept all Lisp time values. All uses changed. * lisp/gnus/gnus-demon.el (gnus-demon-idle-since): * lisp/gnus/gnus-score.el (gnus-score-headers): * lisp/gnus/nneething.el (nneething-make-head): * lisp/gnus/nnheader.el (nnheader-message-maybe): * lisp/gnus/nnimap.el (nnimap-keepalive): * lisp/image.el (image-animate-timeout): * lisp/mail/feedmail.el (feedmail-rfc822-date): * lisp/net/imap.el (imap-wait-for-tag): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333): * lisp/obsolete/xesam.el (xesam-refresh-entry): * lisp/org/org-agenda.el (org-agenda-show-clocking-issues) (org-agenda-check-clock-gap, org-agenda-to-appt): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org-clock.el (org-clock-resolve-clock) (org-clocktable-steps): * lisp/org/org-colview.el (org-columns-edit-value) (org-columns, org-agenda-columns): * lisp/org/org-duration.el (org-duration-from-minutes): * lisp/org/org-element.el (org-element-cache-sync-duration) (org-element-cache-sync-break) (org-element--cache-interrupt-p, org-element--cache-sync): * lisp/org/org-habit.el (org-habit-get-faces) * lisp/org/org-indent.el (org-indent-add-properties): * lisp/org/org-table.el (org-table-sum): * lisp/org/org-timer.el (org-timer-show-remaining-time) (org-timer-set-timer): * lisp/org/org.el (org-babel-load-file, org-today) (org-auto-repeat-maybe, org-2ft, org-time-stamp) (org-read-date-analyze, org-time-stamp-to-now) (org-small-year-to-year, org-goto-calendar): * lisp/org/ox.el (org-export-insert-default-template): * lisp/ses.el (ses--time-check): * lisp/type-break.el (type-break-time-warning) (type-break-statistics, type-break-demo-boring): * lisp/url/url-cache.el (url-cache-expired) (url-cache-prune-cache): * lisp/vc/vc-git.el (vc-git-stash-snapshot): * lisp/erc/erc-match.el (erc-log-matches-come-back): Simplify.
112 lines
4.2 KiB
EmacsLisp
112 lines
4.2 KiB
EmacsLisp
;;; benchmark.el --- support for benchmarking code -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
|
|
|
|
;; Author: Dave Love <fx@gnu.org>
|
|
;; Keywords: lisp, extensions
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Utilities for timing the execution of forms, including the time
|
|
;; taken for GC. Note that prior to timing code you may want to
|
|
;; ensure things like: there has just been a GC, the relevant code is
|
|
;; already loaded (so that there's no overhead from autoloading etc.),
|
|
;; and the code is compiled if appropriate (but see
|
|
;; `benchmark-run-compiled').
|
|
|
|
;;; Code:
|
|
|
|
(defmacro benchmark-elapse (&rest forms)
|
|
"Return the time in seconds elapsed for execution of FORMS."
|
|
(declare (indent 0) (debug t))
|
|
(let ((t1 (make-symbol "t1")))
|
|
`(let (,t1)
|
|
(setq ,t1 (current-time))
|
|
,@forms
|
|
(float-time (time-since ,t1)))))
|
|
|
|
;;;###autoload
|
|
(defmacro benchmark-run (&optional repetitions &rest forms)
|
|
"Time execution of FORMS.
|
|
If REPETITIONS is supplied as a number, run forms that many times,
|
|
accounting for the overhead of the resulting loop. Otherwise run
|
|
FORMS once.
|
|
Return a list of the total elapsed time for execution, the number of
|
|
garbage collections that ran, and the time taken by garbage collection.
|
|
See also `benchmark-run-compiled'."
|
|
(declare (indent 1) (debug t))
|
|
(unless (or (natnump repetitions) (and repetitions (symbolp repetitions)))
|
|
(setq forms (cons repetitions forms)
|
|
repetitions 1))
|
|
(let ((i (make-symbol "i"))
|
|
(gcs (make-symbol "gcs"))
|
|
(gc (make-symbol "gc")))
|
|
`(let ((,gc gc-elapsed)
|
|
(,gcs gcs-done))
|
|
(list ,(if (or (symbolp repetitions) (> repetitions 1))
|
|
;; Take account of the loop overhead.
|
|
`(- (benchmark-elapse (dotimes (,i ,repetitions)
|
|
,@forms))
|
|
(benchmark-elapse (dotimes (,i ,repetitions))))
|
|
`(benchmark-elapse ,@forms))
|
|
(- gcs-done ,gcs)
|
|
(- gc-elapsed ,gc)))))
|
|
|
|
;;;###autoload
|
|
(defmacro benchmark-run-compiled (&optional repetitions &rest forms)
|
|
"Time execution of compiled version of FORMS.
|
|
This is like `benchmark-run', but what is timed is a funcall of the
|
|
byte code obtained by wrapping FORMS in a `lambda' and compiling the
|
|
result. The overhead of the `lambda's is accounted for."
|
|
(declare (indent 1) (debug t))
|
|
(unless (or (natnump repetitions) (and repetitions (symbolp repetitions)))
|
|
(setq forms (cons repetitions forms)
|
|
repetitions 1))
|
|
(let ((i (make-symbol "i"))
|
|
(gcs (make-symbol "gcs"))
|
|
(gc (make-symbol "gc"))
|
|
(code (byte-compile `(lambda () ,@forms)))
|
|
(lambda-code (byte-compile '(lambda ()))))
|
|
`(let ((,gc gc-elapsed)
|
|
(,gcs gcs-done))
|
|
(list ,(if (or (symbolp repetitions) (> repetitions 1))
|
|
;; Take account of the loop overhead.
|
|
`(- (benchmark-elapse (dotimes (,i ,repetitions)
|
|
(funcall ,code)))
|
|
(benchmark-elapse (dotimes (,i ,repetitions)
|
|
(funcall ,lambda-code))))
|
|
`(benchmark-elapse (funcall ,code)))
|
|
(- gcs-done ,gcs) (- gc-elapsed ,gc)))))
|
|
|
|
;;;###autoload
|
|
(defun benchmark (repetitions form)
|
|
"Print the time taken for REPETITIONS executions of FORM.
|
|
Interactively, REPETITIONS is taken from the prefix arg, and
|
|
the command prompts for the form to benchmark.
|
|
For non-interactive use see also `benchmark-run' and
|
|
`benchmark-run-compiled'."
|
|
(interactive "p\nxForm: ")
|
|
(let ((result (eval `(benchmark-run ,repetitions ,form) t)))
|
|
(if (zerop (nth 1 result))
|
|
(message "Elapsed time: %fs" (car result))
|
|
(message "Elapsed time: %fs (%fs in %d GCs)" (car result)
|
|
(nth 2 result) (nth 1 result)))))
|
|
|
|
(provide 'benchmark)
|
|
|
|
;;; benchmark.el ends here
|