Clarify/verify OpenMP 'omp_calloc' zero-initialization for pinned memory

Clarification for og12 commit ab7520b3b4cd9fdabfd63652badde478955bd3b5
"libgomp: pinned memory".  No functional change.

	libgomp/
	* config/linux/allocator.c (linux_memspace_alloc)
	(linux_memspace_calloc): Clarify zero-initialization for pinned
	memory.
	* testsuite/libgomp.c/alloc-pinned-1.c: Verify zero-initialization
	for pinned memory.
	* testsuite/libgomp.c/alloc-pinned-2.c: Likewise.
	* testsuite/libgomp.c/alloc-pinned-3.c: Likewise.
	* testsuite/libgomp.c/alloc-pinned-4.c: Likewise.
	* testsuite/libgomp.c/alloc-pinned-5.c: Likewise.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 1c4b1833c0b5d6e8a9cc4ec3e18893a3e2a4c033..530f5c6acf639c566c5edb344840edb0743146a1 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,15 @@
 2023-02-16  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * config/linux/allocator.c (linux_memspace_alloc)
+       (linux_memspace_calloc): Clarify zero-initialization for pinned
+       memory.
+       * testsuite/libgomp.c/alloc-pinned-1.c: Verify zero-initialization
+       for pinned memory.
+       * testsuite/libgomp.c/alloc-pinned-2.c: Likewise.
+       * testsuite/libgomp.c/alloc-pinned-3.c: Likewise.
+       * testsuite/libgomp.c/alloc-pinned-4.c: Likewise.
+       * testsuite/libgomp.c/alloc-pinned-5.c: Likewise.
+
        * config/linux/allocator.c (linux_memspace_calloc): Elide
        (innocuous) duplicate 'if' condition.
        * config/nvptx/allocator.c (nvptx_memspace_free): Explicitly

diff --git a/libgomp/config/linux/allocator.c b/libgomp/config/linux/allocator.c
index 8a9171c36df5a255beae8633475b82fad9e88232..f278e5cdf14ef0a32ceb97650f2339b070ea6350 100644 (file)
--- a/libgomp/config/linux/allocator.c
+++ b/libgomp/config/linux/allocator.c
@@ -65,6 +65,7 @@ linux_memspace_alloc (omp_memspace_handle_t memspace, size_t size, int pin)
     }
   else if (pin)
     {
+      /* 'mmap' zero-initializes, which 'linux_memspace_calloc' relies on.  */
       void *addr = mmap (NULL, size, PROT_READ | PROT_WRITE,
                         MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
       if (addr == MAP_FAILED)
@@ -96,6 +97,7 @@ linux_memspace_calloc (omp_memspace_handle_t memspace, size_t size, int pin)
       return ret;
     }
   else if (pin)
+    /* If PINned, 'linux_memspace_alloc' 'mmap's, which zero-initializes.  */
     return linux_memspace_alloc (memspace, size, pin);
   else
     return calloc (1, size);

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
index 79792b16d838867487ab8699323fcb86c1f2f614..fb7ac8b00804afedcca0c5fd2186d48f82c74513 100644 (file)
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
@@ -54,6 +54,14 @@ get_pinned_mem ()
 }
 #endif
 
+static void
+verify0 (char *p, size_t s)
+{
+  for (size_t i = 0; i < s; ++i)
+    if (p[i] != 0)
+      abort ();
+}
+
 #include <omp.h>
 
 int
@@ -91,5 +99,7 @@ main ()
   if (get_pinned_mem () <= amount2)
     abort ();
 
+  verify0 (p, SIZE);
+
   return 0;
 }

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
index 228c656b715468b69e54dfd1cf07933bcfc7c4da..651b89fb42f1678000c985d3ffde09f9728246c8 100644 (file)
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
@@ -54,6 +54,14 @@ get_pinned_mem ()
 }
 #endif
 
+static void
+verify0 (char *p, size_t s)
+{
+  for (size_t i = 0; i < s; ++i)
+    if (p[i] != 0)
+      abort ();
+}
+
 #include <omp.h>
 
 int
@@ -97,5 +105,7 @@ main ()
   if (get_pinned_mem () <= amount2)
     abort ();
 
+  verify0 (p, SIZE);
+
   return 0;
 }

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-3.c b/libgomp/testsuite/libgomp.c/alloc-pinned-3.c
index 90539ffe3e0ce304cc3404071600bf360f95a620..f41797881ef5496ef85dd09ae14137ce428f9416 100644 (file)
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-3.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-3.c
@@ -61,6 +61,14 @@ set_pin_limit ()
 }
 #endif
 
+static void
+verify0 (char *p, size_t s)
+{
+  for (size_t i = 0; i < s; ++i)
+    if (p[i] != 0)
+      abort ();
+}
+
 #include <omp.h>
 
 int
@@ -109,6 +117,7 @@ main ()
   p = omp_calloc (1, SIZE, allocator2);
   if (!p)
     abort ();
+  verify0 (p, SIZE);
 
   // Should fail to realloc
   void *notpinned = omp_alloc (SIZE, omp_default_mem_alloc);

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-4.c b/libgomp/testsuite/libgomp.c/alloc-pinned-4.c
index 534e49eefc4dd6749a7af04c7fbb2dbc4a5ccf59..a878da8c55812e59c39518dfa054c05e8f8f7400 100644 (file)
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-4.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-4.c
@@ -61,6 +61,14 @@ set_pin_limit ()
 }
 #endif
 
+static void
+verify0 (char *p, size_t s)
+{
+  for (size_t i = 0; i < s; ++i)
+    if (p[i] != 0)
+      abort ();
+}
+
 #include <omp.h>
 
 int
@@ -111,6 +119,7 @@ main ()
   p = omp_calloc (1, SIZE, allocator2);
   if (!p)
     abort ();
+  verify0 (p, SIZE);
 
   // Should fail to realloc
   void *notpinned = omp_alloc (SIZE, omp_default_mem_alloc);

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-5.c b/libgomp/testsuite/libgomp.c/alloc-pinned-5.c
index 315c7161a390cf30f71906e2fede42e3cc66d595..65983b3d03d6293b32ce730f4e03166fe1977bc0 100644 (file)
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-5.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-5.c
@@ -54,6 +54,14 @@ get_pinned_mem ()
 }
 #endif
 
+static void
+verify0 (char *p, size_t s)
+{
+  for (size_t i = 0; i < s; ++i)
+    if (p[i] != 0)
+      abort ();
+}
+
 #include <omp.h>
 
 int
@@ -86,5 +94,7 @@ main ()
   if (get_pinned_mem () <= amount2)
     abort ();
 
+  verify0 (p, SIZE);
+
   return 0;
 }