From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 15 Oct 2021 14:25:25 +0000 (+0200)
Subject: openmp: Fix up handling of OMP_PLACES=threads(1)
X-Git-Tag: releases/gcc-9.5.0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be2c01c63459e21f8a6da1e9c9933fdadd76eee5;p=thirdparty%2Fgcc.git

openmp: Fix up handling of OMP_PLACES=threads(1)

When writing the places-*.c tests, I've noticed that we mishandle threads
abstract name with specified num-places if num-places isn't a multiple of
number of hw threads in a core.  It then happily ignores the maximum count
and overwrites for the remaining hw threads in a core further places that
haven't been allocated.

2021-10-15  Jakub Jelinek  <jakub@redhat.com>

	* config/linux/affinity.c (gomp_affinity_init_level_1): For level 1
	after creating count places clean up and return immediately.
	* testsuite/libgomp.c/places-6.c: New test.
	* testsuite/libgomp.c/places-7.c: New test.
	* testsuite/libgomp.c/places-8.c: New test.

(cherry picked from commit 4764049dd620affcd3e2658dc7f03a6616370a29)
---

diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c
index 278101e31f29..15f58f71d8dc 100644
--- a/libgomp/config/linux/affinity.c
+++ b/libgomp/config/linux/affinity.c
@@ -281,8 +281,13 @@ gomp_affinity_init_level_1 (int level, int this_level, unsigned long count,
 		      if (gomp_affinity_add_cpus (pl, first, 1, 0, true))
 			{
 			  CPU_CLR_S (first, gomp_cpuset_size, copy);
-			  if (level == 1)
-			    gomp_places_list_len++;
+			  if (level == 1
+			      && ++gomp_places_list_len >= count)
+			    {
+			      fclose (f);
+			      free (line);
+			      return;
+			    }
 			}
 		    }
 		if (*p == ',')
diff --git a/libgomp/testsuite/libgomp.c/places-6.c b/libgomp/testsuite/libgomp.c/places-6.c
new file mode 100644
index 000000000000..831034601ebf
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-6.c
@@ -0,0 +1,8 @@
+/* { dg-set-target-env-var OMP_PLACES "threads(1)" } */
+/* { dg-set-target-env-var OMP_DISPLAY_ENV "true" } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/libgomp/testsuite/libgomp.c/places-7.c b/libgomp/testsuite/libgomp.c/places-7.c
new file mode 100644
index 000000000000..f0a77f41defc
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-7.c
@@ -0,0 +1,8 @@
+/* { dg-set-target-env-var OMP_PLACES "cores(1)" } */
+/* { dg-set-target-env-var OMP_DISPLAY_ENV "true" } */
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/libgomp/testsuite/libgomp.c/places-8.c b/libgomp/testsuite/libgomp.c/places-8.c
new file mode 100644
index 000000000000..31c698337e45
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-8.c
@@ -0,0 +1,8 @@
+/* { dg-set-target-env-var OMP_PLACES "sockets(1)" } */
+/* { dg-set-target-env-var OMP_DISPLAY_ENV "true" } */
+
+int
+main ()
+{
+  return 0;
+}