From: Matthias Kretz Date: Mon, 22 May 2023 14:58:30 +0000 (+0200) Subject: libstdc++: Resolve -Wunused-variable warnings in stdx::simd and tests X-Git-Tag: basepoints/gcc-15~9064 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7129e82bed1bd4f513fc3c3f401721e2c96a865;p=thirdparty%2Fgcc.git libstdc++: Resolve -Wunused-variable warnings in stdx::simd and tests Signed-off-by: Matthias Kretz libstdc++-v3/ChangeLog: * include/experimental/bits/simd_builtin.h (_S_fpclassify): Move __infn into #ifdef'ed block. * testsuite/experimental/simd/tests/fpclassify.cc: Declare constants only when used. * testsuite/experimental/simd/tests/frexp.cc: Likewise. * testsuite/experimental/simd/tests/logarithm.cc: Likewise. * testsuite/experimental/simd/tests/trunc_ceil_floor.cc: Likewise. * testsuite/experimental/simd/tests/ldexp_scalbn_scalbln_modf.cc: Move totest and expect1 into #ifdef'ed block. --- diff --git a/libstdc++-v3/include/experimental/bits/simd_builtin.h b/libstdc++-v3/include/experimental/bits/simd_builtin.h index 4c008da26e0b..3d52bc6c96a3 100644 --- a/libstdc++-v3/include/experimental/bits/simd_builtin.h +++ b/libstdc++-v3/include/experimental/bits/simd_builtin.h @@ -2370,12 +2370,12 @@ template constexpr size_t _NI = sizeof(__xn) / sizeof(_I); _GLIBCXX_SIMD_USE_CONSTEXPR auto __minn = __vector_bitcast<_I>(__vector_broadcast<_NI>(__norm_min_v<_Tp>)); - _GLIBCXX_SIMD_USE_CONSTEXPR auto __infn - = __vector_bitcast<_I>(__vector_broadcast<_NI>(__infinity_v<_Tp>)); _GLIBCXX_SIMD_USE_CONSTEXPR auto __fp_normal = __vector_broadcast<_NI, _I>(FP_NORMAL); #if !__FINITE_MATH_ONLY__ + _GLIBCXX_SIMD_USE_CONSTEXPR auto __infn + = __vector_bitcast<_I>(__vector_broadcast<_NI>(__infinity_v<_Tp>)); _GLIBCXX_SIMD_USE_CONSTEXPR auto __fp_nan = __vector_broadcast<_NI, _I>(FP_NAN); _GLIBCXX_SIMD_USE_CONSTEXPR auto __fp_infinite diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/fpclassify.cc b/libstdc++-v3/testsuite/experimental/simd/tests/fpclassify.cc index 00c608f95304..13262df80ac7 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/fpclassify.cc +++ b/libstdc++-v3/testsuite/experimental/simd/tests/fpclassify.cc @@ -38,9 +38,11 @@ template { using T = typename V::value_type; using intv = std::experimental::fixed_size_simd; +#if __GCC_IEC_559 >= 2 constexpr T inf = std::__infinity_v; constexpr T denorm_min = std::__infinity_v; constexpr T nan = std::__quiet_NaN_v; +#endif constexpr T max = std::__finite_max_v; constexpr T norm_min = std::__norm_min_v; test_values( diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/frexp.cc b/libstdc++-v3/testsuite/experimental/simd/tests/frexp.cc index f6a47cedd13c..2c3f500beeee 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/frexp.cc +++ b/libstdc++-v3/testsuite/experimental/simd/tests/frexp.cc @@ -25,11 +25,17 @@ template { using int_v = std::experimental::fixed_size_simd; using T = typename V::value_type; +#if __GCC_IEC_559 >= 2 || defined __STDC_IEC_559__ constexpr auto denorm_min = std::__denorm_min_v; +#endif +#if __GCC_IEC_559 >= 2 constexpr auto norm_min = std::__norm_min_v; +#endif constexpr auto max = std::__finite_max_v; +#if defined __STDC_IEC_559__ constexpr auto nan = std::__quiet_NaN_v; constexpr auto inf = std::__infinity_v; +#endif test_values( {0, 0.25, 0.5, 1, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 32, 31, -0., -0.25, -0.5, -1, diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/ldexp_scalbn_scalbln_modf.cc b/libstdc++-v3/testsuite/experimental/simd/tests/ldexp_scalbn_scalbln_modf.cc index 0fb1338fc04e..56e275ee4bf1 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/ldexp_scalbn_scalbln_modf.cc +++ b/libstdc++-v3/testsuite/experimental/simd/tests/ldexp_scalbn_scalbln_modf.cc @@ -137,7 +137,6 @@ template if (modf_is_broken) return; V integral = {}; - const V totest = modf(input, &integral); auto&& expected = [&](const auto& v) -> std::pair { std::pair tmp = {}; using std::modf; @@ -149,8 +148,9 @@ template } return tmp; }; - const auto expect1 = expected(input); #ifdef __STDC_IEC_559__ + const V totest = modf(input, &integral); + const auto expect1 = expected(input); COMPARE(isnan(totest), isnan(expect1.first)) << "modf(" << input << ", iptr) = " << totest << " != " << expect1; COMPARE(isnan(integral), isnan(expect1.second)) diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/logarithm.cc b/libstdc++-v3/testsuite/experimental/simd/tests/logarithm.cc index 31ad1499e00a..a4a46c958006 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/logarithm.cc +++ b/libstdc++-v3/testsuite/experimental/simd/tests/logarithm.cc @@ -27,11 +27,13 @@ template vir::test::setFuzzyness(1); using T = typename V::value_type; +#ifdef __STDC_IEC_559__ constexpr T nan = std::__quiet_NaN_v; constexpr T inf = std::__infinity_v; constexpr T denorm_min = std::__denorm_min_v; - constexpr T norm_min = std::__norm_min_v; constexpr T min = std::__finite_min_v; +#endif + constexpr T norm_min = std::__norm_min_v; constexpr T max = std::__finite_max_v; test_values({1, 2, diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/trunc_ceil_floor.cc b/libstdc++-v3/testsuite/experimental/simd/tests/trunc_ceil_floor.cc index ecbc14816002..f2ef8088f73c 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/trunc_ceil_floor.cc +++ b/libstdc++-v3/testsuite/experimental/simd/tests/trunc_ceil_floor.cc @@ -24,8 +24,10 @@ template test() { using T = typename V::value_type; +#ifdef __STDC_IEC_559__ constexpr T inf = std::__infinity_v; constexpr T denorm_min = std::__denorm_min_v; +#endif constexpr T norm_min = std::__norm_min_v; constexpr T max = std::__finite_max_v; constexpr T min = std::__finite_min_v;