c++, libstdc++: Add typeinfo for _Float{16,32,64,128,32x,64x} and __bf16 types [PR108075]

Message ID Y5hImCyw/3IIhGuT@tucnak
State Unresolved
Headers
Series c++, libstdc++: Add typeinfo for _Float{16,32,64,128,32x,64x} and __bf16 types [PR108075] |

Checks

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

Commit Message

Jakub Jelinek Dec. 13, 2022, 9:40 a.m. UTC
  Hi!

The following patch adds typeinfos for the extended floating point
types and _Float{32,64}x.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

2022-12-13  Jakub Jelinek  <jakub@redhat.com>

	PR libstdc++/108075
gcc/cp/
	* rtti.cc (emit_support_tinfos): Add pointers to
	{bfloat16,float{16,32,64,128,32x,64x,128x}}_type_node to fundamentals
	array.
gcc/testsuite/
	* g++.dg/cpp23/ext-floating13.C: New test.
libstdc++-v3/
	* config/abi/pre/gnu.ver (CXXABI_1.3.14): Export
	_ZTIDF[0-9]*[_bx], _ZTIPDF[0-9]*[_bx] and _ZTIPKDF[0-9]*[_bx].
	* testsuite/util/testsuite_abi.cc (check_version): Handle
	CXXABI_1.3.14.


	Jakub
  

Comments

Jonathan Wakely Dec. 13, 2022, 9:51 a.m. UTC | #1
On Tue, 13 Dec 2022 at 09:40, Jakub Jelinek wrote:
>
> Hi!
>
> The following patch adds typeinfos for the extended floating point
> types and _Float{32,64}x.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

The libstdc++ parts look good, thanks.


