[fix-arm-support] eemumu/ggtt.mad: use higher tolerance for constexpr_tan tests (#2) on aarch64 (with DanieleM)

valassi · valassi · commit bcbdac70ca12 · 2025-11-14T17:39:05.000+01:00
diff --git a/epochX/cudacpp/ee_mumu.mad/SubProcesses/testmisc.cc b/epochX/cudacpp/ee_mumu.mad/SubProcesses/testmisc.cc
@@ -462,14 +462,16 @@ TEST( XTESTID( MG_EPOCH_PROCESS_ID ), testmisc )
         << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
       EXPECT_NEAR( std::cos( x ), constexpr_cos( x ), std::max( std::abs( std::cos( x ) * tolerance ), 3E-15 ) )
         << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
+#ifndef __aarch64__
       if( !RUNNING_ON_VALGRIND )
       {
         EXPECT_NEAR( std::tan( x ), constexpr_tan( x ), std::max( std::abs( std::tan( x ) * tolerance ), 3E-15 ) )
           << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
       }
       else
+#endif
       {
-        // Higher tolerance when running through valgrind #906
+        // Higher tolerance when running through valgrind #906 (or on aarch64 #1064)
         const long double ctanx = constexpr_tan( x );
         const long double taninf = 4E14; // declare tan(x) as "infinity if above this threshold
         if( ctanx > -taninf && ctanx < taninf )
diff --git a/epochX/cudacpp/gg_ttgg.mad/SubProcesses/testmisc.cc b/epochX/cudacpp/gg_ttgg.mad/SubProcesses/testmisc.cc
@@ -462,14 +462,16 @@ TEST( XTESTID( MG_EPOCH_PROCESS_ID ), testmisc )
         << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
       EXPECT_NEAR( std::cos( x ), constexpr_cos( x ), std::max( std::abs( std::cos( x ) * tolerance ), 3E-15 ) )
         << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
+#ifndef __aarch64__
       if( !RUNNING_ON_VALGRIND )
       {
         EXPECT_NEAR( std::tan( x ), constexpr_tan( x ), std::max( std::abs( std::tan( x ) * tolerance ), 3E-15 ) )
           << std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );
       }
       else
+#endif
       {
-        // Higher tolerance when running through valgrind #906
+        // Higher tolerance when running through valgrind #906 (or on aarch64 #1064)
         const long double ctanx = constexpr_tan( x );
         const long double taninf = 4E14; // declare tan(x) as "infinity if above this threshold
         if( ctanx > -taninf && ctanx < taninf )

Original file line number	Diff line number	Diff line change
`@@ -462,14 +462,16 @@ TEST( XTESTID( MG_EPOCH_PROCESS_ID ), testmisc )`
`462`	`462`	`<< std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );`
`463`	`463`	`EXPECT_NEAR( std::cos( x ), constexpr_cos( x ), std::max( std::abs( std::cos( x ) * tolerance ), 3E-15 ) )`
`464`	`464`	`<< std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );`
	`465`	`+#ifndef __aarch64__`
`465`	`466`	`if( !RUNNING_ON_VALGRIND )`
`466`	`467`	`{`
`467`	`468`	`EXPECT_NEAR( std::tan( x ), constexpr_tan( x ), std::max( std::abs( std::tan( x ) * tolerance ), 3E-15 ) )`
`468`	`469`	`<< std::setprecision( 40 ) << "x=" << x << ", x(0to2Pi)=" << mapIn0to2Pi( x ) << ",\n istep=" << istep << ", distance4=" << distance4( x );`
`469`	`470`	`}`
`470`	`471`	`else`
	`472`	`+#endif`
`471`	`473`	`{`
`472`		`- // Higher tolerance when running through valgrind #906`
	`474`	`+ // Higher tolerance when running through valgrind #906 (or on aarch64 #1064)`
`473`	`475`	`const long double ctanx = constexpr_tan( x );`
`474`	`476`	`const long double taninf = 4E14; // declare tan(x) as "infinity if above this threshold`
`475`	`477`	`if( ctanx > -taninf && ctanx < taninf )`