diff mbox series

[V4,1/2] rs6000: use li;x?oris to build constant

Message ID 20221212013829.111739-1-guojiufu@linux.ibm.com
State New
Headers show
Series [V4,1/2] rs6000: use li;x?oris to build constant | expand

Commit Message

Jiufu Guo Dec. 12, 2022, 1:38 a.m. UTC 
Hi,

For constant C:
If '(c & 0xFFFFFFFF00008000ULL) == 0xFFFFFFFF00008000ULL' or say:
32(1) || 16(x) || 1(1) || 15(x), using "li; xoris" would be ok.

If '(c & 0xFFFFFFFF80008000ULL) == 0x80000000ULL' or say:
32(0) || 1(1) || 15(x) || 1(0) || 15(x), we could use "li; oris" to
build constant 'C'.

Here N(M) means N continuous bit M, x for M means it is ok for either
1 or 0; '||' means concatenation.

This patch update rs6000_emit_set_long_const to support those constants.

Compare with previous version, this patch fixes conflicts with trunk.
and put li;x?oris as the first patch (lis;xoris as the second patch).
Previous version:
https://gcc.gnu.org/pipermail/gcc-patches/2022-December/607618.html

Bootstrap and regtest pass on ppc64{,le}.

Is this ok for trunk?

BR,
Jeff (Jiufu)


	PR target/106708

gcc/ChangeLog:

	* config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Add using
	"li; x?oris" to build constant.

gcc/testsuite/ChangeLog:

	* gcc.target/powerpc/pr106708.c: New test.

---
 gcc/config/rs6000/rs6000.cc                 | 36 +++++++++++++++---
 gcc/testsuite/gcc.target/powerpc/pr106708.c | 41 +++++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708.c

Comments

Kewen.Lin Dec. 14, 2022, 10:27 a.m. UTC | #1 
Hi Jeff,

