aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/arm/hipe_arm_ra_ls.erl
diff options
context:
space:
mode:
authorMagnus Lång <[email protected]>2016-06-10 19:29:22 +0200
committerMagnus Lång <[email protected]>2016-08-30 17:21:20 +0200
commitd9b091472f9afb216fe9f0c763053baf89390a6c (patch)
treee7904d4146ac66bcbae6ac4a7e20874c6a7c07e1 /lib/hipe/arm/hipe_arm_ra_ls.erl
parent1567585dda8bc604871be06a37aa5d19ad6d28f3 (diff)
downloadotp-d9b091472f9afb216fe9f0c763053baf89390a6c.tar.gz
otp-d9b091472f9afb216fe9f0c763053baf89390a6c.tar.bz2
otp-d9b091472f9afb216fe9f0c763053baf89390a6c.zip
hipe_arm: Minimise CFG<->linear conversions
Now, there will only ever be a single Linear->CFG conversion, just after lowering from RTL, and only ever a single CFG->Linear conversion, just before the finalise pass. Both of these now happen in hipe_arm_main.
Diffstat (limited to 'lib/hipe/arm/hipe_arm_ra_ls.erl')
-rw-r--r--lib/hipe/arm/hipe_arm_ra_ls.erl15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/hipe/arm/hipe_arm_ra_ls.erl b/lib/hipe/arm/hipe_arm_ra_ls.erl
index 7891403fc3..f9193ca9e0 100644
--- a/lib/hipe/arm/hipe_arm_ra_ls.erl
+++ b/lib/hipe/arm/hipe_arm_ra_ls.erl
@@ -23,14 +23,11 @@
-module(hipe_arm_ra_ls).
-export([ra/3]).
-ra(Defun, SpillIndex, Options) ->
- NewDefun = Defun, %% hipe_${ARCH}_ra_rename:rename(Defun,Options),
- CFG = hipe_arm_cfg:init(NewDefun),
+ra(CFG, SpillIndex, Options) ->
SpillLimit = hipe_arm_specific:number_of_temporaries(CFG),
- alloc(NewDefun, SpillIndex, SpillLimit, Options).
+ alloc(CFG, SpillIndex, SpillLimit, Options).
-alloc(Defun, SpillIndex, SpillLimit, Options) ->
- CFG = hipe_arm_cfg:init(Defun),
+alloc(CFG, SpillIndex, SpillLimit, Options) ->
{Coloring, _NewSpillIndex, Liveness} =
regalloc(
CFG,
@@ -41,16 +38,16 @@ alloc(Defun, SpillIndex, SpillLimit, Options) ->
[hipe_arm_cfg:start_label(CFG)],
SpillIndex, SpillLimit, Options,
hipe_arm_specific),
- {NewDefun, _DidSpill} =
+ {NewCFG, _DidSpill} =
hipe_arm_ra_postconditions:check_and_rewrite(
- Defun, Coloring, 'linearscan'),
+ CFG, Coloring, 'linearscan'),
TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_arm_specific),
{SpillMap, _NewSpillIndex2} =
hipe_spillmin:stackalloc(CFG, Liveness, [], SpillIndex, Options,
hipe_arm_specific, TempMap),
Coloring2 =
hipe_spillmin:mapmerge(hipe_temp_map:to_substlist(TempMap), SpillMap),
- {NewDefun, Coloring2}.
+ {NewCFG, Coloring2}.
regalloc(CFG, PhysRegs, Entrypoints, SpillIndex, DontSpill, Options, Target) ->
hipe_ls_regalloc:regalloc(