Merge pull request #6405 from e-kayrakli/prk-housekeeping

Trivial housekeeping in PRK

Addresses some of the trivial issues in #6162:

- Header comments with contributors
- Dir name updates
- Change `validate` flag to `correctness`

test/studies/prk passes with standard linux64 config

[Reviewed by @ben-albrecht]

test/studies/prk/DGEMM/dgemm.chpl

@@ -1,3 +1,8 @@
+/*
+   Chapel's parallel DGEMM implementation
+
+   Contributed by Engin Kayraklioglu (GWU)
+*/
 use Time;
 use BlockDist;
 use RangeChunk;

test/studies/prk/Nstream/nstream.chpl

@@ -1,6 +1,9 @@
-//
-// Chapel's implementation of nstream
-//
+/*
+   Chapel's parallel Nstream implementation
+
+   Contributed by Engin Kayraklioglu (GWU)
+*/
+
 use Time;
 use BlockDist;
 

test/studies/prk/PIC/pic.chpl

@@ -1,3 +1,9 @@
+/*
+   Chapel's parallel PIC implementation
+
+   Contributed by Engin Kayraklioglu (GWU)
+*/
+
 require "random_draw.h", "random_draw.c";
 use Time;
 

test/studies/prk/Sparse/sparse.chpl

@@ -1,3 +1,8 @@
+/*
+   Chapel's parallel Sparse implementation
+
+   Contributed by Engin Kayraklioglu (GWU)
+*/
 use BlockDist;
 use Time;
 use LayoutCSR;

test/studies/prk/stencil/stencil-serial.chpl → test/studies/prk/Stencil/stencil-serial.chpl

@@ -1,6 +1,9 @@
-//
-// Chapel's stencil implementation
-//
+/*
+   Chapel's serial Stencil implementation
+
+   Contributed by Ben Albrecht, Ben Harshbarger (Cray Inc.)
+*/
+
 use Time;
 
 param PRKVERSION = "2.15";
@@ -10,7 +13,7 @@ config var tileSize: int = 0;
 config const iterations: int = 10,
              order: int = 1000,
              debug: bool = false,
-             validate: bool = false;
+             correctness: bool = false;
 
 config param R = 2,
              compact = false;
