Update submitted shootouts to match what's on the site today

* Michael's nbody silently replaced mine, so nbody3 is updated to reflect that
* Damian's nbody is version 4
* Jade's binary trees is version 4

---
Signed-off-by: Brad Chamberlain <bradcray@users.noreply.github.com>

test/studies/shootout/submitted/binarytrees-submitted.graph

@@ -1,5 +1,5 @@
-perfkeys: real, real
-graphkeys: release, submitted
-files: binarytrees.dat, binarytrees-submitted.dat
+perfkeys: real, real, real
+graphkeys: release, submitted (3), submitted (4)
+files: binarytrees.dat, binarytrees-submitted.dat, binarytrees4.dat
 graphtitle: Submitted Binary Trees Shootout Benchmark (n=21)
 ylabel: Time (seconds)

test/studies/shootout/submitted/binarytrees4.chpl

@@ -0,0 +1,86 @@
+/* The Computer Language Benchmarks Game
+   https://salsa.debian.org/benchmarksgame-team/benchmarksgame/
+
+   contributed by Jade Abraham
+   based on the Chapel #3 version by Casey Battaglino, Ben Harshbarger, and
+     Brad Chamberlain
+*/
+
+config const n = 10;         // the maximum tree depth
+
+proc main() {
+  const minDepth = 4,                      // the shallowest tree
+        maxDepth = max(minDepth + 2, n),   // the deepest normal tree
+        strDepth = maxDepth + 1,           // the depth of the "stretch" tree
+        depths = minDepth..maxDepth by 2;  // the range of depths to create
+  var stats: [depths] (int,int);           // stores statistics for the trees
+
+  //
+  // Create the short-lived "stretch" tree, checksum it, and print its stats.
+  //
+  {
+    const strTree = new Tree(strDepth);
+    writeln("stretch tree of depth ", strDepth, "\t check: ", strTree.sum());
+  }
+
+  //
+  // Build the long-lived tree.
+  //
+  const llTree = new Tree(maxDepth);
+
+  //
+  // Iterate over the depths. At each depth, create the required trees in
+  // parallel, compute their sums, and free them.
+  //
+  for depth in depths {
+    const iterations = 2**(maxDepth - depth + minDepth);
+    var sum = 0;
+
+    forall i in 1..iterations with (+ reduce sum) {
+      const t = new Tree(depth);
+      sum += t.sum();
+    }
+    stats[depth] = (iterations, sum);
+  }
+
+  //
+  // Print out the stats for the trees of varying depths.
+  //
+  for (depth, (numTrees, checksum)) in zip(depths, stats) do
+    writeln(numTrees, "\t trees of depth ", depth, "\t check: ", checksum);
+
+  //
+  // Checksum the long-lived tree, print its stats, and free it.
+  //
+  writeln("long lived tree of depth ", maxDepth, "\t check: ", llTree.sum());
+}
+
+
+//
+// A simple balanced tree node class
+//
+class Tree {
+  var left, right: unmanaged Tree?;
+
+  //
+  // A Tree-building initializer
+  //
+  proc init(depth) {
+    if depth > 0 {
+      left  = new unmanaged Tree(depth-1);
+      right = new unmanaged Tree(depth-1);
+    }
+  }
+
+  //
+  // Add up tree node, freeing as we go
+  //
+  proc sum(): int {
+    var sum = 1;
+    if left {
+      sum += left!.sum() + right!.sum();
+      delete left, right;
+    }
+    return sum;
+  }
+}

test/studies/shootout/submitted/binarytrees4.good

@@ -0,0 +1 @@
+binarytrees3.good

test/studies/shootout/submitted/binarytrees4.perfexecopts

@@ -0,0 +1 @@
+--n=21 # binarytrees4

test/studies/shootout/submitted/binarytrees4.perfkeys

@@ -0,0 +1 @@
+binarytrees3.perfkeys

test/studies/shootout/submitted/nbody-submitted.graph

@@ -1,5 +1,5 @@
-perfkeys: real, real, real
-graphkeys: release, submitted (2), submitted (3)
-files: nbody.dat, nbody-submitted.dat, nbody3.dat
+perfkeys: real, real, real, real
+graphkeys: release, submitted (2), submitted (3), submitted (4)
+files: nbody.dat, nbody-submitted.dat, nbody3.dat, nbody4.dat
 graphtitle: Submitted N-body Shootout Benchmark
 ylabel: Time (seconds)

test/studies/shootout/submitted/nbody3.chpl

@@ -1,8 +1,8 @@
 /* The Computer Language Benchmarks Game
    https://salsa.debian.org/benchmarksgame-team/benchmarksgame/
 
-   contributed by Brad Chamberlain
-   derived from the Chapel version by Albert Sidelnik and myself
+   contributed by Michael Ferguson
+   derived from the Chapel# version by Brad Chamberlain
 */
 
 use Math;                     // to get access to 'pi'
