From 2abb38463a3a6e0cc9db27f90d09172855ba97ab Mon Sep 17 00:00:00 2001 From: Alex Vondrak Date: Sun, 3 Jul 2011 13:14:57 -0700 Subject: [PATCH] compiler.cfg.gvn: enable rewrites & ##phi processing --- extra/compiler/cfg/gvn/gvn.factor | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/extra/compiler/cfg/gvn/gvn.factor b/extra/compiler/cfg/gvn/gvn.factor index 0dc4870895..c51b7defb0 100644 --- a/extra/compiler/cfg/gvn/gvn.factor +++ b/extra/compiler/cfg/gvn/gvn.factor @@ -51,11 +51,11 @@ M: ##copy value-number [ src>> vreg>vn ] [ dst>> ] bi set-vn ; dup >expr dup exprs>vns get at [ redundant-instruction ] [ useful-instruction ] ?if ; -! M: ##phi value-number -! dup inputs>> values [ vreg>vn ] map sift -! dup all-equal? [ -! [ drop ] [ first redundant-instruction ] if-empty -! ] [ drop check-redundancy ] if ; +M: ##phi value-number + dup inputs>> values [ vreg>vn ] map sift + dup all-equal? [ + [ drop ] [ first redundant-instruction ] if-empty + ] [ drop check-redundancy ] if ; M: insn value-number dup defs-vregs length 1 = [ check-redundancy ] [ drop ] if ; @@ -94,18 +94,17 @@ M: ##copy gcse ; dup >expr exprs>vns get at [ ?eliminate ] [ make-available ] if* ; -! M: ##phi gcse -! dup inputs>> values [ vreg>vn ] map sift -! dup all-equal? [ -! [ first ?eliminate ] unless-empty -! ] [ drop eliminate-redundancy ] if ; +M: ##phi gcse + dup inputs>> values [ vreg>vn ] map sift + dup all-equal? [ + [ first ?eliminate ] unless-empty + ] [ drop eliminate-redundancy ] if ; M: insn gcse dup defs-vregs length 1 = [ eliminate-redundancy ] when ; : gcse-step ( insns -- insns' ) - ! [ simplify gcse ] map flatten ; - [ gcse ] map flatten ; + [ simplify gcse ] map flatten ; : eliminate-common-subexpressions ( cfg -- ) final-iteration? on