openmp: Add support for OMP_PLACES=ll_caches

This patch implements support for ll_caches abstract name in OMP_PLACES,
which stands for places where logical cpus in each place share the last
level cache.

This seems to work fine for me on x86 and kernel sources show that it is
in common code, but on some machines on CompileFarm the files I'm using,
i.e.
/sys/devices/system/cpu/cpuN/cache/indexN/level
/sys/devices/system/cpu/cpuN/cache/indexN/shared_cpu_list
don't exist, is that because they have too old kernel and newer kernels
are fine or should I implement some fallback methods (which)?
E.g. on gcc112.fsffrance.org I see just shared_cpu_map and not shared_cpu_list
(with shared_cpu_map being harder to parse) and on another box I didn't even
see the cache subdirectories.

Way to test this is
OMP_PLACES=ll_caches OMP_DISPLAY_ENV=true LD_PRELOAD=.libs/libgomp.so.1 /bin/true
and see what it prints on OMP_PLACES line.

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

	* env.c (parse_places_var): Handle ll_caches as level 4.
	* config/linux/affinity.c (gomp_affinity_find_last_cache_level): New
	function.
	(gomp_affinity_init_level_1): Handle level 4 as logical cpus sharing
	last level cache.
	(gomp_affinity_init_level): Likewise.
	* testsuite/libgomp.c/places-1.c: New test.
	* testsuite/libgomp.c/places-2.c: New test.
	* testsuite/libgomp.c/places-3.c: New test.
	* testsuite/libgomp.c/places-4.c: New test.

(cherry picked from commit 5809be05a2813f2a95d9787f388185fa31fbf3a2)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index f014b511ad99ce0f37163186e3d89bf17bc56b2e..af41b92934831da1248bf7caf2788636978633d1 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,19 @@
+2021-10-15  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backported from master:
+       2021-10-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * env.c (parse_places_var): Handle ll_caches as level 4.
+       * config/linux/affinity.c (gomp_affinity_find_last_cache_level): New
+       function.
+       (gomp_affinity_init_level_1): Handle level 4 as logical cpus sharing
+       last level cache.
+       (gomp_affinity_init_level): Likewise.
+       * testsuite/libgomp.c/places-1.c: New test.
+       * testsuite/libgomp.c/places-2.c: New test.
+       * testsuite/libgomp.c/places-3.c: New test.
+       * testsuite/libgomp.c/places-4.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 1b636c613704079a894d28156de03a005e8cf561..32415537853c2b12e8430745bf8387586fdcf79d 100644 (file)
--- a/libgomp/config/linux/affinity.c
+++ b/libgomp/config/linux/affinity.c
@@ -223,6 +223,46 @@ gomp_affinity_finalize_place_list (bool quiet)
   return true;
 }
 
+/* Find the index of the last level cache.  We assume the index
+   of the last level cache is the same for all logical CPUs.
+   Also, if there are multiple caches with the same highest level,
+   assume they have the same shared_cpu_list and pick the last one
+   from them (highest index number).  */
+
+static int
+gomp_affinity_find_last_cache_level (char *name, size_t prefix_len,
+                                    unsigned long cpu)
+{
+  int ret = -1;
+  unsigned long maxval = 0;
+  char *line = NULL;
+  size_t linelen = 0;
+  FILE *f;
+
+  for (int l = 0; l < 128; l++)
+    {
+      sprintf (name + prefix_len, "%lu/cache/index%u/level", cpu, l);
+      f = fopen (name, "r");
+      if (f == NULL)
+       break;
+      if (getline (&line, &linelen, f) > 0)
+       {
+         unsigned long val;
+         char *p;
+         errno = 0;
+         val = strtoul (line, &p, 10);
+         if (!errno && val >= maxval)
+           {
+             ret = l;
+             maxval = val;
+           }
+       }
+      fclose (f);
+    }
+  free (line);
+  return ret;
+}
+
 static void
 gomp_affinity_init_level_1 (int level, int this_level, unsigned long count,
                            cpu_set_t *copy, char *name, bool quiet)