@@ -94,7 +94,8 @@ proc advance(dt) {
   for param i in 0..<numBodies {
     for param j in i+1..<numBodies {
       const dpos = bodies[i].pos - bodies[j].pos,
-            mag = dt / sqrt(sumOfSquares(dpos))**3;
+            dposNormSq = sumOfSquares(dpos),
+            mag = dt / (dposNormSq * sqrt(dposNormSq));
 
       bodies[i].vel -= dpos * bodies[j].mass * mag;
       bodies[j].vel += dpos * bodies[i].mass * mag;

test/studies/shootout/submitted/nbody4.chpl

@@ -0,0 +1,140 @@
+/* The Computer Language Benchmarks Game
+   https://salsa.debian.org/benchmarksgame-team/benchmarksgame/
+
+   contributed by Damian McGuckin
+   derived from the Chapel version by Brad Chamberlain
+*/
+
+use Math;                     // to get access to 'pi'
+
+config const n = 10000;       // The number of timesteps to simulate
+
+param solarMass = 4 * pi * pi,
+      daysPerYear = 365.24;
+
+
+//
+// a record for representing the position, velocity, and mass of
+// bodies in the solar system
+//
+record body {
+  var pos: 4*real;
+  var vel: 4*real;
+  var mass: real;
+}
+
+//
+// the bodies that we'll be simulating
+//
+var bodies = (/* sun */
+              new body(mass = solarMass),
+
+              /* jupiter */
+              new body(pos = ( 4.84143144246472090e+00,
+                              -1.16032004402742839e+00,
+                              -1.03622044471123109e-01, 0.0),
+                       vel = ( 1.66007664274403694e-03 * daysPerYear,
+                               7.69901118419740425e-03 * daysPerYear,
+                              -6.90460016972063023e-05 * daysPerYear, 0.0),
+                      mass =   9.54791938424326609e-04 * solarMass),
+
+              /* saturn */
+              new body(pos = ( 8.34336671824457987e+00,
+                               4.12479856412430479e+00,
+                              -4.03523417114321381e-01, 0.0),
+                       vel = (-2.76742510726862411e-03 * daysPerYear,
+                               4.99852801234917238e-03 * daysPerYear,
+                               2.30417297573763929e-05 * daysPerYear, 0.0),
+                      mass =   2.85885980666130812e-04 * solarMass),
+
+              /* uranus */
+              new body(pos = ( 1.28943695621391310e+01,
+                              -1.51111514016986312e+01,
+                              -2.23307578892655734e-01, 0.0),
+                       vel = ( 2.96460137564761618e-03 * daysPerYear,
+                               2.37847173959480950e-03 * daysPerYear,
+                              -2.96589568540237556e-05 * daysPerYear, 0.0),
+                      mass =   4.36624404335156298e-05 * solarMass),
+
+              /* neptune */
+              new body(pos = ( 1.53796971148509165e+01,
+                              -2.59193146099879641e+01,
+                               1.79258772950371181e-01, 0.0),
+                       vel = ( 2.68067772490389322e-03 * daysPerYear,
+                               1.62824170038242295e-03 * daysPerYear,
+                              -9.51592254519715870e-05 * daysPerYear, 0.0),
+                      mass =   5.15138902046611451e-05 * solarMass)
+              );
+
+param numBodies = bodies.size;    // the number of bodies being simulated
+
+proc main() {
+  initSun();                      // initialize the sun's velocity
+
+  writef("%.9r\n", energy());     // print the initial energy
+
+  for 1..n do                     // simulate 'n' timesteps
+    advance(0.01);
+
+  writef("%.9r\n", energy());     // print the final energy
+}
+
+//
+// compute the sun's initial velocity
+//
+proc initSun() {
+  var p = bodies[0].vel; // initially all zeros
+
+  for param i in 1..<numBodies {
+    p -= bodies[i].vel * bodies[i].mass;
+  }
+  bodies[0].vel = p / solarMass;
+}
+
+//
+// advance the positions and velocities of all the bodies
+//
+proc advance(dt) {
+  param n = numBodies-1;
+
+  for param i in 0..n-1 {
+    const p = bodies[i].pos; // rip 'pos' out of loop
+    const m = bodies[i].mass; // rip 'mass' out of loop
+    var v = bodies[i].vel; // accumulate within loop
+
+    for param j in i+1..n {
+      const dp = p - bodies[j].pos;
+      const dpsq = sumOfSquares(dp);
+      const mag = dt / (dpsq * sqrt(dpsq));
+
+      v -= dp * bodies[j].mass * mag;
+      bodies[j].vel += dp * m * mag;
+    }
+	bodies[i].vel = v;
+    bodies[i].pos += dt * v;
+  }
+  bodies[n].pos += dt * bodies[n].vel;
+}
+
+//
+// compute the energy of the bodies
+//
+proc energy() {
+  var e = 0.0;
+
+  for param i in 0..<numBodies {
+    const p = bodies[i].pos; // rip 'pos' out of loop
+    var _e = 0.5 * sumOfSquares(bodies[i].vel);
+
+    for param j in i+1..<numBodies {
+      _e -= bodies[j].mass / sqrt(sumOfSquares(p - bodies[j].pos));
+    }
+    e = fma(_e, bodies[i].mass, e); // rip common multiplier out of loop
+  }
+  return e;
+}
+
+inline proc sumOfSquares(v)
+{
+  return v[0] * v[0] + v[1] * v[1] + v[2] * v[2];
+}

test/studies/shootout/submitted/nbody4.good

@@ -0,0 +1 @@
+nbody3.good

test/studies/shootout/submitted/nbody4.perfexecopts

@@ -0,0 +1 @@
+--n=50000000 # nbody4

test/studies/shootout/submitted/nbody4.perfkeys

@@ -0,0 +1 @@
+nbody3.perfkeys