Merge branch 'sverker/hipe-performance-o1/PR-1154/OTP-13862'

* sverker/hipe-performance-o1/PR-1154:
  hipe_sparc: Minimise CFG<->linear conversions
  hipe_ppc: Minimise CFG<->linear conversions
  hipe_arm: Minimise CFG<->linear conversions
  hipe_x86: Use lea instead of move+add
  hipe_arm: Improve peephole optimiser
  hipe_arm: Be resilient to crappy RTL
  hipe_ppc: Be resilient to crappy RTL
  hipe_sparc: Be resilient to crappy RTL
  hipe: Reuse liveness info for spillmin
  hipe_x86: Minimise CFG<->linear conversions
  hipe: Fix o0 and o1
  hipe: Add o0 and o1 to tests
  hipe_rtl_binary:get_word_integer/4: Handle imms
  hipe_x86: Be resilient to crappy RTL
  hipe_x86: LSRA for SSE2

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/hipe/sparc/hipe_sparc_ra.erl b/lib/hipe/sparc/hipe_sparc_ra.erl
index afea8c9b4c..5f955c2058 100644
--- a/lib/hipe/sparc/hipe_sparc_ra.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra.erl
@@ -22,36 +22,36 @@
 -module(hipe_sparc_ra).
 -export([ra/2]).
 
-ra(Defun0, Options) ->
-  %% hipe_sparc_pp:pp(Defun0),
-  {Defun1, Coloring_fp, SpillIndex}
+ra(CFG0, Options) ->
+  %% hipe_sparc_pp:pp(hipe_sparc_cfg:linearise(CFG0)),
+  {CFG1, Coloring_fp, SpillIndex}
     = case proplists:get_bool(inline_fp, Options) of
 	true ->
-	  hipe_regalloc_loop:ra_fp(Defun0, Options,
+	  hipe_regalloc_loop:ra_fp(CFG0, Options,
 				   hipe_coalescing_regalloc,
 				   hipe_sparc_specific_fp);
 	false ->
-	  {Defun0,[],0}
+	  {CFG0,[],0}
       end,
-  %% hipe_sparc_pp:pp(Defun1),
-  {Defun2, Coloring}
+  %% hipe_sparc_pp:pp(hipe_sparc_cfg:linearise(CFG1)),
+  {CFG2, Coloring}
     = case proplists:get_value(regalloc, Options, coalescing) of
 	coalescing ->
-	  ra(Defun1, SpillIndex, Options, hipe_coalescing_regalloc);
+	  ra(CFG1, SpillIndex, Options, hipe_coalescing_regalloc);
 	optimistic ->
-	  ra(Defun1, SpillIndex, Options, hipe_optimistic_regalloc);
+	  ra(CFG1, SpillIndex, Options, hipe_optimistic_regalloc);
 	graph_color ->
-	  ra(Defun1, SpillIndex, Options, hipe_graph_coloring_regalloc);
+	  ra(CFG1, SpillIndex, Options, hipe_graph_coloring_regalloc);
 	linear_scan ->
-	  hipe_sparc_ra_ls:ra(Defun1, SpillIndex, Options);
+	  hipe_sparc_ra_ls:ra(CFG1, SpillIndex, Options);
 	naive ->
-	  hipe_sparc_ra_naive:ra(Defun1, Coloring_fp, Options);
+	  hipe_sparc_ra_naive:ra(CFG1, Coloring_fp, Options);
         _ ->
 	  exit({unknown_regalloc_compiler_option,
 		proplists:get_value(regalloc,Options)})
       end,
-  %% hipe_sparc_pp:pp(Defun2),
-  hipe_sparc_ra_finalise:finalise(Defun2, Coloring, Coloring_fp).
+  %% hipe_sparc_pp:pp(hipe_sparc_cfg:linearise(CFG2)),
+  hipe_sparc_ra_finalise:finalise(CFG2, Coloring, Coloring_fp).
 
-ra(Defun, SpillIndex, Options, RegAllocMod) ->
-  hipe_regalloc_loop:ra(Defun, SpillIndex, Options, RegAllocMod, hipe_sparc_specific).
+ra(CFG, SpillIndex, Options, RegAllocMod) ->
+  hipe_regalloc_loop:ra(CFG, SpillIndex, Options, RegAllocMod, hipe_sparc_specific).