[prev in list] [next in list] [prev in thread] [next in thread]
List: sbcl-commits
Subject: [Sbcl-commits] master: Replace (VOP-INFO-NAME (VOP-INFO x)) with VOP-NAME
From: Douglas Katzman via Sbcl-commits <sbcl-commits () lists ! sourceforge ! net>
Date: 2020-06-19 22:16:50
Message-ID: 1592605010.880232.14531 () sfp-scm-5 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]
The branch "master" has been updated in SBCL:
via b723ed952a1ac39621bf022bb1b519e615797c25 (commit)
from f1a956a6a771f7fc95cd1b9b42448af553306760 (commit)
- Log -----------------------------------------------------------------
commit b723ed952a1ac39621bf022bb1b519e615797c25
Author: Douglas Katzman <dougk@google.com>
Date: Fri Jun 19 17:55:28 2020 -0400
Replace (VOP-INFO-NAME (VOP-INFO x)) with VOP-NAME
---
package-data-list.lisp-expr | 2 +-
src/compiler/assem.lisp | 2 +-
src/compiler/codegen.lisp | 2 +-
src/compiler/copyprop.lisp | 12 ++++++------
src/compiler/debug.lisp | 2 +-
src/compiler/pack.lisp | 15 ++++++---------
src/compiler/represent.lisp | 3 +--
src/compiler/vop.lisp | 2 +-
8 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 63fd1a731..852fdb6bc 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -2654,7 +2654,7 @@ ISBN 0-262-61074-4, with exceptions as noted in the User Manual."
"TNS-CONFLICT" "TNS-CONFLICT-GLOBAL-GLOBAL"
"TNS-CONFLICT-LOCAL-GLOBAL"
"VOP" "VOP-ARGS" "VOP-INFO" "VOP-INFO-ARG-LOAD-SCS"
- "VOP-INFO-MOVE-ARGS" "VOP-INFO-NAME"
+ "VOP-INFO-MOVE-ARGS" "VOP-NAME"
"VOP-INFO-RESULT-LOAD-SCS" "VOP-INFO-SAVE-P"
"VOP-NODE"
"VOP-PARSE-OR-LOSE" "VOP-PARSE-TEMPS" "VOP-PREV"
diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp
index c139da432..b5d41d6c1 100644
--- a/src/compiler/assem.lisp
+++ b/src/compiler/assem.lisp
@@ -1359,7 +1359,7 @@
(incf n)
(binding* ((vop (stmt-vop statement) :exit-if-null))
(unless (eq vop last-vop)
- (format stream "## ~A~%" (sb-c::vop-info-name (sb-c::vop-info vop))))
+ (format stream "## ~A~%" (sb-c::vop-name vop)))
(setq last-vop vop))
(let ((op (stmt-mnemonic statement))
(eol-comment ""))
diff --git a/src/compiler/codegen.lisp b/src/compiler/codegen.lisp
index 89f3f5f0f..01a5d70a3 100644
--- a/src/compiler/codegen.lisp
+++ b/src/compiler/codegen.lisp
@@ -310,7 +310,7 @@
((null vop))
(let ((gen (vop-info-generator-function (vop-info vop))))
(awhen *static-vop-usage-counts*
- (let ((name (vop-info-name (vop-info vop))))
+ (let ((name (vop-name vop)))
(incf (gethash name it 0))))
(assemble (:code vop)
(cond ((not gen)
diff --git a/src/compiler/copyprop.lisp b/src/compiler/copyprop.lisp
index a824c179a..c9ae13bb9 100644
--- a/src/compiler/copyprop.lisp
+++ b/src/compiler/copyprop.lisp
@@ -74,7 +74,7 @@
(not (tn-sc tn)) ; Not wired or restricted.
(and writes (null (tn-ref-next writes)))
(let ((vop (tn-ref-vop writes)))
- (and (eq (vop-info-name (vop-info vop)) 'move)
+ (and (eq (vop-name vop) 'move)
(let ((arg-tn (tn-ref-tn (vop-args vop))))
(and (or (not (tn-sc arg-tn))
(eq (tn-kind arg-tn) :constant))
@@ -86,7 +86,7 @@
;; performed based on the SC.
(and reads
(null (tn-ref-next reads))
- (eq (vop-info-name (vop-info (tn-ref-vop reads))) 'move)))
+ (eq (vop-name (tn-ref-vop reads)) 'move)))
(subsetp (primitive-type-scs
(tn-primitive-type tn))
(primitive-type-scs
@@ -113,7 +113,7 @@
;; MOVEs can be chained and read in other blocks. This is done
;; not for correctness but for memory usage reduction, so there
;; is no need to follow all the chains, just be conservative.
- (when (or (eq (vop-info-name (vop-info vop)) 'move)
+ (when (or (eq (vop-name vop) 'move)
(neq (ir2-block-block (vop-block vop)) block))
(return)))))
@@ -128,7 +128,7 @@
(out (make-sset)))
(do ((vop (ir2-block-start-vop (block-info block)) (vop-next vop)))
((null vop))
- (unless (and (eq (vop-info-name (vop-info vop)) 'move)
+ (unless (and (eq (vop-name vop) 'move)
(let ((y (tn-ref-tn (vop-results vop))))
(when (tn-is-copy-of y)
(unless (reads-within-block-p y block)
@@ -141,7 +141,7 @@
(do ((read (tn-reads res-tn) (tn-ref-next read)))
((null read))
(let ((read-vop (tn-ref-vop read)))
- (when (eq (vop-info-name (vop-info read-vop)) 'move)
+ (when (eq (vop-name read-vop) 'move)
(let ((y (tn-ref-tn (vop-results read-vop))))
(when (tn-is-copy-of y)
(sset-delete y out)
@@ -232,7 +232,7 @@
(block-kill block) nil)
(do ((vop (ir2-block-start-vop (block-info block)) (vop-next vop)))
((null vop))
- (let ((this-copy (and (eq (vop-info-name (vop-info vop)) 'move)
+ (let ((this-copy (and (eq (vop-name vop) 'move)
(let ((y (tn-ref-tn (vop-results vop))))
(when (tn-is-copy-of y) y)))))
;; Substitute copied TN for copy when we find a reference to a copy.
diff --git a/src/compiler/debug.lisp b/src/compiler/debug.lisp
index c3a1554ab..45be31118 100644
--- a/src/compiler/debug.lisp
+++ b/src/compiler/debug.lisp
@@ -1092,7 +1092,7 @@
;;; necessary.
(defun print-vop (vop)
(pprint-logical-block (*standard-output* nil)
- (princ (vop-info-name (vop-info vop)))
+ (princ (vop-name vop))
(princ #\space)
(pprint-indent :current 0)
(print-operands (vop-args vop))
diff --git a/src/compiler/pack.lisp b/src/compiler/pack.lisp
index e4401dee5..a26e0fd0c 100644
--- a/src/compiler/pack.lisp
+++ b/src/compiler/pack.lisp
@@ -340,9 +340,7 @@
((setq temp (position-in #'tn-ref-across tn (vop-temps vop)
:key #'tn-ref-tn))
`("~2D: ~A (temporary ~A)" ,loc ,name
- ,(operand-parse-name (elt (vop-parse-temps
- (vop-parse-or-lose
- (vop-info-name (vop-info vop))))
+ ,(operand-parse-name (elt (vop-parse-temps (vop-parse-or-lose (vop-name vop)))
temp))))
((eq (tn-kind tn) :component)
`("~2D: ~A (component live)" ,loc ,name))
@@ -391,7 +389,7 @@
time. Recompile.~%Compilation order may be incorrect.~]"
(mapcar #'sc-name scs)
n arg-p
- (vop-info-name (vop-info (tn-ref-vop op)))
+ (vop-name (tn-ref-vop op))
(unused) (used)
incon))))
@@ -471,7 +469,7 @@
(aver (eq (ir2-block-block block) (ir2-block-block (vop-block vop))))
(do ((current last (vop-prev current)))
((null current))
- (when (eq (vop-info-name (vop-info current)) name)
+ (when (eq (vop-name current) name)
(return-from reverse-find-vop current)))))
;;; For TNs that have other than one writer, we save the TN before
@@ -522,8 +520,7 @@
(return nil))))
(tn-ref-vop res)))
- (unless (eq (vop-info-name (vop-info (tn-ref-vop write)))
- 'move-operand)
+ (unless (eq (vop-name (tn-ref-vop write)) 'move-operand)
(when res (return nil))
(setq res write))))
@@ -662,7 +659,7 @@
(do ((vop (ir2-block-last-vop block) (vop-prev vop)))
((null vop))
(let ((info (vop-info vop)))
- (case (vop-info-name info)
+ (case (vop-name vop)
(allocate-frame
(aver skipping)
(setq skipping nil))
@@ -1093,7 +1090,7 @@
(do ((ref refs (tn-ref-next ref)))
((null ref))
(let ((vop (tn-ref-vop ref)))
- (if (eq (vop-info-name (vop-info vop)) 'move-operand)
+ (if (eq (vop-name vop) 'move-operand)
(delete-vop vop)
(pushnew (vop-block vop) *repack-blocks*))))))
(zot (tn-reads tn))
diff --git a/src/compiler/represent.lisp b/src/compiler/represent.lisp
index 5b6194e22..0b0a96dc4 100644
--- a/src/compiler/represent.lisp
+++ b/src/compiler/represent.lisp
@@ -577,8 +577,7 @@
pass-tn vop))
(after
(cond ((eq how :local-call)
- (aver (eq (vop-info-name (vop-info prev))
- 'allocate-frame))
+ (aver (eq (vop-name prev) 'allocate-frame))
prev)
(prev (vop-next prev))
(t
diff --git a/src/compiler/vop.lisp b/src/compiler/vop.lisp
index 5eb1f59bd..0f7d57dc8 100644
--- a/src/compiler/vop.lisp
+++ b/src/compiler/vop.lisp
@@ -744,7 +744,7 @@
(defprinter (tn-ref)
tn
write-p
- (vop :test vop :prin1 (vop-info-name (vop-info vop))))
+ (vop :test vop :prin1 (vop-name vop)))
(declaim (inline vop-name))
(defun vop-name (vop)
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL
_______________________________________________
Sbcl-commits mailing list
Sbcl-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic