LoongArch: Fix incorrect return type for frecipe/frsqrte intrinsic functions

Message ID 20240124091932.38877-1-xujiahao@loongson.cn
State Unresolved
Headers
Series LoongArch: Fix incorrect return type for frecipe/frsqrte intrinsic functions |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jiahao Xu Jan. 24, 2024, 9:19 a.m. UTC
  gcc/ChangeLog:

	* config/loongarch/larchintrin.h
	(__frecipe_s): Update function return type.
	(__frecipe_d): Ditto.
	(__frsqrte_s): Ditto.
	(__frsqrte_d): Ditto.

gcc/testsuite/ChangeLog:

	* gcc.target/loongarch/larch-frecipe-intrinsic.c: New test.
  

Comments

Xi Ruoyao Jan. 24, 2024, 9:48 a.m. UTC | #1
On Wed, 2024-01-24 at 17:19 +0800, Jiahao Xu wrote:
> gcc/ChangeLog:
> 
> 	* config/loongarch/larchintrin.h
> 	(__frecipe_s): Update function return type.
> 	(__frecipe_d): Ditto.
> 	(__frsqrte_s): Ditto.
> 	(__frsqrte_d): Ditto.
> 
> gcc/testsuite/ChangeLog:
> 
> 	* gcc.target/loongarch/larch-frecipe-intrinsic.c: New test.
> 
> diff --git a/gcc/config/loongarch/larchintrin.h b/gcc/config/loongarch/larchintrin.h
> index 7692415e04d..ff2c9f460ac 100644
> --- a/gcc/config/loongarch/larchintrin.h
> +++ b/gcc/config/loongarch/larchintrin.h
> @@ -336,38 +336,38 @@ __iocsrwr_d (unsigned long int _1, unsigned int _2)
>  #ifdef __loongarch_frecipe
>  /* Assembly instruction format: fd, fj.  */
>  /* Data types in instruction templates:  SF, SF.  */
> -extern __inline void
> +extern __inline float
>  __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>  __frecipe_s (float _1)
>  {
> -  __builtin_loongarch_frecipe_s ((float) _1);
> +  return (float) __builtin_loongarch_frecipe_s ((float) _1);

I don't think the (float) conversion is needed.
  
Jiahao Xu Jan. 24, 2024, 9:58 a.m. UTC | #2
在 2024/1/24 下午5:48, Xi Ruoyao 写道:
> On Wed, 2024-01-24 at 17:19 +0800, Jiahao Xu wrote:
>> gcc/ChangeLog:
>>
>> 	* config/loongarch/larchintrin.h
>> 	(__frecipe_s): Update function return type.
>> 	(__frecipe_d): Ditto.
>> 	(__frsqrte_s): Ditto.
>> 	(__frsqrte_d): Ditto.
>>
>> gcc/testsuite/ChangeLog:
>>
>> 	* gcc.target/loongarch/larch-frecipe-intrinsic.c: New test.
>>
>> diff --git a/gcc/config/loongarch/larchintrin.h b/gcc/config/loongarch/larchintrin.h
>> index 7692415e04d..ff2c9f460ac 100644
>> --- a/gcc/config/loongarch/larchintrin.h
>> +++ b/gcc/config/loongarch/larchintrin.h
>> @@ -336,38 +336,38 @@ __iocsrwr_d (unsigned long int _1, unsigned int _2)
>>   #ifdef __loongarch_frecipe
>>   /* Assembly instruction format: fd, fj.  */
>>   /* Data types in instruction templates:  SF, SF.  */
>> -extern __inline void
>> +extern __inline float
>>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>>   __frecipe_s (float _1)
>>   {
>> -  __builtin_loongarch_frecipe_s ((float) _1);
>> +  return (float) __builtin_loongarch_frecipe_s ((float) _1);
> I don't think the (float) conversion is needed.
>
>
Indeed, this float conversion is unnecessary; I simply included it to 
align with the definitions of other intrinsic functions.
  
chenglulu Jan. 25, 2024, 6:12 a.m. UTC | #3
在 2024/1/24 下午5:58, Jiahao Xu 写道:
>
> 在 2024/1/24 下午5:48, Xi Ruoyao 写道:
>> On Wed, 2024-01-24 at 17:19 +0800, Jiahao Xu wrote:
>>> gcc/ChangeLog:
>>>
>>>     * config/loongarch/larchintrin.h
>>>     (__frecipe_s): Update function return type.
>>>     (__frecipe_d): Ditto.
>>>     (__frsqrte_s): Ditto.
>>>     (__frsqrte_d): Ditto.
>>>
>>> gcc/testsuite/ChangeLog:
>>>
>>>     * gcc.target/loongarch/larch-frecipe-intrinsic.c: New test.
>>>
>>> diff --git a/gcc/config/loongarch/larchintrin.h 
>>> b/gcc/config/loongarch/larchintrin.h
>>> index 7692415e04d..ff2c9f460ac 100644
>>> --- a/gcc/config/loongarch/larchintrin.h
>>> +++ b/gcc/config/loongarch/larchintrin.h
>>> @@ -336,38 +336,38 @@ __iocsrwr_d (unsigned long int _1, unsigned 
>>> int _2)
>>>   #ifdef __loongarch_frecipe
>>>   /* Assembly instruction format: fd, fj.  */
>>>   /* Data types in instruction templates:  SF, SF.  */
>>> -extern __inline void
>>> +extern __inline float
>>>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>>>   __frecipe_s (float _1)
>>>   {
>>> -  __builtin_loongarch_frecipe_s ((float) _1);
>>> +  return (float) __builtin_loongarch_frecipe_s ((float) _1);
>> I don't think the (float) conversion is needed.
>>
>>
> Indeed, this float conversion is unnecessary; I simply included it to 
> align with the definitions of other intrinsic functions.

This is generated in batches like vectors, so there will be such 
redundant symbol type conversion.

We will remove the redundant types later.
  
chenglulu Feb. 2, 2024, 2:15 a.m. UTC | #4
Pushed to r14-8723.

在 2024/1/24 下午5:19, Jiahao Xu 写道:
> gcc/ChangeLog:
>
> 	* config/loongarch/larchintrin.h
> 	(__frecipe_s): Update function return type.
> 	(__frecipe_d): Ditto.
> 	(__frsqrte_s): Ditto.
> 	(__frsqrte_d): Ditto.
>
> gcc/testsuite/ChangeLog:
>
> 	* gcc.target/loongarch/larch-frecipe-intrinsic.c: New test.
>
> diff --git a/gcc/config/loongarch/larchintrin.h b/gcc/config/loongarch/larchintrin.h
> index 7692415e04d..ff2c9f460ac 100644
> --- a/gcc/config/loongarch/larchintrin.h
> +++ b/gcc/config/loongarch/larchintrin.h
> @@ -336,38 +336,38 @@ __iocsrwr_d (unsigned long int _1, unsigned int _2)
>   #ifdef __loongarch_frecipe
>   /* Assembly instruction format: fd, fj.  */
>   /* Data types in instruction templates:  SF, SF.  */
> -extern __inline void
> +extern __inline float
>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>   __frecipe_s (float _1)
>   {
> -  __builtin_loongarch_frecipe_s ((float) _1);
> +  return (float) __builtin_loongarch_frecipe_s ((float) _1);
>   }
>   
>   /* Assembly instruction format: fd, fj.  */
>   /* Data types in instruction templates:  DF, DF.  */
> -extern __inline void
> +extern __inline double
>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>   __frecipe_d (double _1)
>   {
> -  __builtin_loongarch_frecipe_d ((double) _1);
> +  return (double) __builtin_loongarch_frecipe_d ((double) _1);
>   }
>   
>   /* Assembly instruction format: fd, fj.  */
>   /* Data types in instruction templates:  SF, SF.  */
> -extern __inline void
> +extern __inline float
>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>   __frsqrte_s (float _1)
>   {
> -  __builtin_loongarch_frsqrte_s ((float) _1);
> +  return (float) __builtin_loongarch_frsqrte_s ((float) _1);
>   }
>   
>   /* Assembly instruction format: fd, fj.  */
>   /* Data types in instruction templates:  DF, DF.  */
> -extern __inline void
> +extern __inline double
>   __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
>   __frsqrte_d (double _1)
>   {
> -  __builtin_loongarch_frsqrte_d ((double) _1);
> +  return (double) __builtin_loongarch_frsqrte_d ((double) _1);
>   }
>   #endif
>   
> diff --git a/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c b/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c
> new file mode 100644
> index 00000000000..6ce2bde0acf
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c
> @@ -0,0 +1,30 @@
> +/* Test intrinsics for frecipe.{s/d} and frsqrte.{s/d} instructions */
> +/* { dg-do compile } */
> +/* { dg-options "-mfrecipe -O2" } */
> +/* { dg-final { scan-assembler-times "test_frecipe_s:.*frecipe\\.s.*test_frecipe_s" 1 } } */
> +/* { dg-final { scan-assembler-times "test_frecipe_d:.*frecipe\\.d.*test_frecipe_d" 1 } } */
> +/* { dg-final { scan-assembler-times "test_frsqrte_s:.*frsqrte\\.s.*test_frsqrte_s" 1 } } */
> +/* { dg-final { scan-assembler-times "test_frsqrte_d:.*frsqrte\\.d.*test_frsqrte_d" 1 } } */
> +
> +#include <larchintrin.h>
> +
> +float
> +test_frecipe_s (float _1)
> +{
> +  return __frecipe_s (_1);
> +}
> +double
> +test_frecipe_d (double _1)
> +{
> +  return __frecipe_d (_1);
> +}
> +float
> +test_frsqrte_s (float _1)
> +{
> +  return __frsqrte_s (_1);
> +}
> +double
> +test_frsqrte_d (double _1)
> +{
> +  return __frsqrte_d (_1);
> +}
  

Patch

diff --git a/gcc/config/loongarch/larchintrin.h b/gcc/config/loongarch/larchintrin.h
index 7692415e04d..ff2c9f460ac 100644
--- a/gcc/config/loongarch/larchintrin.h
+++ b/gcc/config/loongarch/larchintrin.h
@@ -336,38 +336,38 @@  __iocsrwr_d (unsigned long int _1, unsigned int _2)
 #ifdef __loongarch_frecipe
 /* Assembly instruction format: fd, fj.  */
 /* Data types in instruction templates:  SF, SF.  */
-extern __inline void
+extern __inline float
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 __frecipe_s (float _1)
 {
-  __builtin_loongarch_frecipe_s ((float) _1);
+  return (float) __builtin_loongarch_frecipe_s ((float) _1);
 }
 
 /* Assembly instruction format: fd, fj.  */
 /* Data types in instruction templates:  DF, DF.  */
-extern __inline void
+extern __inline double
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 __frecipe_d (double _1)
 {
-  __builtin_loongarch_frecipe_d ((double) _1);
+  return (double) __builtin_loongarch_frecipe_d ((double) _1);
 }
 
 /* Assembly instruction format: fd, fj.  */
 /* Data types in instruction templates:  SF, SF.  */
-extern __inline void
+extern __inline float
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 __frsqrte_s (float _1)
 {
-  __builtin_loongarch_frsqrte_s ((float) _1);
+  return (float) __builtin_loongarch_frsqrte_s ((float) _1);
 }
 
 /* Assembly instruction format: fd, fj.  */
 /* Data types in instruction templates:  DF, DF.  */
-extern __inline void
+extern __inline double
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 __frsqrte_d (double _1)
 {
-  __builtin_loongarch_frsqrte_d ((double) _1);
+  return (double) __builtin_loongarch_frsqrte_d ((double) _1);
 }
 #endif
 
diff --git a/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c b/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c
new file mode 100644
index 00000000000..6ce2bde0acf
--- /dev/null
+++ b/gcc/testsuite/gcc.target/loongarch/larch-frecipe-intrinsic.c
@@ -0,0 +1,30 @@ 
+/* Test intrinsics for frecipe.{s/d} and frsqrte.{s/d} instructions */
+/* { dg-do compile } */
+/* { dg-options "-mfrecipe -O2" } */
+/* { dg-final { scan-assembler-times "test_frecipe_s:.*frecipe\\.s.*test_frecipe_s" 1 } } */
+/* { dg-final { scan-assembler-times "test_frecipe_d:.*frecipe\\.d.*test_frecipe_d" 1 } } */
+/* { dg-final { scan-assembler-times "test_frsqrte_s:.*frsqrte\\.s.*test_frsqrte_s" 1 } } */
+/* { dg-final { scan-assembler-times "test_frsqrte_d:.*frsqrte\\.d.*test_frsqrte_d" 1 } } */
+
+#include <larchintrin.h>
+
+float
+test_frecipe_s (float _1)
+{
+  return __frecipe_s (_1);
+}
+double
+test_frecipe_d (double _1)
+{
+  return __frecipe_d (_1);
+}
+float
+test_frsqrte_s (float _1)
+{
+  return __frsqrte_s (_1);
+}
+double
+test_frsqrte_d (double _1)
+{
+  return __frsqrte_d (_1);
+}