Changeset 5e44ac2 for tests/concurrent/examples/matrixSum.c

Timestamp:

Aug 15, 2018, 1:58:02 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (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:

Merge branch 'master' into demangler

File:

• tests/concurrent/examples/matrixSum.c (moved) (moved from src/tests/concurrent/examples/matrixSum.c ) (3 diffs)

tests/concurrent/examples/matrixSum.c

@@ -1 @@
-//                               -*- Mode: C -*- 
-// 
+//                               -*- Mode: C -*-
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// matrixSum.c -- 
-// 
+//
+// matrixSum.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May 25 09:34:27 2018
-// Update Count     : 10
-// 
+// Last Modified On : Thu Aug  9 09:17:30 2018
+// Update Count     : 13
+//
 
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 
 thread Adder {
@@ -30 +30 @@
 void main( Adder & adder ) with( adder ) {                              // thread starts here
         subtotal = 0;
-        for ( int c = 0; c < cols; c += 1 ) {
+        for ( c; cols ) {
                 subtotal += row[c];
         } // for
@@ -36 +36 @@
 
 int main() {
-        const int rows = 10, cols = 1000;
+        /* const */ int rows = 10, cols = 1000;
         int matrix[rows][cols], subtotals[rows], total = 0;
         processor p;                                                                            // add kernel thread
 
-        for ( int r = 0; r < rows; r += 1 ) {
-                for ( int c = 0; c < cols; c += 1 ) {
+        for ( r; rows ) {
+                for ( c; cols ) {
                         matrix[r][c] = 1;
                 } // for
         } // for
         Adder * adders[rows];
-        for ( int r = 0; r < rows; r += 1 ) {                           // start threads to sum rows
+        for ( r; rows ) {                                                                       // start threads to sum rows
                 adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] };
 //              adders[r] = new( matrix[r], cols, &subtotals[r] );
         } // for
-        for ( int r = 0; r < rows; r += 1 ) {                           // wait for threads to finish
+        for ( r; rows ) {                                                                       // wait for threads to finish
                 delete( adders[r] );
                 total += subtotals[r];                                                  // total subtotals