Changeset 14911

Timestamp:

11/17/16 19:22:56 (7 years ago)

Author:

Mark Evenson

Message:

precompiler: possibly beta reduce form with function position lambda (Alan Ruttenberg)

Case 1: If the lambda has a single form in it, let someone define a
transform using:

define-function-position-lambda-transform (body-function-name (arglist form args) &body body)

body-function-name is the car of the single form in the lambda
arglist is the arglist of the lambda
form is the single form within the lambda
args are the arguments to which the lambda will be defined.

The function should check whether it can do a transform, and do it if
so, otherwise return nil signalling it couldn't

Case 2: If case 1 is not successful then if the arglist is a simple
one (no &key, &rest, &optional) then do a standard beta-reduction
binding the args to arglist using let (​https://wiki.haskell.org/Beta_reduction)

If not, return and do the usual thing.

An example is in contrib/jss/optimize-java-call.lisp

To see benefits, (compile-file contrib/jss/test-optimize-java-call.lisp)
and then load the compiled file. You should see something like the below
which reports the timings for the optimized and unoptimized version of
10000 calls of (#"compile" 'regex.pattern ".*")

--

With optimization: (INVOKE-RESTARGS-MACRO "compile" (QUOTE REGEX.PATTERN) (LIST ".*") NIL T)
Without optimization: ((LAMBDA (#:G85648 &REST #:G85649) (INVOKE-RESTARGS "compile" #:G85648 #:G85649 NIL)) (QUOTE REGEX.PATTERN) ".*")

JUST-LOOP
0.0 seconds real time
0 cons cells

OPTIMIZED-JSS
0.011 seconds real time
0 cons cells

UNOPTIMIZED-JSS
0.325 seconds real time
800156 cons cells

---
<> rdfs:seeAlso <​https://mailman.common-lisp.net/pipermail/armedbear-devel/2016-October/003726.html>
<> rdfs:seeAlso <​https://mailman.common-lisp.net/pipermail/armedbear-devel/2016-November/003733.html> .
<> :fixes <​https://mailman.common-lisp.net/pipermail/armedbear-devel/2016-November/003736.html> .
<> :closes <​https://github.com/armedbear/abcl/pull/11/files> .
<> :closes <​http://abcl.org/trac/ticket/420> .

Location:

trunk/abcl

Files:

• contrib/jss/invoke.lisp (modified) (2 diffs)
• contrib/jss/jss.asd (modified) (1 diff)
• contrib/jss/optimize-java-call.lisp (added)
• contrib/jss/test-optimize-java-call.lisp (added)
• src/org/armedbear/lisp/precompiler.lisp (modified) (2 diffs)

trunk/abcl/contrib/jss/invoke.lisp

@@ -126 +126 @@
 (defvar *muffle-warnings* t) 
 
+(defvar *muffle-warnings* t) 
+
 (defvar *imports-resolved-classes* (make-hash-table :test 'equalp))
 
@@ -289 +291 @@
       (loop while (hasmore entries)
          for name =  (getname (next entries))
-         with class-pattern = (#"compile" '|java.util.regex.Pattern| ".*\\.class$")
-         with name-pattern = (#"compile" '|java.util.regex.Pattern| ".*?([^.]*)$")
+         with class-pattern = (jstatic "compile" "java.util.regex.Pattern" ".*\\.class$")
+         with name-pattern = (jstatic "compile" "java.util.regex.Pattern" ".*?([^.]*)$")
          when (matches (matcher class-pattern name))
          collect

trunk/abcl/contrib/jss/jss.asd

@@ -2 +2 @@
 (asdf:defsystem :jss
   :author "Alan Ruttenberg, Mark Evenson"
-  :version "3.1.1" 
-  :description "<> asdf:defsystem <urn:abcl.org/release/1.5.0/contrib/jss#3.1.1>"
+  :version "3.2.0" 
+  :description "<> asdf:defsystem <urn:abcl.org/release/1.5.0/contrib/jss#3.2.0>"
   :components ((:module base 
                         :pathname "" :serial t 
                         :components ((:file "packages")
                                      (:file "invoke")
+             (:file "optimize-java-call")
                                      (:file "classpath")
                                      (:file "compat")))))

trunk/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -383 +383 @@
     (when (and (consp op) (eq (%car op) 'LAMBDA))
       (return-from precompile-function-call
-                   (cons (precompile-lambda op)
-                         (mapcar #'precompile1 (cdr form)))))
+  (or (precompile-function-position-lambda op (cdr form))
+      (cons (precompile-lambda op)
+      (mapcar #'precompile1 (cdr form))))))
     (when (or (not *in-jvm-compile*) (notinline-p op))
       (return-from precompile-function-call (precompile-cons form)))
@@ -399 +400 @@
           (return-from precompile-function-call (precompile1 (expand-inline form expansion))))))
     (cons op (mapcar #'precompile1 (cdr form)))))
+
+(defun precompile-function-position-lambda (lambda args)
+  (let* ((arglist (second lambda))
+   (body (cddr lambda))
+   (simple-arglist? (not (or (memq '&KEY arglist) (memq '&OPTIONAL arglist) (memq '&REST arglist)))))
+    (or
+     ;;give a chance for someone to transform single-form function bodies
+     (and (= (length body) 1) (consp (car body)) (get (caar body) 'sys::function-position-lambda-transform)
+    (funcall (get (caar body) 'sys::function-position-lambda-transform) (caar body) (car body) (mapcar #'precompile1 args)))
+     (and simple-arglist?
+    (let ((arglist-length (if (memq '&aux arglist) (position '&aux arglist) (length arglist))))
+      (if (= (length args) arglist-length)
+    ;; simplest case - we have a simple arglist with as many
+    ;; arguments as call args. Transform to let.
+    (return-from precompile-function-position-lambda
+      `(let* ,(append
+          (loop for arg-name in arglist
+          for arg in (mapcar #'precompile1 args)
+          until (eq arg-name '&aux)
+          collect (list arg-name arg))
+          (subseq arglist (1+ arglist-length)))
+          ,@body))
+    (error "Argument mismatch for lambda in function position: ~a applied to ~a" `(lambda ,arglist body) args)))))))
+
+(defmacro define-function-position-lambda-transform (body-function-name (arglist form args) &body body)
+  `(put ',body-function-name 'sys::function-position-lambda-transform 
+  #'(lambda(,arglist ,form ,args)
+      ,@body)))
 
 (defun precompile-locally (form)