> 2022-12-13  Jakub Jelinek  <jakub@redhat.com>
>
>         PR libstdc++/108075
> gcc/cp/
>         * rtti.cc (emit_support_tinfos): Add pointers to
>         {bfloat16,float{16,32,64,128,32x,64x,128x}}_type_node to fundamentals
>         array.
> gcc/testsuite/
>         * g++.dg/cpp23/ext-floating13.C: New test.
> libstdc++-v3/
>         * config/abi/pre/gnu.ver (CXXABI_1.3.14): Export
>         _ZTIDF[0-9]*[_bx], _ZTIPDF[0-9]*[_bx] and _ZTIPKDF[0-9]*[_bx].
>         * testsuite/util/testsuite_abi.cc (check_version): Handle
>         CXXABI_1.3.14.
>
> --- gcc/cp/rtti.cc.jj   2022-10-17 12:29:33.519016406 +0200
> +++ gcc/cp/rtti.cc      2022-12-12 15:23:48.244190755 +0100
> @@ -1603,7 +1603,9 @@ emit_support_tinfos (void)
>      &long_long_integer_type_node, &long_long_unsigned_type_node,
>      &float_type_node, &double_type_node, &long_double_type_node,
>      &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node,
> -    &nullptr_type_node,
> +    &bfloat16_type_node, &float16_type_node, &float32_type_node,
> +    &float64_type_node, &float128_type_node, &float32x_type_node,
> +    &float64x_type_node, &float128x_type_node, &nullptr_type_node,
>      0
>    };
>    int ix;
> --- gcc/testsuite/g++.dg/cpp23/ext-floating13.C.jj      2022-12-12 15:38:51.357009408 +0100
> +++ gcc/testsuite/g++.dg/cpp23/ext-floating13.C 2022-12-12 15:39:04.568816597 +0100
> @@ -0,0 +1,35 @@
> +// P1467R9 - Extended floating-point types and standard names.
> +// { dg-do link { target c++23 } }
> +// { dg-options "" }
> +
> +#include <typeinfo>
> +
> +#ifdef __STDCPP_FLOAT16_T__
> +const std::type_info &a = typeid(decltype(0.0f16));
> +#endif
> +#ifdef __STDCPP_BFLOAT16_T__
> +const std::type_info &b = typeid(decltype(0.0bf16));
> +#endif
> +#ifdef __STDCPP_FLOAT32_T__
> +const std::type_info &c = typeid(decltype(0.0f32));
> +#endif
> +#ifdef __STDCPP_FLOAT64_T__
> +const std::type_info &d = typeid(decltype(0.0f64));
> +#endif
> +#ifdef __STDCPP_FLOAT128_T__
> +const std::type_info &e = typeid(decltype(0.0f128));
> +#endif
> +#ifdef __FLT32X_MAX__
> +const std::type_info &f = typeid(decltype(0.0f32x));
> +#endif
> +#ifdef __FLT64X_MAX__
> +const std::type_info &g = typeid(decltype(0.0f64x));
> +#endif
> +#ifdef __FLT128X_MAX__
> +const std::type_info &h = typeid(decltype(0.0f128x));
> +#endif
> +
> +int
> +main ()
> +{
> +}
> --- libstdc++-v3/config/abi/pre/gnu.ver.jj      2022-11-11 08:15:45.646183974 +0100
> +++ libstdc++-v3/config/abi/pre/gnu.ver 2022-12-12 15:34:08.178142084 +0100
> @@ -2794,6 +2794,16 @@ CXXABI_1.3.13 {
>
>  } CXXABI_1.3.12;
>
> +CXXABI_1.3.14 {
> +
> +    # typeinfo for _Float{16,32,64,128,32x,64x,128x} and
> +    # __bf16
> +    _ZTIDF[0-9]*[_bx];
> +    _ZTIPDF[0-9]*[_bx];
> +    _ZTIPKDF[0-9]*[_bx];
> +
> +} CXXABI_1.3.13;
> +
>  # Symbols in the support library (libsupc++) supporting transactional memory.
>  CXXABI_TM_1 {
>
> --- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj     2022-09-12 11:30:14.224870022 +0200
> +++ libstdc++-v3/testsuite/util/testsuite_abi.cc        2022-12-12 15:46:41.036156477 +0100
> @@ -230,6 +230,7 @@ check_version(symbol& test, bool added)
>        known_versions.push_back("CXXABI_1.3.11");
>        known_versions.push_back("CXXABI_1.3.12");
>        known_versions.push_back("CXXABI_1.3.13");
> +      known_versions.push_back("CXXABI_1.3.14");
>        known_versions.push_back("CXXABI_IEEE128_1.3.13");
>        known_versions.push_back("CXXABI_TM_1");
>        known_versions.push_back("CXXABI_FLOAT128");
> @@ -251,7 +252,7 @@ check_version(symbol& test, bool added)
>        bool latestp = (test.version_name == "GLIBCXX_3.4.31"
>           // XXX remove next line when baselines have been regenerated.
>                      || test.version_name == "GLIBCXX_IEEE128_3.4.30"
> -                    || test.version_name == "CXXABI_1.3.13"
> +                    || test.version_name == "CXXABI_1.3.14"
>                      || test.version_name == "CXXABI_FLOAT128"
>                      || test.version_name == "CXXABI_TM_1");
>        if (added && !latestp)
>
>         Jakub
>
  
Jason Merrill Dec. 15, 2022, 2:56 p.m. UTC | #2
On 12/13/22 04:40, Jakub Jelinek wrote:
> Hi!
> 
> The following patch adds typeinfos for the extended floating point
> types and _Float{32,64}x.
> 
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

OK.

> 2022-12-13  Jakub Jelinek  <jakub@redhat.com>
> 
> 	PR libstdc++/108075
> gcc/cp/
> 	* rtti.cc (emit_support_tinfos): Add pointers to
> 	{bfloat16,float{16,32,64,128,32x,64x,128x}}_type_node to fundamentals
> 	array.
> gcc/testsuite/
> 	* g++.dg/cpp23/ext-floating13.C: New test.
> libstdc++-v3/
> 	* config/abi/pre/gnu.ver (CXXABI_1.3.14): Export
> 	_ZTIDF[0-9]*[_bx], _ZTIPDF[0-9]*[_bx] and _ZTIPKDF[0-9]*[_bx].
> 	* testsuite/util/testsuite_abi.cc (check_version): Handle
> 	CXXABI_1.3.14.
> 
> --- gcc/cp/rtti.cc.jj	2022-10-17 12:29:33.519016406 +0200
> +++ gcc/cp/rtti.cc	2022-12-12 15:23:48.244190755 +0100
> @@ -1603,7 +1603,9 @@ emit_support_tinfos (void)
>       &long_long_integer_type_node, &long_long_unsigned_type_node,
>       &float_type_node, &double_type_node, &long_double_type_node,
>       &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node,
> -    &nullptr_type_node,
> +    &bfloat16_type_node, &float16_type_node, &float32_type_node,
> +    &float64_type_node, &float128_type_node, &float32x_type_node,
> +    &float64x_type_node, &float128x_type_node, &nullptr_type_node,
>       0
>     };
>     int ix;
> --- gcc/testsuite/g++.dg/cpp23/ext-floating13.C.jj	2022-12-12 15:38:51.357009408 +0100
> +++ gcc/testsuite/g++.dg/cpp23/ext-floating13.C	2022-12-12 15:39:04.568816597 +0100
> @@ -0,0 +1,35 @@
> +// P1467R9 - Extended floating-point types and standard names.
> +// { dg-do link { target c++23 } }
> +// { dg-options "" }
> +
> +#include <typeinfo>
> +
> +#ifdef __STDCPP_FLOAT16_T__
> +const std::type_info &a = typeid(decltype(0.0f16));
> +#endif
> +#ifdef __STDCPP_BFLOAT16_T__
> +const std::type_info &b = typeid(decltype(0.0bf16));
> +#endif
> +#ifdef __STDCPP_FLOAT32_T__
> +const std::type_info &c = typeid(decltype(0.0f32));
> +#endif
> +#ifdef __STDCPP_FLOAT64_T__
> +const std::type_info &d = typeid(decltype(0.0f64));
> +#endif
> +#ifdef __STDCPP_FLOAT128_T__
> +const std::type_info &e = typeid(decltype(0.0f128));
> +#endif
> +#ifdef __FLT32X_MAX__
> +const std::type_info &f = typeid(decltype(0.0f32x));
> +#endif
> +#ifdef __FLT64X_MAX__
> +const std::type_info &g = typeid(decltype(0.0f64x));
> +#endif
> +#ifdef __FLT128X_MAX__
> +const std::type_info &h = typeid(decltype(0.0f128x));
> +#endif
> +
> +int
> +main ()
> +{
> +}
> --- libstdc++-v3/config/abi/pre/gnu.ver.jj	2022-11-11 08:15:45.646183974 +0100
> +++ libstdc++-v3/config/abi/pre/gnu.ver	2022-12-12 15:34:08.178142084 +0100
> @@ -2794,6 +2794,16 @@ CXXABI_1.3.13 {
>   
>   } CXXABI_1.3.12;
>   
> +CXXABI_1.3.14 {
> +
> +    # typeinfo for _Float{16,32,64,128,32x,64x,128x} and
> +    # __bf16
> +    _ZTIDF[0-9]*[_bx];
> +    _ZTIPDF[0-9]*[_bx];
> +    _ZTIPKDF[0-9]*[_bx];
> +
> +} CXXABI_1.3.13;
> +
>   # Symbols in the support library (libsupc++) supporting transactional memory.
>   CXXABI_TM_1 {
>   
> --- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj	2022-09-12 11:30:14.224870022 +0200
> +++ libstdc++-v3/testsuite/util/testsuite_abi.cc	2022-12-12 15:46:41.036156477 +0100
> @@ -230,6 +230,7 @@ check_version(symbol& test, bool added)
>         known_versions.push_back("CXXABI_1.3.11");
>         known_versions.push_back("CXXABI_1.3.12");
>         known_versions.push_back("CXXABI_1.3.13");
> +      known_versions.push_back("CXXABI_1.3.14");
>         known_versions.push_back("CXXABI_IEEE128_1.3.13");
>         known_versions.push_back("CXXABI_TM_1");
>         known_versions.push_back("CXXABI_FLOAT128");
> @@ -251,7 +252,7 @@ check_version(symbol& test, bool added)
>         bool latestp = (test.version_name == "GLIBCXX_3.4.31"
>   	  // XXX remove next line when baselines have been regenerated.
>   		     || test.version_name == "GLIBCXX_IEEE128_3.4.30"
> -		     || test.version_name == "CXXABI_1.3.13"
> +		     || test.version_name == "CXXABI_1.3.14"
>   		     || test.version_name == "CXXABI_FLOAT128"
>   		     || test.version_name == "CXXABI_TM_1");
>         if (added && !latestp)
> 
> 	Jakub
>
  

Patch

--- gcc/cp/rtti.cc.jj	2022-10-17 12:29:33.519016406 +0200
+++ gcc/cp/rtti.cc	2022-12-12 15:23:48.244190755 +0100
@@ -1603,7 +1603,9 @@  emit_support_tinfos (void)
     &long_long_integer_type_node, &long_long_unsigned_type_node,
     &float_type_node, &double_type_node, &long_double_type_node,
     &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node,
-    &nullptr_type_node,
+    &bfloat16_type_node, &float16_type_node, &float32_type_node,
+    &float64_type_node, &float128_type_node, &float32x_type_node,
+    &float64x_type_node, &float128x_type_node, &nullptr_type_node,
     0
   };
   int ix;
