From 8dacd8270770b18b505fba9e4c73fe627b7b1d5c Mon Sep 17 00:00:00 2001 From: Alaric Snell-Pym Date: Sun, 2 Aug 2009 18:06:00 +0100 Subject: [PATCH 1/9] FNV1 and FNV1a hashes implemented for 32, 64, 128, 256, 512, and 1024 bit widths. --- basis/checksums/fnv1/authors.txt | 1 + basis/checksums/fnv1/fnv1-docs.factor | 67 ++++++++++++++++ basis/checksums/fnv1/fnv1-tests.factor | 41 ++++++++++ basis/checksums/fnv1/fnv1.factor | 106 +++++++++++++++++++++++++ basis/checksums/fnv1/summary.txt | 1 + 5 files changed, 216 insertions(+) create mode 100644 basis/checksums/fnv1/authors.txt create mode 100644 basis/checksums/fnv1/fnv1-docs.factor create mode 100644 basis/checksums/fnv1/fnv1-tests.factor create mode 100644 basis/checksums/fnv1/fnv1.factor create mode 100644 basis/checksums/fnv1/summary.txt diff --git a/basis/checksums/fnv1/authors.txt b/basis/checksums/fnv1/authors.txt new file mode 100644 index 0000000000..c64bb4e735 --- /dev/null +++ b/basis/checksums/fnv1/authors.txt @@ -0,0 +1 @@ +Alaric Snell-Pym \ No newline at end of file diff --git a/basis/checksums/fnv1/fnv1-docs.factor b/basis/checksums/fnv1/fnv1-docs.factor new file mode 100644 index 0000000000..4fbecd2b75 --- /dev/null +++ b/basis/checksums/fnv1/fnv1-docs.factor @@ -0,0 +1,67 @@ +USING: help.markup help.syntax ; +IN: checksums.fnv1 + +HELP: fnv1-32 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 32-bit." } ; + +HELP: fnv1a-32 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 32-bit." } ; + + +HELP: fnv1-64 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 64-bit." } ; + +HELP: fnv1a-64 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 64-bit." } ; + + +HELP: fnv1-128 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 128-bit." } ; + +HELP: fnv1a-128 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 128-bit." } ; + + +HELP: fnv1-256 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 256-bit." } ; + +HELP: fnv1a-256 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 256-bit." } ; + + +HELP: fnv1-512 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 512-bit." } ; + +HELP: fnv1a-512 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 512-bit." } ; + + +HELP: fnv1-1024 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1, 1024-bit." } ; + +HELP: fnv1a-1024 +{ $class-description "Fowler-Noll-Vo checksum algorithm, v1a, 1024-bit." } ; + +ARTICLE: "checksums.fnv1" "Fowler-Noll-Vo checksum" + "The Fowler-Noll-Vo checksum algorithm is another simple and fast checksum. It comes in 32, 64, 128, 256, 512 and 1024-bit versions, each in 1 and 1a variants. The 1a variants tend to produce a slightly better result. See http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash for more details." + + { $subsection fnv1-32 } + { $subsection fnv1a-32 } + + { $subsection fnv1-64 } + { $subsection fnv1a-64 } + + { $subsection fnv1-128 } + { $subsection fnv1a-128 } + + { $subsection fnv1-256 } + { $subsection fnv1a-256 } + + { $subsection fnv1-512 } + { $subsection fnv1a-512 } + + { $subsection fnv1-1024 } + { $subsection fnv1a-1024 } + ; + +ABOUT: "checksums.fnv1" diff --git a/basis/checksums/fnv1/fnv1-tests.factor b/basis/checksums/fnv1/fnv1-tests.factor new file mode 100644 index 0000000000..de665a1547 --- /dev/null +++ b/basis/checksums/fnv1/fnv1-tests.factor @@ -0,0 +1,41 @@ +USING: checksums.fnv1 checksums strings tools.test ; +IN: checksums.fnv1.tests + +! A few test vectors taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c + +[ HEX: 811c9dc5 ] [ "" fnv1-32 checksum-bytes ] unit-test +[ HEX: 811c9dc5 ] [ "" fnv1a-32 checksum-bytes ] unit-test +[ HEX: cbf29ce484222325 ] [ "" fnv1-64 checksum-bytes ] unit-test +[ HEX: cbf29ce484222325 ] [ "" fnv1a-64 checksum-bytes ] unit-test + +[ HEX: 050c5d7e ] [ "a" fnv1-32 checksum-bytes ] unit-test +[ HEX: e40c292c ] [ "a" fnv1a-32 checksum-bytes ] unit-test +[ HEX: af63bd4c8601b7be ] [ "a" fnv1-64 checksum-bytes ] unit-test +[ HEX: af63dc4c8601ec8c ] [ "a" fnv1a-64 checksum-bytes ] unit-test + +[ HEX: 050c5d7d ] [ "b" fnv1-32 checksum-bytes ] unit-test +[ HEX: e70c2de5 ] [ "b" fnv1a-32 checksum-bytes ] unit-test +[ HEX: af63bd4c8601b7bd ] [ "b" fnv1-64 checksum-bytes ] unit-test +[ HEX: af63df4c8601f1a5 ] [ "b" fnv1a-64 checksum-bytes ] unit-test + +[ HEX: 31f0b262 ] [ "foobar" fnv1-32 checksum-bytes ] unit-test +[ HEX: bf9cf968 ] [ "foobar" fnv1a-32 checksum-bytes ] unit-test +[ HEX: 340d8765a4dda9c2 ] [ "foobar" fnv1-64 checksum-bytes ] unit-test +[ HEX: 85944171f73967e8 ] [ "foobar" fnv1a-64 checksum-bytes ] unit-test + +! I couldn't find any test vectors for 128, 256, 512, or 1024 versions of FNV1 hashes. +! So, just to check that your maths works the same as my maths, here's a few samples computed on my laptop. +! So they may be right or wrong, but either way, them failing is cause for concern somewhere... + +[ 3897470310 ] [ "Hello, world!" fnv1-32 checksum-bytes ] unit-test +[ 3985698964 ] [ "Hello, world!" fnv1a-32 checksum-bytes ] unit-test +[ 7285062107457560934 ] [ "Hello, world!" fnv1-64 checksum-bytes ] unit-test +[ 4094109891673226228 ] [ "Hello, world!" fnv1a-64 checksum-bytes ] unit-test +[ 281580511747867177735318995358496831158 ] [ "Hello, world!" fnv1-128 checksum-bytes ] unit-test +[ 303126633380056630368940439484674414572 ] [ "Hello, world!" fnv1a-128 checksum-bytes ] unit-test +[ 104295939182568077644846978685759236849634734810631820736486253421270219742822 ] [ "Hello, world!" fnv1-256 checksum-bytes ] unit-test +[ 9495445728692795332446740615588417456874414534608540692485745371050033741380 ] [ "Hello, world!" fnv1a-256 checksum-bytes ] unit-test +[ 3577308325596719252093726711895047340166329831006673109476042102918876665433235513101496175651226507162015890004121912850661561110326527625579463564626958 ] [ "Hello, world!" fnv1-512 checksum-bytes ] unit-test +[ 3577308325596719162840652138474318309664256091923081930027929425092517582111473988451078821416039944023089883981242376700859598441397004715365740906054208 ] [ "Hello, world!" fnv1a-512 checksum-bytes ] unit-test +[ 52692754922840008511959888105094366091401994235075816792707658326855733053286986999719949898492311786648795846192078757217437117165934438286601534984230194601365788544275827382423366672856972872132009691615382991251544423521887009322211754219117294019951276080952271766377222613325328591830596794468813260226 ] [ "Hello, world!" fnv1-1024 checksum-bytes ] unit-test +[ 52692754922840008511959888105094366091401994235075816792707658326855804920671100511873485674717442819607149127986090276849364757610838433887624184145636764448608707614141109841761957788887305179569455221243999538336208648824673027111352338809582124430199044921035232455717748500524777795242051756321605065326 ] [ "Hello, world!" fnv1a-1024 checksum-bytes ] unit-test diff --git a/basis/checksums/fnv1/fnv1.factor b/basis/checksums/fnv1/fnv1.factor new file mode 100644 index 0000000000..f221cefef2 --- /dev/null +++ b/basis/checksums/fnv1/fnv1.factor @@ -0,0 +1,106 @@ +! Copyright (C) 2009 Alaric Snell-Pym +! See http://factorcode.org/license.txt for BSD license. + +USING: checksums classes.singleton kernel math math.ranges +math.vectors sequences ; + +IN: checksums.fnv1 + +SINGLETON: fnv1-32 +SINGLETON: fnv1a-32 +SINGLETON: fnv1-64 +SINGLETON: fnv1a-64 +SINGLETON: fnv1-128 +SINGLETON: fnv1a-128 +SINGLETON: fnv1-256 +SINGLETON: fnv1a-256 +SINGLETON: fnv1-512 +SINGLETON: fnv1a-512 +SINGLETON: fnv1-1024 +SINGLETON: fnv1a-1024 + +CONSTANT: fnv1-32-prime 16777619 +CONSTANT: fnv1-64-prime 1099511628211 +CONSTANT: fnv1-128-prime 309485009821345068724781371 +CONSTANT: fnv1-256-prime 374144419156711147060143317175368453031918731002211 +CONSTANT: fnv1-512-prime 35835915874844867368919076489095108449946327955754392558399825615420669938882575126094039892345713852759 +CONSTANT: fnv1-1024-prime 5016456510113118655434598811035278955030765345404790744303017523831112055108147451509157692220295382716162651878526895249385292291816524375083746691371804094271873160484737966720260389217684476157468082573 + +CONSTANT: fnv1-32-mod HEX: ffffffff +CONSTANT: fnv1-64-mod HEX: ffffffffffffffff +CONSTANT: fnv1-128-mod HEX: ffffffffffffffffffffffffffffffff +CONSTANT: fnv1-256-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +CONSTANT: fnv1-512-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +CONSTANT: fnv1-1024-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + +CONSTANT: fnv1-32-basis HEX: 811c9dc5 +CONSTANT: fnv1-64-basis HEX: cbf29ce484222325 +CONSTANT: fnv1-128-basis HEX: 6c62272e07bb014262b821756295c58d +CONSTANT: fnv1-256-basis HEX: dd268dbcaac550362d98c384c4e576ccc8b1536847b6bbb31023b4c8caee0535 +CONSTANT: fnv1-512-basis HEX: b86db0b1171f4416dca1e50f309990acac87d059c90000000000000000000d21e948f68a34c192f62ea79bc942dbe7ce182036415f56e34bac982aac4afe9fd9 +CONSTANT: fnv1-1024-basis HEX: 5f7a76758ecc4d32e56d5a591028b74b29fc4223fdada16c3bf34eda3674da9a21d9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6d7eb6e73802734510a555f256cc005ae556bde8cc9c6a93b21aff4b16c71ee90b3 + +M: fnv1-32 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-32-basis swap + [ swap fnv1-32-prime * bitxor fnv1-32-mod bitand ] each ; + +M: fnv1a-32 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-32-basis swap + [ bitxor fnv1-32-prime * fnv1-32-mod bitand ] each ; + + +M: fnv1-64 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-64-basis swap + [ swap fnv1-64-prime * bitxor fnv1-64-mod bitand ] each ; + +M: fnv1a-64 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-64-basis swap + [ bitxor fnv1-64-prime * fnv1-64-mod bitand ] each ; + + +M: fnv1-128 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-128-basis swap + [ swap fnv1-128-prime * bitxor fnv1-128-mod bitand ] each ; + +M: fnv1a-128 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-128-basis swap + [ bitxor fnv1-128-prime * fnv1-128-mod bitand ] each ; + + +M: fnv1-256 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-256-basis swap + [ swap fnv1-256-prime * bitxor fnv1-256-mod bitand ] each ; + +M: fnv1a-256 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-256-basis swap + [ bitxor fnv1-256-prime * fnv1-256-mod bitand ] each ; + + +M: fnv1-512 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-512-basis swap + [ swap fnv1-512-prime * bitxor fnv1-512-mod bitand ] each ; + +M: fnv1a-512 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-512-basis swap + [ bitxor fnv1-512-prime * fnv1-512-mod bitand ] each ; + + +M: fnv1-1024 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-1024-basis swap + [ swap fnv1-1024-prime * bitxor fnv1-1024-mod bitand ] each ; + +M: fnv1a-1024 checksum-bytes ( bytes checksum -- value ) + drop + fnv1-1024-basis swap + [ bitxor fnv1-1024-prime * fnv1-1024-mod bitand ] each ; diff --git a/basis/checksums/fnv1/summary.txt b/basis/checksums/fnv1/summary.txt new file mode 100644 index 0000000000..2c74cda8cd --- /dev/null +++ b/basis/checksums/fnv1/summary.txt @@ -0,0 +1 @@ +Fowler-Noll-Vo checksum algorithm From d349cc565aa18f1e257cbd6424bcd73eedcbbd5b Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 2 Aug 2009 18:04:07 -0400 Subject: [PATCH 2/9] def-use puts phi uses in respective predecessors --- basis/compiler/cfg/def-use/authors.txt | 2 + .../compiler/cfg/def-use/def-use-tests.factor | 37 +++++++++++++++++++ basis/compiler/cfg/def-use/def-use.factor | 30 +++++++-------- 3 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 basis/compiler/cfg/def-use/authors.txt create mode 100644 basis/compiler/cfg/def-use/def-use-tests.factor diff --git a/basis/compiler/cfg/def-use/authors.txt b/basis/compiler/cfg/def-use/authors.txt new file mode 100644 index 0000000000..a44f8d7f8d --- /dev/null +++ b/basis/compiler/cfg/def-use/authors.txt @@ -0,0 +1,2 @@ +Slava Pestov +Daniel Ehrenberg diff --git a/basis/compiler/cfg/def-use/def-use-tests.factor b/basis/compiler/cfg/def-use/def-use-tests.factor new file mode 100644 index 0000000000..1153d9ea81 --- /dev/null +++ b/basis/compiler/cfg/def-use/def-use-tests.factor @@ -0,0 +1,37 @@ +! Copyright (C) 2009 Daniel Ehrenberg. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel tools.test accessors vectors sequences namespaces +arrays +cpu.architecture +compiler.cfg.def-use +compiler.cfg +compiler.cfg.debugger +compiler.cfg.instructions +compiler.cfg.registers ; + +V{ + T{ ##peek f V int-regs 0 D 0 } + T{ ##peek f V int-regs 1 D 0 } + T{ ##peek f V int-regs 2 D 0 } +} 1 test-bb +V{ + T{ ##replace f V int-regs 2 D 0 } +} 2 test-bb +1 get 2 get 1vector >>successors drop +V{ + T{ ##replace f V int-regs 0 D 0 } +} 3 test-bb +2 get 3 get 1vector >>successors drop +V{ } 4 test-bb +V{ } 5 test-bb +3 get 4 get 5 get V{ } 2sequence >>successors drop +V int-regs 2 + 2 get V int-regs 0 2array + 3 get V int-regs 1 2array +2array \ ##phi new-insn 1vector +6 test-bb +4 get 6 get 1vector >>successors drop +5 get 6 get 1vector >>successors drop + +cfg new 1 get >>entry 0 set +[ ] [ 0 get compute-def-use ] unit-test diff --git a/basis/compiler/cfg/def-use/def-use.factor b/basis/compiler/cfg/def-use/def-use.factor index 1c9ac90f78..8e8fbf3a2d 100644 --- a/basis/compiler/cfg/def-use/def-use.factor +++ b/basis/compiler/cfg/def-use/def-use.factor @@ -1,7 +1,7 @@ -! Copyright (C) 2008, 2009 Slava Pestov. +! Copyright (C) 2008, 2009 Slava Pestov, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays kernel assocs sequences namespaces fry -sets compiler.cfg.rpo compiler.cfg.instructions ; +sets compiler.cfg.rpo compiler.cfg.instructions locals ; IN: compiler.cfg.def-use GENERIC: defs-vreg ( insn -- vreg/f ) @@ -80,18 +80,18 @@ SYMBOLS: defs insns uses ; ] each-basic-block ] keep insns set ; -: compute-uses ( cfg -- ) - H{ } clone [ - '[ - dup instructions>> [ - uses-vregs [ - _ conjoin-at - ] with each - ] with each - ] each-basic-block - ] keep - [ keys ] assoc-map - uses set ; +:: compute-uses ( cfg -- ) + ! Here, a phi node uses its argument in the block that it comes from. + H{ } clone :> use + cfg [| block | + block instructions>> [ + dup ##phi? + [ inputs>> [ use conjoin-at ] assoc-each ] + [ uses-vregs [ block swap use conjoin-at ] each ] + if + ] each + ] each-basic-block + use [ keys ] assoc-map uses set ; : compute-def-use ( cfg -- ) - [ compute-defs ] [ compute-uses ] [ compute-insns ] tri ; \ No newline at end of file + [ compute-defs ] [ compute-uses ] [ compute-insns ] tri ; From cf7ab59fb7f4750addcf4b65f6b7e851920e34a8 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 2 Aug 2009 18:04:45 -0400 Subject: [PATCH 3/9] SSA destruction uses new SSA liveness checking --- basis/compiler/cfg/ssa/destruction/destruction.factor | 6 +++--- .../compiler/cfg/ssa/interference/interference-tests.factor | 6 +++--- .../cfg/ssa/interference/live-ranges/live-ranges.factor | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor index b251578bc8..535dc6db86 100644 --- a/basis/compiler/cfg/ssa/destruction/destruction.factor +++ b/basis/compiler/cfg/ssa/destruction/destruction.factor @@ -8,7 +8,7 @@ compiler.cfg.def-use compiler.cfg.renaming compiler.cfg.dominance compiler.cfg.instructions -compiler.cfg.liveness.ssa +compiler.cfg.ssa.liveness compiler.cfg.ssa.cssa compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges @@ -97,11 +97,11 @@ M: insn prepare-insn drop ; : destruct-ssa ( cfg -- cfg' ) dup cfg-has-phis? [ dup construct-cssa - compute-ssa-live-sets + dup precompute-liveness dup compute-defs dup compute-dominance dup compute-live-ranges dup prepare-coalescing process-copies dup perform-renaming - ] when ; \ No newline at end of file + ] when ; diff --git a/basis/compiler/cfg/ssa/interference/interference-tests.factor b/basis/compiler/cfg/ssa/interference/interference-tests.factor index f8876755d9..9075d3b010 100644 --- a/basis/compiler/cfg/ssa/interference/interference-tests.factor +++ b/basis/compiler/cfg/ssa/interference/interference-tests.factor @@ -1,6 +1,6 @@ USING: accessors compiler.cfg compiler.cfg.debugger compiler.cfg.def-use compiler.cfg.dominance -compiler.cfg.instructions compiler.cfg.liveness.ssa +compiler.cfg.instructions compiler.cfg.ssa.liveness compiler.cfg.registers compiler.cfg.predecessors compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges cpu.architecture @@ -9,8 +9,8 @@ IN: compiler.cfg.ssa.interference.tests : test-interference ( -- ) cfg new 0 get >>entry - compute-ssa-live-sets compute-predecessors + dup precompute-liveness dup compute-defs dup compute-dominance compute-live-ranges ; @@ -49,4 +49,4 @@ V{ [ t ] [ V int-regs 3 V int-regs 5 vregs-interfere? ] unit-test [ t ] [ V int-regs 5 V int-regs 3 vregs-interfere? ] unit-test [ f ] [ V int-regs 3 V int-regs 6 vregs-interfere? ] unit-test -[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test \ No newline at end of file +[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test diff --git a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor index 151af8bea4..c29b69cf36 100644 --- a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor +++ b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs fry kernel namespaces sequences math arrays compiler.cfg.def-use compiler.cfg.instructions -compiler.cfg.liveness.ssa compiler.cfg.rpo ; +compiler.cfg.ssa.liveness compiler.cfg.rpo ; IN: compiler.cfg.ssa.interference.live-ranges ! Live ranges for interference testing From 3b78d03e2a28f518845ab836f449e1ea04db13da Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 2 Aug 2009 18:05:51 -0400 Subject: [PATCH 4/9] minor SSA liveness code reorganization --- .../compiler/cfg/ssa/liveness/liveness.factor | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/basis/compiler/cfg/ssa/liveness/liveness.factor b/basis/compiler/cfg/ssa/liveness/liveness.factor index 8788bc72f5..f2a195eb24 100644 --- a/basis/compiler/cfg/ssa/liveness/liveness.factor +++ b/basis/compiler/cfg/ssa/liveness/liveness.factor @@ -97,31 +97,15 @@ SYMBOL: phi-outs H{ } T_q-sets set [ next-T_q drop ] each-basic-block ; -:: compute-phi-uses ( cfg -- ) - ! Here, a phi node uses its argument in the block that it comes from. - H{ } clone :> use - cfg [| block | - block instructions>> [ - dup ##phi? - [ inputs>> [ use conjoin-at ] assoc-each ] - [ uses-vregs [ block swap use conjoin-at ] each ] - if - ] each - ] each-basic-block - use [ keys ] assoc-map uses set ; - PRIVATE> : precompute-liveness ( cfg -- ) - ! The first three of these depend only on the graph - ! structure of the CFG, and don't need to be recomputed - ! if that doesn't change + ! Maybe dominance and def-use should be called before this, separately { + [ compute-dominance ] + [ compute-def-use ] [ compute-R_q ] [ compute-T_q ] - [ compute-dominance ] - [ compute-defs ] - [ compute-phi-uses ] } cleave ; Date: Sun, 2 Aug 2009 17:06:35 -0500 Subject: [PATCH 5/9] compiler.cfg.ssa.liveness: fix unit tests --- basis/compiler/cfg/ssa/liveness/liveness-tests.factor | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/basis/compiler/cfg/ssa/liveness/liveness-tests.factor b/basis/compiler/cfg/ssa/liveness/liveness-tests.factor index 02c49d01f4..137fa0371f 100644 --- a/basis/compiler/cfg/ssa/liveness/liveness-tests.factor +++ b/basis/compiler/cfg/ssa/liveness/liveness-tests.factor @@ -85,11 +85,9 @@ V{ } 0 test-bb V{ } 1 test-bb V{ } 2 test-bb V{ } 3 test-bb -V int-regs 2 - 2 get V int-regs 0 2array - 3 get V int-regs 1 2array -2array \ ##phi new-insn 1vector -4 test-bb +V{ + T{ ##phi f V int-regs 2 H{ { 2 V int-regs 0 } { 3 V int-regs 1 } } } +} 4 test-bb test-diamond cfg new 1 get >>entry 5 set From 765efc1a6606c2b2d7b5487387ecafce3132720f Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 2 Aug 2009 18:15:18 -0400 Subject: [PATCH 6/9] Removing phi-outs set in SSA liveness checking --- .../cfg/ssa/liveness/liveness-tests.factor | 11 +++----- .../compiler/cfg/ssa/liveness/liveness.factor | 25 ++----------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/basis/compiler/cfg/ssa/liveness/liveness-tests.factor b/basis/compiler/cfg/ssa/liveness/liveness-tests.factor index 02c49d01f4..5031fc7973 100644 --- a/basis/compiler/cfg/ssa/liveness/liveness-tests.factor +++ b/basis/compiler/cfg/ssa/liveness/liveness-tests.factor @@ -39,7 +39,6 @@ cfg new 1 get >>entry 4 set [ ] [ 4 get precompute-liveness ] unit-test [ H{ } ] [ back-edge-targets get ] unit-test -[ H{ } ] [ phi-outs get ] unit-test [ t ] [ 1 get R_q { 1 2 3 } [ get ] map unique = ] unit-test [ t ] [ 2 get R_q { 2 } [ get ] map unique = ] unit-test [ t ] [ 3 get R_q { 3 } [ get ] map unique = ] unit-test @@ -86,8 +85,8 @@ V{ } 1 test-bb V{ } 2 test-bb V{ } 3 test-bb V int-regs 2 - 2 get V int-regs 0 2array - 3 get V int-regs 1 2array + 2 V int-regs 0 2array + 3 V int-regs 1 2array 2array \ ##phi new-insn 1vector 4 test-bb test-diamond @@ -109,7 +108,7 @@ cfg new 1 get >>entry 5 set [ f ] [ V int-regs 1 2 get live-in? ] unit-test [ f ] [ V int-regs 2 2 get live-in? ] unit-test -[ t ] [ V int-regs 0 2 get live-out? ] unit-test +[ f ] [ V int-regs 0 2 get live-out? ] unit-test [ f ] [ V int-regs 1 2 get live-out? ] unit-test [ f ] [ V int-regs 2 2 get live-out? ] unit-test @@ -118,7 +117,7 @@ cfg new 1 get >>entry 5 set [ f ] [ V int-regs 2 3 get live-in? ] unit-test [ f ] [ V int-regs 0 3 get live-out? ] unit-test -[ t ] [ V int-regs 1 3 get live-out? ] unit-test +[ f ] [ V int-regs 1 3 get live-out? ] unit-test [ f ] [ V int-regs 2 3 get live-out? ] unit-test [ f ] [ V int-regs 0 4 get live-in? ] unit-test @@ -202,8 +201,6 @@ cfg new 1 get >>entry 0 set [ f ] [ 10 get back-edge-target? ] unit-test [ f ] [ 11 get back-edge-target? ] unit-test -[ f ] [ 1 11 [a,b] [ get phi-outs get at ] any? ] unit-test - [ f ] [ V int-regs 0 1 get live-in? ] unit-test [ f ] [ V int-regs 1 1 get live-in? ] unit-test [ f ] [ V int-regs 2 1 get live-in? ] unit-test diff --git a/basis/compiler/cfg/ssa/liveness/liveness.factor b/basis/compiler/cfg/ssa/liveness/liveness.factor index f2a195eb24..625639cc73 100644 --- a/basis/compiler/cfg/ssa/liveness/liveness.factor +++ b/basis/compiler/cfg/ssa/liveness/liveness.factor @@ -21,10 +21,6 @@ SYMBOL: R_q-sets ! Targets of back edges SYMBOL: back-edge-targets -! hashtable of nodes => sets of vregs, where the vregs are inputs -! to phi nodes in a successor node -SYMBOL: phi-outs - : T_q ( q -- T_q ) T_q-sets get at ; @@ -34,9 +30,6 @@ SYMBOL: phi-outs : back-edge-target? ( block -- ? ) back-edge-targets get key? ; -: phi-out? ( vreg node -- ? ) - phi-outs get at key? ; - : next-R_q ( q -- R_q ) [ ] [ successors>> ] [ number>> ] tri '[ number>> _ >= ] filter @@ -52,27 +45,14 @@ SYMBOL: phi-outs [ back-edge-targets get conjoin ] [ drop ] if ] each ; -: set-phi-out ( block vreg -- ) - swap phi-outs get [ drop H{ } clone ] cache conjoin ; - -: set-phi-outs ( q -- ) - instructions>> [ - dup ##phi? [ - inputs>> [ set-phi-out ] assoc-each - ] [ drop ] if - ] each ; - : init-R_q ( -- ) H{ } clone R_q-sets set - H{ } clone back-edge-targets set - H{ } clone phi-outs set ; + H{ } clone back-edge-targets set ; : compute-R_q ( cfg -- ) init-R_q post-order [ - [ set-R_q ] - [ set-back-edges ] - [ set-phi-outs ] tri + [ set-R_q ] [ set-back-edges ] bi ] each ; ! This algorithm for computing T_q uses equation (1) @@ -150,7 +130,6 @@ PRIVATE> [let | def [ vreg def-of ] | { { [ node def eq? ] [ vreg uses-of def only? not ] } - { [ vreg node phi-out? ] [ t ] } { [ def node strictly-dominates? ] [ vreg node (live-out?) ] } [ f ] } cond From 634e1dd525ee037b9279bc4d375e98b90faecd9f Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 2 Aug 2009 17:19:01 -0500 Subject: [PATCH 7/9] compiler.cfg.liveness.ssa: remove --- basis/compiler/cfg/liveness/ssa/ssa.factor | 59 ---------------------- 1 file changed, 59 deletions(-) delete mode 100644 basis/compiler/cfg/liveness/ssa/ssa.factor diff --git a/basis/compiler/cfg/liveness/ssa/ssa.factor b/basis/compiler/cfg/liveness/ssa/ssa.factor deleted file mode 100644 index 82af084f06..0000000000 --- a/basis/compiler/cfg/liveness/ssa/ssa.factor +++ /dev/null @@ -1,59 +0,0 @@ -! Copyright (C) 2009 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: kernel namespaces deques accessors sets sequences assocs fry -hashtables dlists compiler.cfg.def-use compiler.cfg.instructions -compiler.cfg.rpo compiler.cfg.liveness compiler.cfg.utilities ; -IN: compiler.cfg.liveness.ssa - -! TODO: merge with compiler.cfg.liveness - -! Assoc mapping basic blocks to sequences of sets of vregs; each sequence -! is in correspondence with a predecessor -SYMBOL: phi-live-ins - -: phi-live-in ( predecessor basic-block -- set ) phi-live-ins get at at ; - -SYMBOL: work-list - -: add-to-work-list ( basic-blocks -- ) - work-list get '[ _ push-front ] each ; - -: compute-live-in ( basic-block -- live-in ) - [ live-out ] keep instructions>> transfer-liveness ; - -: compute-phi-live-in ( basic-block -- phi-live-in ) - H{ } clone [ - '[ inputs>> [ swap _ conjoin-at ] assoc-each ] each-phi - ] keep ; - -: update-live-in ( basic-block -- changed? ) - [ [ compute-live-in ] keep live-ins get maybe-set-at ] - [ [ compute-phi-live-in ] keep phi-live-ins get maybe-set-at ] - bi or ; - -: compute-live-out ( basic-block -- live-out ) - [ successors>> [ live-in ] map ] - [ dup successors>> [ phi-live-in ] with map ] bi - append assoc-combine ; - -: update-live-out ( basic-block -- changed? ) - [ compute-live-out ] keep - live-outs get maybe-set-at ; - -: liveness-step ( basic-block -- ) - dup update-live-out [ - dup update-live-in - [ predecessors>> add-to-work-list ] [ drop ] if - ] [ drop ] if ; - -: compute-ssa-live-sets ( cfg -- cfg' ) - work-list set - H{ } clone live-ins set - H{ } clone phi-live-ins set - H{ } clone live-outs set - dup post-order add-to-work-list - work-list get [ liveness-step ] slurp-deque ; - -: live-in? ( vreg bb -- ? ) live-in key? ; - -: live-out? ( vreg bb -- ? ) live-out key? ; \ No newline at end of file From a15b20a671b20891affbfa13feb44b14c29a69a4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 2 Aug 2009 18:41:16 -0500 Subject: [PATCH 8/9] Revert "compiler.cfg.liveness.ssa: remove" This reverts commit 6144fee1016d3e3b9b1b108f6f8e2b0c0afcbe4f. --- basis/compiler/cfg/liveness/ssa/ssa.factor | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 basis/compiler/cfg/liveness/ssa/ssa.factor diff --git a/basis/compiler/cfg/liveness/ssa/ssa.factor b/basis/compiler/cfg/liveness/ssa/ssa.factor new file mode 100644 index 0000000000..82af084f06 --- /dev/null +++ b/basis/compiler/cfg/liveness/ssa/ssa.factor @@ -0,0 +1,59 @@ +! Copyright (C) 2009 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel namespaces deques accessors sets sequences assocs fry +hashtables dlists compiler.cfg.def-use compiler.cfg.instructions +compiler.cfg.rpo compiler.cfg.liveness compiler.cfg.utilities ; +IN: compiler.cfg.liveness.ssa + +! TODO: merge with compiler.cfg.liveness + +! Assoc mapping basic blocks to sequences of sets of vregs; each sequence +! is in correspondence with a predecessor +SYMBOL: phi-live-ins + +: phi-live-in ( predecessor basic-block -- set ) phi-live-ins get at at ; + +SYMBOL: work-list + +: add-to-work-list ( basic-blocks -- ) + work-list get '[ _ push-front ] each ; + +: compute-live-in ( basic-block -- live-in ) + [ live-out ] keep instructions>> transfer-liveness ; + +: compute-phi-live-in ( basic-block -- phi-live-in ) + H{ } clone [ + '[ inputs>> [ swap _ conjoin-at ] assoc-each ] each-phi + ] keep ; + +: update-live-in ( basic-block -- changed? ) + [ [ compute-live-in ] keep live-ins get maybe-set-at ] + [ [ compute-phi-live-in ] keep phi-live-ins get maybe-set-at ] + bi or ; + +: compute-live-out ( basic-block -- live-out ) + [ successors>> [ live-in ] map ] + [ dup successors>> [ phi-live-in ] with map ] bi + append assoc-combine ; + +: update-live-out ( basic-block -- changed? ) + [ compute-live-out ] keep + live-outs get maybe-set-at ; + +: liveness-step ( basic-block -- ) + dup update-live-out [ + dup update-live-in + [ predecessors>> add-to-work-list ] [ drop ] if + ] [ drop ] if ; + +: compute-ssa-live-sets ( cfg -- cfg' ) + work-list set + H{ } clone live-ins set + H{ } clone phi-live-ins set + H{ } clone live-outs set + dup post-order add-to-work-list + work-list get [ liveness-step ] slurp-deque ; + +: live-in? ( vreg bb -- ? ) live-in key? ; + +: live-out? ( vreg bb -- ? ) live-out key? ; \ No newline at end of file From 32d9102febf7c36141966aac5c6577ed96861561 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 2 Aug 2009 18:41:31 -0500 Subject: [PATCH 9/9] Revert "SSA destruction uses new SSA liveness checking" This reverts commit 98c7de8410561c36c7703f45ecc191fd3d71431c. --- basis/compiler/cfg/ssa/destruction/destruction.factor | 6 +++--- .../compiler/cfg/ssa/interference/interference-tests.factor | 6 +++--- .../cfg/ssa/interference/live-ranges/live-ranges.factor | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor index 535dc6db86..b251578bc8 100644 --- a/basis/compiler/cfg/ssa/destruction/destruction.factor +++ b/basis/compiler/cfg/ssa/destruction/destruction.factor @@ -8,7 +8,7 @@ compiler.cfg.def-use compiler.cfg.renaming compiler.cfg.dominance compiler.cfg.instructions -compiler.cfg.ssa.liveness +compiler.cfg.liveness.ssa compiler.cfg.ssa.cssa compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges @@ -97,11 +97,11 @@ M: insn prepare-insn drop ; : destruct-ssa ( cfg -- cfg' ) dup cfg-has-phis? [ dup construct-cssa - dup precompute-liveness + compute-ssa-live-sets dup compute-defs dup compute-dominance dup compute-live-ranges dup prepare-coalescing process-copies dup perform-renaming - ] when ; + ] when ; \ No newline at end of file diff --git a/basis/compiler/cfg/ssa/interference/interference-tests.factor b/basis/compiler/cfg/ssa/interference/interference-tests.factor index 9075d3b010..f8876755d9 100644 --- a/basis/compiler/cfg/ssa/interference/interference-tests.factor +++ b/basis/compiler/cfg/ssa/interference/interference-tests.factor @@ -1,6 +1,6 @@ USING: accessors compiler.cfg compiler.cfg.debugger compiler.cfg.def-use compiler.cfg.dominance -compiler.cfg.instructions compiler.cfg.ssa.liveness +compiler.cfg.instructions compiler.cfg.liveness.ssa compiler.cfg.registers compiler.cfg.predecessors compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges cpu.architecture @@ -9,8 +9,8 @@ IN: compiler.cfg.ssa.interference.tests : test-interference ( -- ) cfg new 0 get >>entry + compute-ssa-live-sets compute-predecessors - dup precompute-liveness dup compute-defs dup compute-dominance compute-live-ranges ; @@ -49,4 +49,4 @@ V{ [ t ] [ V int-regs 3 V int-regs 5 vregs-interfere? ] unit-test [ t ] [ V int-regs 5 V int-regs 3 vregs-interfere? ] unit-test [ f ] [ V int-regs 3 V int-regs 6 vregs-interfere? ] unit-test -[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test +[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test \ No newline at end of file diff --git a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor index c29b69cf36..151af8bea4 100644 --- a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor +++ b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs fry kernel namespaces sequences math arrays compiler.cfg.def-use compiler.cfg.instructions -compiler.cfg.ssa.liveness compiler.cfg.rpo ; +compiler.cfg.liveness.ssa compiler.cfg.rpo ; IN: compiler.cfg.ssa.interference.live-ranges ! Live ranges for interference testing