@@ -232,12 +272,29 @@ gomp_affinity_init_level_1 (int level, int this_level, unsigned long count,
   char *line = NULL;
   size_t linelen = 0;
   unsigned long i, max = 8 * gomp_cpuset_size;
+  int init = -1;
 
   for (i = 0; i < max && gomp_places_list_len < count; i++)
     if (CPU_ISSET_S (i, gomp_cpuset_size, copy))
       {
-       sprintf (name + prefix_len, "%lu/topology/%s_siblings_list",
-                i, this_level == 3 ? "core" : "thread");
+       if (level == 4)
+         {
+           if (init == -1)
+             {
+               init = gomp_affinity_find_last_cache_level (name, prefix_len,
+                                                           i);
+               if (init == -1)
+                 {
+                   CPU_CLR_S (i, gomp_cpuset_size, copy);
+                   continue;
+                 }
+               sprintf (name + prefix_len,
+                        "%lu/cache/index%u/shared_cpu_list", i, init);
+             }
+         }
+       else
+         sprintf (name + prefix_len, "%lu/topology/%s_siblings_list",
+                  i, this_level == 3 ? "core" : "thread");
        f = fopen (name, "r");
        if (f == NULL)
          {
@@ -302,7 +359,7 @@ bool
 gomp_affinity_init_level (int level, unsigned long count, bool quiet)
 {
   char name[sizeof ("/sys/devices/system/cpu/cpu/topology/"
-                   "thread_siblings_list") + 3 * sizeof (unsigned long)];
+                   "thread_siblings_list") + 6 * sizeof (unsigned long)];
   cpu_set_t *copy;
 
   if (gomp_cpusetp)
@@ -320,7 +377,8 @@ gomp_affinity_init_level (int level, unsigned long count, bool quiet)
   copy = gomp_alloca (gomp_cpuset_size);
   strcpy (name, "/sys/devices/system/cpu/cpu");
   memcpy (copy, gomp_cpusetp, gomp_cpuset_size);
-  gomp_affinity_init_level_1 (level, 3, count, copy, name, quiet);
+  gomp_affinity_init_level_1 (level, level > 3 ? level : 3, count, copy, name,
+                             quiet);
   if (gomp_places_list_len == 0)
     {
       if (!quiet)

diff --git a/libgomp/env.c b/libgomp/env.c
index de45c25d540ef02eca74c5e6110ab440d5f8d8d1..38903c76b344fdcb774986af9d450cfd62ca03a0 100644 (file)
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -696,6 +696,11 @@ parse_places_var (const char *name, bool ignore)
       env += 7;
       level = 3;
     }
+  else if (strncasecmp (env, "ll_caches", 9) == 0)
+    {
+      env += 9;
+      level = 4;
+    }
   if (level)
     {
       count = ULONG_MAX;

diff --git a/libgomp/testsuite/libgomp.c/places-1.c b/libgomp/testsuite/libgomp.c/places-1.c
new file mode 100644 (file)
index 0000000..1d7c467
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-1.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "threads" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/places-2.c b/libgomp/testsuite/libgomp.c/places-2.c
new file mode 100644 (file)
index 0000000..4513eb6
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-2.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "cores" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/places-3.c b/libgomp/testsuite/libgomp.c/places-3.c
new file mode 100644 (file)
index 0000000..ddd994a
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-3.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "sockets" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/places-4.c b/libgomp/testsuite/libgomp.c/places-4.c
new file mode 100644 (file)
index 0000000..9e3d3e1
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/places-4.c
@@ -0,0 +1,10 @@
+/* { dg-set-target-env-var OMP_PLACES "ll_caches" } */
+
+#include <omp.h>
+
+int
+main ()
+{
+  omp_display_env (0);
+  return 0;
+}