--- gcc/testsuite/g++.dg/cpp23/ext-floating13.C.jj	2022-12-12 15:38:51.357009408 +0100
+++ gcc/testsuite/g++.dg/cpp23/ext-floating13.C	2022-12-12 15:39:04.568816597 +0100
@@ -0,0 +1,35 @@ 
+// P1467R9 - Extended floating-point types and standard names.
+// { dg-do link { target c++23 } }
+// { dg-options "" }
+
+#include <typeinfo>
+
+#ifdef __STDCPP_FLOAT16_T__
+const std::type_info &a = typeid(decltype(0.0f16));
+#endif
+#ifdef __STDCPP_BFLOAT16_T__
+const std::type_info &b = typeid(decltype(0.0bf16));
+#endif
+#ifdef __STDCPP_FLOAT32_T__
+const std::type_info &c = typeid(decltype(0.0f32));
+#endif
+#ifdef __STDCPP_FLOAT64_T__
+const std::type_info &d = typeid(decltype(0.0f64));
+#endif
+#ifdef __STDCPP_FLOAT128_T__
+const std::type_info &e = typeid(decltype(0.0f128));
+#endif
+#ifdef __FLT32X_MAX__
+const std::type_info &f = typeid(decltype(0.0f32x));
+#endif
+#ifdef __FLT64X_MAX__
+const std::type_info &g = typeid(decltype(0.0f64x));
+#endif
+#ifdef __FLT128X_MAX__
+const std::type_info &h = typeid(decltype(0.0f128x));
+#endif
+
+int
+main ()
+{
+}
--- libstdc++-v3/config/abi/pre/gnu.ver.jj	2022-11-11 08:15:45.646183974 +0100
+++ libstdc++-v3/config/abi/pre/gnu.ver	2022-12-12 15:34:08.178142084 +0100
@@ -2794,6 +2794,16 @@  CXXABI_1.3.13 {
 
 } CXXABI_1.3.12;
 
