ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/ScalarLongSort.java
(Generate patch)

Comparing jsr166/src/test/loops/ScalarLongSort.java (file contents):
Revision 1.6 by jsr166, Sat Oct 16 16:22:57 2010 UTC vs.
Revision 1.11 by jsr166, Sun Oct 21 06:14:12 2012 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   import java.util.concurrent.*;
# Line 10 | Line 10 | import java.util.*;
10   class ScalarLongSort {
11      static final long NPS = (1000L * 1000 * 1000);
12  
13 <    static int THRESHOLD;
13 >    static int THRESHOLD = -1;
14      static final boolean warmup = true;
15  
16 <    public static void main (String[] args) throws Exception {
16 >    public static void main(String[] args) throws Exception {
17          int procs = 0;
18          int n = 1 << 22;
19          int reps = 20;
20          int sreps = 2;
21 +        int st = -1;
22          try {
23              if (args.length > 0)
24                  procs = Integer.parseInt(args[0]);
25              if (args.length > 1)
26                  n = Integer.parseInt(args[1]);
27              if (args.length > 2)
28 <                reps = Integer.parseInt(args[1]);
28 >                reps = Integer.parseInt(args[2]);
29 >            if (args.length > 3)
30 >                st = Integer.parseInt(args[3]);
31          }
32          catch (Exception e) {
33 <            System.out.println("Usage: java ScalarLongSort threads n reps");
33 >            System.out.println("Usage: java ScalarLongSort threads n reps sequential-threshold");
34              return;
35          }
36 <        ForkJoinPool pool = procs == 0? new ForkJoinPool() :
36 >        ForkJoinPool pool = (procs == 0) ? new ForkJoinPool() :
37              new ForkJoinPool(procs);
38  
39          long[] a = new long[n];
# Line 46 | Line 49 | class ScalarLongSort {
49              checkSorted(a);
50          }
51  
52 <        // for now hardwire 8 * #CPUs leaf tasks
53 <        THRESHOLD = 1 + ((n + 7) >>> 3) / pool.getParallelism();
54 <        //        THRESHOLD = 1 + ((n + 15) >>> 4) / pool.getParallelism();
55 <        //        THRESHOLD = 1 + ((n + 31) >>> 5) / pool.getParallelism();
52 >        if (st <= 0) // for now hardwire 8 * #CPUs leaf tasks
53 >            THRESHOLD = 1 + ((n + 7) >>> 3) / pool.getParallelism();
54 >        else
55 >            THRESHOLD = st;
56  
57          System.out.printf("Sorting %d longs, %d replications\n", n, reps);
58          for (int i = 0; i < reps; ++i) {
# Line 145 | Line 148 | class ScalarLongSort {
148           * and finding index of right closest to split point.
149           * Uses left-spine decomposition to generate all
150           * merge tasks before bottomming out at base case.
148 –         *
151           */
152          public final void compute() {
153              Merger rights = null;
# Line 206 | Line 208 | class ScalarLongSort {
208  
209      }
210  
211 <    static void checkSorted (long[] a) {
211 >    static void checkSorted(long[] a) {
212          int n = a.length;
213          for (int i = 0; i < n - 1; i++) {
214              if (a[i] > a[i+1]) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines