2018-04-13 Vladimir Makarov <vmakarov@redhat.com>

vmakarov · vmakarov · commit 0c0a0f3a871b · 2018-04-13T22:55:16.000Z
PR rtl-optimization/79916
	* config/rs6000/rs6000.c (rs6000_emit_move): Use assigned hard
	regs (if any) to define how to gnerate SD moves when LRA is in
	progress.

2018-04-13  Vladimir Makarov  &lt;vmakarov@redhat.com&gt;

	PR rtl-optimization/79916
	* gcc.target/powerpc/pr79916.c: New.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259379 138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-13  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/79916
+	* config/rs6000/rs6000.c (rs6000_emit_move): Use assigned hard
+	regs (if any) to define how to gnerate SD moves when LRA is in
+	progress.
+
 2018-04-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/85393
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
@@ -10610,7 +10610,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)
       if (regno >= FIRST_PSEUDO_REGISTER)
 	{
 	  cl = reg_preferred_class (regno);
-	  regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][1];
+	  regno = reg_renumber[regno];
+	  if (regno < 0)
+	    regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][1];
 	}
       if (regno >= 0 && ! FP_REGNO_P (regno))
 	{
@@ -10635,7 +10637,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)
 	{
 	  cl = reg_preferred_class (regno);
 	  gcc_assert (cl != NO_REGS);
-	  regno = ira_class_hard_regs[cl][0];
+	  regno = reg_renumber[regno];
+	  if (regno < 0)
+	    regno = ira_class_hard_regs[cl][0];
 	}
       if (FP_REGNO_P (regno))
 	{
@@ -10664,7 +10668,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)
       if (regno >= FIRST_PSEUDO_REGISTER)
 	{
 	  cl = reg_preferred_class (regno);
-	  regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][0];
+	  regno = reg_renumber[regno];
+	  if (regno < 0)
+	    regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][0];
 	}
       if (regno >= 0 && ! FP_REGNO_P (regno))
 	{
@@ -10689,7 +10695,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)
 	{
 	  cl = reg_preferred_class (regno);
 	  gcc_assert (cl != NO_REGS);
-	  regno = ira_class_hard_regs[cl][0];
+	  regno = reg_renumber[regno];
+	  if (regno < 0)
+	    regno = ira_class_hard_regs[cl][0];
 	}
       if (FP_REGNO_P (regno))
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-13  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/79916
+	* gcc.target/powerpc/pr79916.c: New.
+
 2018-04-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/85393
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79916.c b/gcc/testsuite/gcc.target/powerpc/pr79916.c

Original file line number	Diff line number	Diff line change
`@@ -10610,7 +10610,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)`
`10610`	`10610`	`if (regno >= FIRST_PSEUDO_REGISTER)`
`10611`	`10611`	`{`
`10612`	`10612`	`cl = reg_preferred_class (regno);`
`10613`		`- regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][1];`
	`10613`	`+ regno = reg_renumber[regno];`
	`10614`	`+ if (regno < 0)`
	`10615`	`+ regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][1];`
`10614`	`10616`	`}`
`10615`	`10617`	`if (regno >= 0 && ! FP_REGNO_P (regno))`
`10616`	`10618`	`{`
`@@ -10635,7 +10637,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)`
`10635`	`10637`	`{`
`10636`	`10638`	`cl = reg_preferred_class (regno);`
`10637`	`10639`	`gcc_assert (cl != NO_REGS);`
`10638`		`- regno = ira_class_hard_regs[cl][0];`
	`10640`	`+ regno = reg_renumber[regno];`
	`10641`	`+ if (regno < 0)`
	`10642`	`+ regno = ira_class_hard_regs[cl][0];`
`10639`	`10643`	`}`
`10640`	`10644`	`if (FP_REGNO_P (regno))`
`10641`	`10645`	`{`
`@@ -10664,7 +10668,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)`
`10664`	`10668`	`if (regno >= FIRST_PSEUDO_REGISTER)`
`10665`	`10669`	`{`
`10666`	`10670`	`cl = reg_preferred_class (regno);`
`10667`		`- regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][0];`
	`10671`	`+ regno = reg_renumber[regno];`
	`10672`	`+ if (regno < 0)`
	`10673`	`+ regno = cl == NO_REGS ? -1 : ira_class_hard_regs[cl][0];`
`10668`	`10674`	`}`
`10669`	`10675`	`if (regno >= 0 && ! FP_REGNO_P (regno))`
`10670`	`10676`	`{`
`@@ -10689,7 +10695,9 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode)`
`10689`	`10695`	`{`
`10690`	`10696`	`cl = reg_preferred_class (regno);`
`10691`	`10697`	`gcc_assert (cl != NO_REGS);`
`10692`		`- regno = ira_class_hard_regs[cl][0];`
	`10698`	`+ regno = reg_renumber[regno];`
	`10699`	`+ if (regno < 0)`
	`10700`	`+ regno = ira_class_hard_regs[cl][0];`
`10693`	`10701`	`}`
`10694`	`10702`	`if (FP_REGNO_P (regno))`
`10695`	`10703`	`{`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2018-04-13  Vladimir Makarov  <[email protected]>
++
 +	PR rtl-optimization/79916
 +	* gcc.target/powerpc/pr79916.c: New.
++
 -04-13  Jakub Jelinek  <[email protected]>
 	PR rtl-optimization/85393