From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 15 Oct 2021 21:31:13 +0000 (+0200)
Subject: openmp: Fix up handling of OMP_PLACES=threads(1)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=372e0273080638bfa3b02e30558581a1b82f1500;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.
	* testsuite/libgomp.c/places-9.c: New test.
	* testsuite/libgomp.c/places-10.c: New test.

(cherry picked from commit 4764049dd620affcd3e2658dc7f03a6616370a29)
---

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index cb05c2c11f28..f7303f491cf0 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,16 @@
+2021-10-15  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from master:
+	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.
+	* testsuite/libgomp.c/places-9.c: New test.
+	* testsuite/libgomp.c/places-10.c: New test.
+
 2021-10-15  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c
index 82981b654723..69e72a8d1413 100644
--- a/libgomp/config/linux/affinity.c
+++ b/libgomp/config/linux/affinity.c
@@ -338,8 +338,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-10.c b/libgomp/testsuite/libgomp.c/places-10.c
new file mode 100644
index 000000000000..7746b15cb444
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-10.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "numa_domains(1)" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}
diff --git a/libgomp/testsuite/libgomp.c/places-6.c b/libgomp/testsuite/libgomp.c/places-6.c
new file mode 100644
index 000000000000..bf552fbe2d4f
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-6.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "threads(1)" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  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..07f3d97e7b2b
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-7.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "cores(1)" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  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..ca7d55bc7a84
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-8.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "sockets(1)" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}
diff --git a/libgomp/testsuite/libgomp.c/places-9.c b/libgomp/testsuite/libgomp.c/places-9.c
new file mode 100644
index 000000000000..627cdcea5381
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-9.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "ll_caches(1)" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}