Changeset 3d5701e for tests/concurrent/examples/quickSort.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

• tests/concurrent/examples/quickSort.cfa (modified) (5 diffs)

tests/concurrent/examples/quickSort.cfa

@@ -11 +11 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 08:27:45 2019
-// Update Count     : 172
+// Last Modified On : Wed Feb 12 18:24:47 2020
+// Update Count     : 177
 //
 
@@ -27 +27 @@
 
 void ?{}( Quicksort & qs, int values[], int size, int depth ) {
-        qs.values = values;  qs.low = 0;  qs.high = size;  qs.depth = depth;
+        qs.[values, low, high, depth] = [values, 0, size, depth];
 } // Quicksort
 
@@ -66 +66 @@
                         if ( depth > 0 ) {
                                 depth -= 1;
-                                Quicksort rqs = { values, low, right, depth }; // concurrently sort upper half
-                                //Quicksort lqs( values, left, high, depth ); // concurrently sort lower half
-                                sort( values, left, high, depth );              // concurrently sort lower half
+                                Quicksort lqs = { values, low, right, depth }; // concurrently sort lower half
+                                Quicksort rqs = { values, left, high, depth }; // concurrently sort upper half
+                                // Quicksort lqs = { values, low, right, depth }; // concurrently sort lower half
+                                // sort( values, left, high, depth );           // concurrently sort upper half
                         } else {
                                 sort( values, low, right, 0 );                  // sequentially sort lower half
@@ -162 +163 @@
                 processor processors[ (1 << depth) - 1 ] __attribute__(( unused )); // create 2^depth-1 kernel threads
 
-                int * values = alloc( size );                           // values to be sorted, too large to put on stack
-                for ( counter; size ) {                                         // generate unsorted numbers
+                int * values = alloc( size );                                   // values to be sorted, too large to put on stack
+                for ( counter; size ) {                                                 // generate unsorted numbers
                         values[counter] = size - counter;                       // descending values
+                } // for
+                for ( i; 200 ) {                                                                // random shuffle a few values
+                        swap( values[rand() % size], values[rand() % size] );
                 } // for
                 {
@@ -178 +182 @@
 } // main
 
+// for depth in 0 1 2 3 4 5 ; do echo "sort 500000000 values with ${depth} depth" ; time -f "%Uu %Ss %E %Mkb" a.out -t 500000000 ${depth} ; done
+
 // Local Variables: //
 // tab-width: 4 //