From 51147890383b89947c673ffd8d7c2cbd675261bd Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 11 Nov 2024 17:22:20 +0100 Subject: [PATCH] libgomp.c-c++-common/pr109062.c: Fix expected spin count for hybrid x86 On my system with E and P cores (hybrid) x86, the spincount is by default 1 and not 300000, cf. PR109812 and r14-4571-ge1e127de18dbee. Hence, this commit updates the expected value of the testcase to also accept omp_display_env showing "GOMP_SPINCOUNT = '1'" - but only for x86-64, which might be hybrid. libgomp/ChangeLog: * testsuite/libgomp.c-c++-common/pr109062.c: Update dg-output to also accept GOMP_SPINCOUNT = 1 for x86-64. --- libgomp/testsuite/libgomp.c-c++-common/pr109062.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libgomp/testsuite/libgomp.c-c++-common/pr109062.c b/libgomp/testsuite/libgomp.c-c++-common/pr109062.c index 5c7c287dafd..cb05c333e0e 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/pr109062.c +++ b/libgomp/testsuite/libgomp.c-c++-common/pr109062.c @@ -11,4 +11,8 @@ main () return 0; } -/* { dg-output ".*\\\[host] GOMP_SPINCOUNT = '300000'.*" { target native } } */ +/* On hybrid x86-64, i.e. with P and E cores, the default is GOMP_SPINCOUNT=1; + hence, handle either value; see PR109812. */ +/* { dg-output ".*\\\[host] GOMP_SPINCOUNT = '(?:300000|1)'.*" { target { native && { x86_64-*-* i?86-*-* } } } } */ + +/* { dg-output ".*\\\[host] GOMP_SPINCOUNT = '300000'.*" { target { native && { ! { x86_64-*-* i?86-*-* } } } } } */