Adjust CopyAggregation aggregators to have the option of not freeing buffers on flush

modules/packages/CopyAggregation.chpl

@@ -116,8 +116,8 @@ module CopyAggregation {
       if aggregate then agg.copy(dst, srcVal);
                    else dst = srcVal;
     }
-    inline proc ref flush() {
-      if aggregate then agg.flush();
+    inline proc ref flush(freeBuffers=false) {
+      if aggregate then agg.flush(freeBuffers=freeBuffers);
     }
   }
 
@@ -134,8 +134,8 @@ module CopyAggregation {
       if aggregate then agg.copy(dst, src);
                    else dst = src;
     }
-    inline proc ref flush() {
-      if aggregate then agg.flush();
+    inline proc ref flush(freeBuffers=false) {
+      if aggregate then agg.flush(freeBuffers=freeBuffers);
     }
   }
 
@@ -162,18 +162,18 @@ module CopyAggregation {
     }
 
     proc ref deinit() {
-      flush();
+      flush(freeBuffers=true);
       for loc in myLocaleSpace {
         deallocate(lBuffers[loc]);
       }
       deallocate(lBuffers);
       deallocate(bufferIdxs);
     }
 
-    proc ref flush() {
+    proc ref flush(freeBuffers: bool) {
       for offsetLoc in myLocaleSpace + lastLocale {
         const loc = offsetLoc % numLocales;
-        _flushBuffer(loc, bufferIdxs[loc], freeData=true);
+        _flushBuffer(loc, bufferIdxs[loc], freeData=freeBuffers);
       }
     }
 
@@ -263,7 +263,7 @@ module CopyAggregation {
     }
 
     proc ref deinit() {
-      flush();
+      flush(freeBuffers=true);
       for loc in myLocaleSpace {
         deallocate(dstAddrs[loc]);
         deallocate(lSrcAddrs[loc]);
@@ -273,10 +273,10 @@ module CopyAggregation {
       deallocate(bufferIdxs);
     }
 
-    proc ref flush() {
+    proc ref flush(freeBuffers: bool) {
       for offsetLoc in myLocaleSpace + lastLocale {
         const loc = offsetLoc % numLocales;
-        _flushBuffer(loc, bufferIdxs[loc], freeData=true);
+        _flushBuffer(loc, bufferIdxs[loc], freeData=freeBuffers);
       }
     }
 

test/library/packages/CopyAggregation/test-copy-agg.chpl

@@ -2,15 +2,17 @@ use CopyAggregation;
 use BlockDist;
 use RangeChunk;
 
+config const freeBuffers = true;
 config const n = 1_000_000;
+
 proc main() {
   assert(n > 2); // this test assumes this
 
   const nTasksPerLocale =
     if dataParTasksPerLocale > 0
     then dataParTasksPerLocale
     else here.maxTaskPar;
-                          
+
   // store numbers in forward order in Fwd
   var Fwd =  blockDist.createArray(0..<n, int);
   Fwd = 0..<n;
@@ -43,11 +45,19 @@ proc main() {
       const locRegion = locDom.dim(0)[0..<n];
       coforall chunk in chunks(locRegion, nTasksPerLocale) {
         var agg = new DstAggregator(int);
-        for i in chunk {
+        const halfway = chunk.low + chunk.size / 2;
+        const firstchunk = chunk.low..<halfway;
+        const secondchunk = halfway..chunk.high;
+        for i in firstchunk {
+          const elt = A[i];
+          agg.copy(B[elt], elt);
+        }
+        agg.flush(freeBuffers=freeBuffers);
+        // check that the aggregator still works after flush
+        for i in secondchunk {
           const elt = A[i];
           agg.copy(B[elt], elt);
         }
-        agg.flush();
       }
     }
   }
@@ -69,10 +79,17 @@ proc main() {
       const locRegion = locDom.dim(0)[0..<n];
       coforall chunk in chunks(locRegion, nTasksPerLocale) {
         var agg = new SrcAggregator(int);
-        for i in chunk {
+        const halfway = chunk.low + chunk.size / 2;
+        const firstchunk = chunk.low..<halfway;
+        const secondchunk = halfway..chunk.high;
+        for i in firstchunk {
+          agg.copy(B[i], A[n-1-i]);
+        }
+        agg.flush(freeBuffers=freeBuffers);
+        // check that the aggregator still works after flush
+        for i in secondchunk {
           agg.copy(B[i], A[n-1-i]);
         }
-        agg.flush();
       }
     }
   }

test/library/packages/CopyAggregation/test-copy-agg.execopts

@@ -0,0 +1,2 @@
+--freeBuffers=true
+--freeBuffers=false

test/library/packages/CopyAggregation/test-copy-agg.numlocales

@@ -0,0 +1 @@
+4