on 2022/12/12 09:38, Jiufu Guo via Gcc-patches wrote:
> Hi,
> 
> For constant C:
> If '(c & 0xFFFFFFFF00008000ULL) == 0xFFFFFFFF00008000ULL' or say:
> 32(1) || 16(x) || 1(1) || 15(x), using "li; xoris" would be ok.
> 
> If '(c & 0xFFFFFFFF80008000ULL) == 0x80000000ULL' or say:
> 32(0) || 1(1) || 15(x) || 1(0) || 15(x), we could use "li; oris" to
> build constant 'C'.
> 
> Here N(M) means N continuous bit M, x for M means it is ok for either
> 1 or 0; '||' means concatenation.
> 
> This patch update rs6000_emit_set_long_const to support those constants.
> 
> Compare with previous version, this patch fixes conflicts with trunk.
> and put li;x?oris as the first patch (lis;xoris as the second patch).
> Previous version:
> https://gcc.gnu.org/pipermail/gcc-patches/2022-December/607618.html
> 
> Bootstrap and regtest pass on ppc64{,le}.
> 
> Is this ok for trunk?
> 
> BR,
> Jeff (Jiufu)
> 
> 
> 	PR target/106708
> 
> gcc/ChangeLog:
> 
> 	* config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Add using
> 	"li; x?oris" to build constant.
> 
> gcc/testsuite/ChangeLog:
> 
> 	* gcc.target/powerpc/pr106708.c: New test.
> 
> ---
>  gcc/config/rs6000/rs6000.cc                 | 36 +++++++++++++++---
>  gcc/testsuite/gcc.target/powerpc/pr106708.c | 41 +++++++++++++++++++++
>  2 files changed, 71 insertions(+), 6 deletions(-)
>  create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708.c
> 
> diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
> index b3a609f3aa3..8c1192a10c8 100644
> --- a/gcc/config/rs6000/rs6000.cc
> +++ b/gcc/config/rs6000/rs6000.cc
> @@ -10251,17 +10251,41 @@ rs6000_emit_set_long_const (rtx dest, HOST_WIDE_INT c)
>        if (ud1 != 0)
>  	emit_move_insn (dest, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
>      }
> +  else if (ud4 == 0xffff && ud3 == 0xffff && (ud1 & 0x8000))
> +    {
> +      /* li; xoris */
> +      temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
> +      emit_move_insn (temp, GEN_INT (sext_hwi (ud1, 16)));
> +      emit_move_insn (dest, gen_rtx_XOR (DImode, temp,
> +					 GEN_INT ((ud2 ^ 0xffff) << 16)));
> +    }
>    else if (ud3 == 0 && ud4 == 0)
>      {
>        temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
>  
>        gcc_assert (ud2 & 0x8000);
> -      emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
> -      if (ud1 != 0)
> -	emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
> -      emit_move_insn (dest,
> -		      gen_rtx_ZERO_EXTEND (DImode,
> -					   gen_lowpart (SImode,temp)));
> +
> +      if (ud1 == 0)
> +	{
> +	  /* lis; rldicl */
> +	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
> +	  emit_move_insn (dest,
> +			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
> +	}
> +      else if (!(ud1 & 0x8000))
> +	{
> +	  /* li; oris */
> +	  emit_move_insn (temp, GEN_INT (ud1));
> +	  emit_move_insn (dest,
> +			  gen_rtx_IOR (DImode, temp, GEN_INT (ud2 << 16)));
> +	}
> +      else
> +	{

Nit: Add "/* lis; ori; rldicl */" like the other arms?

> +	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
> +	  emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
> +	  emit_move_insn (dest,
> +			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
> +	}
>      }
>    else if (ud1 == ud3 && ud2 == ud4)
>      {
> diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708.c b/gcc/testsuite/gcc.target/powerpc/pr106708.c
> new file mode 100644
> index 00000000000..dc9ceda8367
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/powerpc/pr106708.c
> @@ -0,0 +1,41 @@
> +/* PR target/106708 */
> +/* { dg-do run } */
> +/* { dg-options "-O2 -mno-prefixed -save-temps" } */
> +/* { dg-require-effective-target has_arch_ppc64 } */
> +
> +long long arr[]
> +  = {0xffffffff7cdeab55LL, 0x98765432LL, 0xabcd0000LL};
> +
> +void __attribute__ ((__noipa__)) lixoris (long long *arg)

Nit: Adding separator "_" to make the name like "li_xoris" or even
"test_li_xoris" seems better to read.  Also applied for the other
function names "lioris" and "lisrldicl".

The others look good to me.  Thanks!

BR,
Kewen
Jiufu Guo Dec. 15, 2022, 3:29 a.m. UTC | #2 
Hi,

"Kewen.Lin" <linkw@linux.ibm.com> writes:

> Hi Jeff,
>
> on 2022/12/12 09:38, Jiufu Guo via Gcc-patches wrote:
>> Hi,
>> 
>> For constant C:
>> If '(c & 0xFFFFFFFF00008000ULL) == 0xFFFFFFFF00008000ULL' or say:
>> 32(1) || 16(x) || 1(1) || 15(x), using "li; xoris" would be ok.
>> 
>> If '(c & 0xFFFFFFFF80008000ULL) == 0x80000000ULL' or say:
>> 32(0) || 1(1) || 15(x) || 1(0) || 15(x), we could use "li; oris" to
>> build constant 'C'.
>> 
>> Here N(M) means N continuous bit M, x for M means it is ok for either
>> 1 or 0; '||' means concatenation.
>> 
>> This patch update rs6000_emit_set_long_const to support those constants.
>> 
>> Compare with previous version, this patch fixes conflicts with trunk.
>> and put li;x?oris as the first patch (lis;xoris as the second patch).
>> Previous version:
>> https://gcc.gnu.org/pipermail/gcc-patches/2022-December/607618.html
>> 
>> Bootstrap and regtest pass on ppc64{,le}.
>> 
>> Is this ok for trunk?
>> 
>> BR,
>> Jeff (Jiufu)
>> 
>> 
>> 	PR target/106708
>> 
>> gcc/ChangeLog:
>> 
>> 	* config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Add using
>> 	"li; x?oris" to build constant.
>> 
>> gcc/testsuite/ChangeLog:
>> 
>> 	* gcc.target/powerpc/pr106708.c: New test.
>> 
>> ---
>>  gcc/config/rs6000/rs6000.cc                 | 36 +++++++++++++++---
>>  gcc/testsuite/gcc.target/powerpc/pr106708.c | 41 +++++++++++++++++++++
>>  2 files changed, 71 insertions(+), 6 deletions(-)
>>  create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708.c
>> 
>> diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
>> index b3a609f3aa3..8c1192a10c8 100644
>> --- a/gcc/config/rs6000/rs6000.cc
>> +++ b/gcc/config/rs6000/rs6000.cc
>> @@ -10251,17 +10251,41 @@ rs6000_emit_set_long_const (rtx dest, HOST_WIDE_INT c)
>>        if (ud1 != 0)
>>  	emit_move_insn (dest, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
>>      }
>> +  else if (ud4 == 0xffff && ud3 == 0xffff && (ud1 & 0x8000))
>> +    {
>> +      /* li; xoris */
>> +      temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
>> +      emit_move_insn (temp, GEN_INT (sext_hwi (ud1, 16)));
>> +      emit_move_insn (dest, gen_rtx_XOR (DImode, temp,
>> +					 GEN_INT ((ud2 ^ 0xffff) << 16)));
>> +    }
>>    else if (ud3 == 0 && ud4 == 0)
>>      {
>>        temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
>>  
>>        gcc_assert (ud2 & 0x8000);
>> -      emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
>> -      if (ud1 != 0)
>> -	emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
>> -      emit_move_insn (dest,
>> -		      gen_rtx_ZERO_EXTEND (DImode,
>> -					   gen_lowpart (SImode,temp)));
>> +
>> +      if (ud1 == 0)
>> +	{
>> +	  /* lis; rldicl */
>> +	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
>> +	  emit_move_insn (dest,
>> +			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
>> +	}
>> +      else if (!(ud1 & 0x8000))
>> +	{
>> +	  /* li; oris */
>> +	  emit_move_insn (temp, GEN_INT (ud1));
>> +	  emit_move_insn (dest,
>> +			  gen_rtx_IOR (DImode, temp, GEN_INT (ud2 << 16)));
>> +	}
>> +      else
>> +	{
>
> Nit: Add "/* lis; ori; rldicl */" like the other arms?
>
>> +	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
>> +	  emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
>> +	  emit_move_insn (dest,
>> +			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
>> +	}
>>      }
>>    else if (ud1 == ud3 && ud2 == ud4)
>>      {
>> diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708.c b/gcc/testsuite/gcc.target/powerpc/pr106708.c
>> new file mode 100644
>> index 00000000000..dc9ceda8367
>> --- /dev/null
>> +++ b/gcc/testsuite/gcc.target/powerpc/pr106708.c
>> @@ -0,0 +1,41 @@
>> +/* PR target/106708 */
>> +/* { dg-do run } */
>> +/* { dg-options "-O2 -mno-prefixed -save-temps" } */
>> +/* { dg-require-effective-target has_arch_ppc64 } */
>> +
>> +long long arr[]
>> +  = {0xffffffff7cdeab55LL, 0x98765432LL, 0xabcd0000LL};
>> +
>> +void __attribute__ ((__noipa__)) lixoris (long long *arg)
>
> Nit: Adding separator "_" to make the name like "li_xoris" or even
> "test_li_xoris" seems better to read.  Also applied for the other
> function names "lioris" and "lisrldicl".
>
> The others look good to me.  Thanks!
>

Thanks a lot for your review and comments!
I will update into patch.

BR,
Jeff (Jiufu)

> BR,
> Kewen
Segher Boessenkool Dec. 16, 2022, 9:12 p.m. UTC | #3 
On Wed, Dec 14, 2022 at 06:27:57PM +0800, Kewen.Lin wrote:
> > +void __attribute__ ((__noipa__)) lixoris (long long *arg)
> 
> Nit: Adding separator "_" to make the name like "li_xoris" or even
> "test_li_xoris" seems better to read.  Also applied for the other
> function names "lioris" and "lisrldicl".

Ha yes, that last one is a bit impregnable like this.  It is testsuite
so everything goes of course, but :-)


Segher
Segher Boessenkool Dec. 16, 2022, 9:16 p.m. UTC | #4 
Hi!

On Mon, Dec 12, 2022 at 09:38:28AM +0800, Jiufu Guo wrote:
> 	PR target/106708
> 
> gcc/ChangeLog:
> 
> 	* config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Add using
> 	"li; x?oris" to build constant.
> 
> gcc/testsuite/ChangeLog:
> 
> 	* gcc.target/powerpc/pr106708.c: New test.

Okay for trunk with the nits Ke Wen pointed out taken care off.

Thanks!


Segher
Jiufu Guo Dec. 19, 2022, 9:16 a.m. UTC | #5 
Hi,

Segher Boessenkool <segher@kernel.crashing.org> writes:

> Hi!
>
> On Mon, Dec 12, 2022 at 09:38:28AM +0800, Jiufu Guo wrote:
>> 	PR target/106708
>> 
>> gcc/ChangeLog:
>> 
>> 	* config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Add using
>> 	"li; x?oris" to build constant.
>> 
>> gcc/testsuite/ChangeLog:
>> 
>> 	* gcc.target/powerpc/pr106708.c: New test.
>
> Okay for trunk with the nits Ke Wen pointed out taken care off.

Thanks! Updated and committed via r13-4771-g97a8e88cd7d225.

BR,
Jeff (Jiufu)
>
> Thanks!
>
>
> Segher
diff mbox series

Patch

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index b3a609f3aa3..8c1192a10c8 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -10251,17 +10251,41 @@  rs6000_emit_set_long_const (rtx dest, HOST_WIDE_INT c)
       if (ud1 != 0)
 	emit_move_insn (dest, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
     }
+  else if (ud4 == 0xffff && ud3 == 0xffff && (ud1 & 0x8000))
+    {
+      /* li; xoris */
+      temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
+      emit_move_insn (temp, GEN_INT (sext_hwi (ud1, 16)));
+      emit_move_insn (dest, gen_rtx_XOR (DImode, temp,
+					 GEN_INT ((ud2 ^ 0xffff) << 16)));
+    }
   else if (ud3 == 0 && ud4 == 0)
     {
       temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode);
 
       gcc_assert (ud2 & 0x8000);
-      emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
-      if (ud1 != 0)
-	emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
-      emit_move_insn (dest,
-		      gen_rtx_ZERO_EXTEND (DImode,
-					   gen_lowpart (SImode,temp)));
+
+      if (ud1 == 0)
+	{
+	  /* lis; rldicl */
+	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
+	  emit_move_insn (dest,
+			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
+	}
+      else if (!(ud1 & 0x8000))
+	{
+	  /* li; oris */
+	  emit_move_insn (temp, GEN_INT (ud1));
+	  emit_move_insn (dest,
+			  gen_rtx_IOR (DImode, temp, GEN_INT (ud2 << 16)));
+	}
+      else
+	{
+	  emit_move_insn (temp, GEN_INT (sext_hwi (ud2 << 16, 32)));
+	  emit_move_insn (temp, gen_rtx_IOR (DImode, temp, GEN_INT (ud1)));
+	  emit_move_insn (dest,
+			  gen_rtx_AND (DImode, temp, GEN_INT (0xffffffff)));
+	}
     }
   else if (ud1 == ud3 && ud2 == ud4)
     {
diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708.c b/gcc/testsuite/gcc.target/powerpc/pr106708.c
new file mode 100644
index 00000000000..dc9ceda8367
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr106708.c
@@ -0,0 +1,41 @@ 
+/* PR target/106708 */
+/* { dg-do run } */
+/* { dg-options "-O2 -mno-prefixed -save-temps" } */
+/* { dg-require-effective-target has_arch_ppc64 } */
+
+long long arr[]
+  = {0xffffffff7cdeab55LL, 0x98765432LL, 0xabcd0000LL};
+
+void __attribute__ ((__noipa__)) lixoris (long long *arg)
+{
+  *arg = 0xffffffff7cdeab55LL;
+}
+/* { dg-final { scan-assembler-times {\mli .*,-21675\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mxoris .*0x8321\M} 1 } } */
+
+void __attribute__ ((__noipa__)) lioris (long long *arg)
+{
+  *arg = 0x98765432LL;
+}
+/* { dg-final { scan-assembler-times {\mli .*,21554\M} 1 } } */
+/* { dg-final { scan-assembler-times {\moris .*0x9876\M} 1 } } */
+
+void __attribute__ ((__noipa__)) lisrldicl (long long *arg)
+{
+  *arg = 0xabcd0000LL;
+}
+/* { dg-final { scan-assembler-times {\mlis .*,0xabcd\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mrldicl .*,0,32\M} 1 } } */
+
+int
+main ()
+{
+  long long a[sizeof (arr) / sizeof (arr[0])];
+
+  lixoris (a);
+  lioris (a + 1);
+  lisrldicl (a + 2);
+  if (__builtin_memcmp (a, arr, sizeof (arr)) != 0)
+    __builtin_abort ();
+  return 0;
+}