+CXXABI_1.3.14 {
+
+    # typeinfo for _Float{16,32,64,128,32x,64x,128x} and
+    # __bf16
+    _ZTIDF[0-9]*[_bx];
+    _ZTIPDF[0-9]*[_bx];
+    _ZTIPKDF[0-9]*[_bx];
+
+} CXXABI_1.3.13;
+
 # Symbols in the support library (libsupc++) supporting transactional memory.
 CXXABI_TM_1 {
 
--- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj	2022-09-12 11:30:14.224870022 +0200
+++ libstdc++-v3/testsuite/util/testsuite_abi.cc	2022-12-12 15:46:41.036156477 +0100
@@ -230,6 +230,7 @@  check_version(symbol& test, bool added)
       known_versions.push_back("CXXABI_1.3.11");
       known_versions.push_back("CXXABI_1.3.12");
       known_versions.push_back("CXXABI_1.3.13");
+      known_versions.push_back("CXXABI_1.3.14");
       known_versions.push_back("CXXABI_IEEE128_1.3.13");
       known_versions.push_back("CXXABI_TM_1");
       known_versions.push_back("CXXABI_FLOAT128");
@@ -251,7 +252,7 @@  check_version(symbol& test, bool added)
       bool latestp = (test.version_name == "GLIBCXX_3.4.31"
 	  // XXX remove next line when baselines have been regenerated.
 		     || test.version_name == "GLIBCXX_IEEE128_3.4.30"
-		     || test.version_name == "CXXABI_1.3.13"
+		     || test.version_name == "CXXABI_1.3.14"
 		     || test.version_name == "CXXABI_FLOAT128"
 		     || test.version_name == "CXXABI_TM_1");
       if (added && !latestp)