@@ -84,7 +87,7 @@ for i in 1..R {
 //
 // Print information before main loop
 //
-if (!validate) {
+if (!correctness) {
   writeln("Parallel Research Kernels Version ", PRKVERSION);
   writeln("Serial stencil execution on 2D grid");
   writeln("Grid size            = ", order);
@@ -176,7 +179,7 @@ if abs(norm-referenceNorm) > epsilon then {
     writeln("L1 norm = ", norm, ", Reference L1 norm = ", referenceNorm);
   }
 
-  if (!validate) {
+  if (!correctness) {
     writef("Rate (MFlops/s): %dr  Avg time (s): %r\n", 1.0E-06 * flops/avgTime, avgTime);
   }
 }

test/studies/prk/Stencil/stencil-serial.compopts

@@ -0,0 +1,4 @@
+--set correctness --set order=100 --set iterations=3
+--set correctness --set order=100 --set iterations=3 --set tileSize=20
+--set correctness --set order=100 --set iterations=3                   --set compact=true
+--set correctness --set order=100 --set iterations=3 --set tileSize=20 --set compact=true

test/studies/prk/stencil/stencil.chpl → test/studies/prk/Stencil/stencil.chpl

@@ -1,6 +1,9 @@
-//
-// Chapel's parallel stencil implementation
-//
+/*
+   Chapel's parallel Stencil implementation
+
+   Contributed by Ben Albrecht, Ben Harshbarger (Cray Inc.),
+                  Engin Kayraklioglu (GWU)
+*/
 
 /* Standard Library */
 use Time;
@@ -33,7 +36,7 @@ config const iterations: int = 10,
              /* Enable debug output, including chplvis data */
              debug: bool = false,
              /* Only print result of validation - used in correctness tests*/
-             validate: bool = false;
+             correctness: bool = false;
 
 /* Size of stride for tiling; disables tiling if set to 0 */
 config var tileSize: int = 0;
@@ -149,7 +152,7 @@ proc main() {
   //
   // Print information before main loop
   //
-  if (!validate) {
+  if (!correctness) {
     writeln("Parallel Research Kernels Version ", PRKVERSION);
     writeln("Serial stencil execution on 2D grid");
     writeln("Grid size            = ", order);
@@ -283,7 +286,7 @@ proc main() {
       writeln("L1 norm = ", norm, ", Reference L1 norm = ", referenceNorm);
     }
 
-    if (!validate) {
+    if (!correctness) {
       writef("Rate (MFlops/s): %dr  Avg time (s): %r\n", 1.0E-06 * flops/avgTime, avgTime);
       writeln("stencil time = ", stenTime/iterations);
       writeln("increment time = ", incTime / iterations);

test/studies/prk/Stencil/stencil.compopts

@@ -0,0 +1,6 @@
+--set correctness --set order=100 --set iterations=3
+--set correctness --set order=100 --set iterations=3 --set tileSize=20
+--set correctness --set order=100 --set iterations=3                   --set compact=true
+--set correctness --set order=100 --set iterations=3 --set tileSize=20 --set compact=true
+--set correctness --set order=100 --set iterations=3 --set useBlockDist=true
+--set correctness --set order=100 --set iterations=3 --set useStencilDist=true

test/studies/prk/Synch_p2p/EXECOPTS

@@ -0,0 +1 @@
+--iterations=10 --m=100 --n=10 --correctness

test/studies/prk/synch_p2p/p2p-serial-fast.chpl → test/studies/prk/Synch_p2p/p2p-serial-fast.chpl

@@ -1,6 +1,8 @@
-//
-// Chapel's serial implementation of synch_p2p
-//
+/*
+   Chapel's serial synch_p2p implementation
+
+   Contributed by Ben Albrecht (Cray Inc.)
+*/
 use Time;
 
 param PRKVERSION = "2.15";
@@ -9,7 +11,7 @@ config const iterations = 10,
              m = 1000,
              n = 100,
              debug: bool = false,
-             validate: bool = false;
+             correctness: bool = false;
 
 //
 // Process and test input configs
@@ -36,7 +38,7 @@ var vector : [outerDom] real;
 //
 // Print information before main loop
 //
-if (!validate) {
+if (!correctness) {
   writeln("Parallel Research Kernels version ", PRKVERSION);
   writeln("Serial pipeline execution on 2D grid");
   writeln("Grid sizes                = ", m, ", ", n);
@@ -88,7 +90,7 @@ if (abs(vector[m-1, n-1] - cornerValue) / cornerValue > epsilon) {
 
   if (debug) then writeln("Verification value = ", cornerValue);
 
-  if (!validate) {
+  if (!correctness) {
     writeln("Rate (MFlops/s): ", 1.0e-6 * 2 * ((m-1)*(n-1)) / avgTime,
             " Avg time (s): ", avgTime);
   }

test/studies/prk/transpose/transpose-serial.chpl → test/studies/prk/Transpose/transpose-serial.chpl

@@ -1,14 +1,17 @@
-//
-// Chapel's serial implementation of transpose
-//
+/*
+   Chapel's serial Transpose implementation
+
+   Contributed by Ben Albrecht (Cray Inc.)
+*/
+
 use Time;
 
 param PRKVERSION = "2.15";
 
 config const iterations : int = 100,
              order : int = 100,
              debug: bool = false,
-             validate: bool = false;
+             correctness: bool = false;
 
 config var tileSize: int = 0;
 
@@ -41,7 +44,7 @@ var timer: Timer,
 //
 // Print information before main loop
 //
-if (!validate) {
+if (!correctness) {
   writeln("Parallel Research Kernels version ", PRKVERSION);
   writeln("Serial Matrix transpose: B = A^T");
   writeln("Matrix order          = ", order);
@@ -106,7 +109,7 @@ if (debug) {
 // Verify correctness
 if (absErr < epsilon) {
   writeln("Solution validates");
-  if (!validate) then writeln("Rate (MB/s): ", 1.0E-06 * bytes / avgTime,
+  if (!correctness) then writeln("Rate (MB/s): ", 1.0E-06 * bytes / avgTime,
                               " Avg time (s): ", avgTime);
 } else {
   writeln("ERROR: Aggregate squared error", absErr,

test/studies/prk/Transpose/transpose-serial.compopts

@@ -0,0 +1,2 @@
+--set iterations=10 --set order=200 --set tileSize=64 --set correctness
+--set iterations=10 --set order=200 --set correctness

test/studies/prk/transpose/transpose.chpl → test/studies/prk/Transpose/transpose.chpl

@@ -1,6 +1,10 @@
-//
-// Chapel's parallel implementation of transpose
-//
+/*
+   Chapel's parallel Transpose implementation
+
+   Contributed by Ben Albrecht (Cray Inc.),
+                  Engin Kayraklioglu (GWU)
+*/
+
 use Time;
 use BlockDist;
 
@@ -10,7 +14,7 @@ config param useBlockDist = false;
 
 config const iterations = 100,
              order = 100,
-             validate = false,
+             correctness = false,
              debug = false;
 
 config var tileSize = 0;
@@ -55,7 +59,7 @@ var timer: Timer,
 //
 // Print information before main loop
 //
-if (!validate) {
+if (!correctness) {
   writeln("Parallel Research Kernels version ", PRKVERSION);
   writeln("Serial Matrix transpose: B = A^T");
   writeln("Matrix order          = ", order);
@@ -119,7 +123,7 @@ if (debug) {
 // Verify correctness
 if (absErr < epsilon) {
   writeln("Solution validates");
-  if (!validate) then writeln("Rate (MB/s): ", 1.0E-06 * bytes / avgTime,
+  if (!correctness) then writeln("Rate (MB/s): ", 1.0E-06 * bytes / avgTime,
                               " Avg time (s): ", avgTime);
 } else {
   writeln("ERROR: Aggregate squared error", absErr,

test/studies/prk/Transpose/transpose.compopts

@@ -0,0 +1,2 @@
+--set iterations=10 --set order=200 --set tileSize=64 --set correctness
+--set iterations=10 --set order=200 --set correctness