Changeset a97b9ed for tests

Timestamp:

Oct 16, 2023, 8:09:51 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2bf46a5, 54e59dd, 61e5d99

Parents:

946a6e4 (diff), 8cbe732 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/linkonce.txt (modified) (1 diff)
• concurrency/cofor.cfa (modified) (1 diff)
• link-once/main.cfa (modified) (1 diff)
• link-once/partner.cfa (modified) (1 diff)
• test.py (modified) (1 diff)

tests/.expect/linkonce.txt

@@ -1 @@
-signed=-7 unsigned=12
+signed=7 unsigned=12

tests/concurrency/cofor.cfa

@@ -1 +1 @@
 #include <cofor.hfa>
 
-long total = 0;
-void add_num( void * arg ) { __atomic_fetch_add( &total, (long)arg, __ATOMIC_SEQ_CST ); }
+
+void add_num( long * total, long val ) { __atomic_fetch_add( total, (long)val, __ATOMIC_SEQ_CST ); }
 
 int main() {
     printf("start\n");
     processor p[4];
+    long total = 0;
     COFOR( i, 0, 10, __atomic_fetch_add( &total, i, __ATOMIC_SEQ_CST ); );
-    parallel_stmt_t stmts[5] = { add_num, add_num, add_num, add_num, add_num };
-    void * nums[5] = { (void *)11, (void *)12, (void *)13, (void *)14, (void *)15 };
-    parallel( stmts, nums, 5 );
+    {
+        corun;      // does nothing
+        corun{};    // does nothing
+        corun add_num( &total, 11 );
+        corun { add_num( &total, 12 ); }
+        corun __atomic_fetch_add( &total, 13, __ATOMIC_SEQ_CST );
+        corun { __atomic_fetch_add( &total, 14, __ATOMIC_SEQ_CST ); }
+        __atomic_fetch_add( &total, 15, __ATOMIC_SEQ_CST ); // run by main thd
+    }
     printf("total: %ld\n", total);
     printf("done\n");

tests/link-once/main.cfa

@@ -1 +1 @@
 // Test our new cfa_linkonce attribute:
 
-__attribute__(( cfa_linkonce )) signed int example = -7;
+__attribute__(( cfa_linkonce )) signed int example = 7;
 __attribute__(( cfa_linkonce )) unsigned int example = 12;
 

tests/link-once/partner.cfa

@@ -1 +1 @@
 // Side file for the link-once test.
 
-__attribute__(( cfa_linkonce )) signed int example = -7;
+__attribute__(( cfa_linkonce )) signed int example = 7;
 __attribute__(( cfa_linkonce )) unsigned int example = 12;
 

tests/test.py

@@ -125 +125 @@
         parser.add_argument('--archive-errors', help='If called with a valid path, on test crashes the test script will copy the core dump and the executable to the specified path.', type=str, default='')
         parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously, 0 (default) for unlimited', nargs='?', const=0, type=int)
-        parser.add_argument('--list-comp', help='List all valide arguments', action='store_true')
+        parser.add_argument('--list-comp', help='List all valid arguments', action='store_true')
         parser.add_argument('--list-dist', help='List all tests for distribution', action='store_true')
         parser.add_argument('-I','--include', help='Directory of test to include, can be used multiple time, All  if omitted', action='append')