From c0009a3b986a5e07a187aa9533e554a184fc1882 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 18 Mar 2022 11:02:13 +0100 Subject: [PATCH] openmp: Fix up gomp_affinity_init_numa_domains On Thu, Nov 11, 2021 at 02:14:05PM +0100, Thomas Schwinge wrote: > There appears to be yet another issue: there still are quite a number of > 'FAIL: libgomp.c/places-10.c execution test' reports on > . Also in my testing testing, on a system > where '/sys/devices/system/node/online' contains '0-1', I get a FAIL: > > [...] > OPENMP DISPLAY ENVIRONMENT BEGIN > _OPENMP = '201511' > OMP_DYNAMIC = 'FALSE' > OMP_NESTED = 'FALSE' > OMP_NUM_THREADS = '8' > OMP_SCHEDULE = 'DYNAMIC' > OMP_PROC_BIND = 'TRUE' > OMP_PLACES = '{0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30},{FAIL: libgomp.c/places-10.c execution test I've finally managed to debug this (by dumping used /sys/ files from an affected system in Fedora build system, replacing /sys/ with /tmp/ in gcc sources and populating there those files), I think following patch ought to fix it. 2022-03-18 Jakub Jelinek * config/linux/affinity.c (gomp_affinity_init_numa_domains): Move seen variable next to pl variable. --- libgomp/config/linux/affinity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c index 65d7f96..5de02b0 100644 --- a/libgomp/config/linux/affinity.c +++ b/libgomp/config/linux/affinity.c @@ -411,11 +411,11 @@ gomp_affinity_init_numa_domains (unsigned long count, cpu_set_t *copy, { char *p = line; void *pl = NULL; + bool seen = false; while (*p && *p != '\n') { unsigned long first, last; - bool seen = false; errno = 0; first = strtoul (p, &end, 10); -- 2.7.4