Changeset fd2b607

Timestamp:

Mar 10, 2020, 4:21:46 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1cfdee9, 852a2f06

Parents:

b5bb444 (diff), 28c4f74 (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

Files:

• benchmark/Makefile.am (modified) (2 diffs)
• benchmark/Makefile.in (modified) (1 diff)
• benchmark/creation/cfa_gen.cfa (modified) (2 diffs)
• benchmark/ctxswitch/cfa_cor.cfa (modified) (1 diff)
• benchmark/ctxswitch/cfa_gen.cfa (modified) (1 diff)
• src/Parser/parser.yy (modified) (2 diffs)

benchmark/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Jan 25 09:20:44 2020
-## Update Count     : 255
+## Last Modified On : Tue Mar 10 11:41:18 2020
+## Update Count     : 258
 ###############################################################################
 
@@ -108 +108 @@
 creation_cfa_coroutine_DURATION = 100000000
 creation_cfa_coroutine_eager_DURATION = 10000000
+creation_cfa_generator_DURATION = 1000000000
 creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
 creation_cfa_thread_DURATION = 10000000

benchmark/Makefile.in

@@ -447 +447 @@
 creation_cfa_coroutine_DURATION = 100000000
 creation_cfa_coroutine_eager_DURATION = 10000000
+creation_cfa_generator_DURATION = 1000000000
 creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
 creation_cfa_thread_DURATION = 10000000

benchmark/creation/cfa_gen.cfa

@@ -1 @@
-#include "bench.h"
+#include "../bench.h"
 
-struct C {
+generator G {
         volatile int restart; // ensure compiler does not optimize away all the code
 };
-void ?{}( C & c ) { c.restart = 0; }
-void main( C & ) {}
+void ?{}( G & g ) { g.restart = 0; }
+void main( G & ) {}
 
 int main( int argc, char * argv[] ) {
@@ -11 +11 @@
         BENCH(
                 for ( times ) {
-                         C c;
+                         G g;
                 },
                 result

benchmark/ctxswitch/cfa_cor.cfa

@@ -2 +2 @@
 #include <thread.hfa>
 
-#include "bench.h"
+#include "../bench.h"
 
-coroutine C {} c;
+coroutine C {};
 void main( __attribute__((unused)) C & ) {
-        while () {
+        for () {
                 suspend;
         }
 }
 int main( int argc, char * argv[] ) {
+        C c;
         BENCH_START()
         BENCH(

benchmark/ctxswitch/cfa_gen.cfa

@@ -1 +1 @@
 #include "../bench.h"
 
-typedef struct {
-        void * next;
-} C;
-
-void comain( C * c ) {
-        if ( __builtin_expect(c->next != 0, 1) ) goto *(c->next);
-        c->next = &&s1;
+generator G {};
+void main( G & ) {
         for () {
-                return;
-          s1: ;
+                suspend;
         }
 }
 
 int main( int argc, char * argv[] ) {
+        G g;
         BENCH_START()
-        C c = { 0 };
         BENCH(
                 for ( times ) {
-                        comain( &c );
+                        resume( g );
                 },
                 result

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 26 14:27:39 2020
-// Update Count     : 4472
+// Last Modified On : Fri Mar  6 17:26:45 2020
+// Update Count     : 4474
 //
 
@@ -919 +919 @@
         conditional_expression
         | unary_expression assignment_operator assignment_expression
-                { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
+                {
+                        if ( $2 == OperKinds::AtAssn ) {
+                                SemanticError( yylloc, "C @= assignment is currently unimplemented." ); $$ = nullptr;
+                        } else {
+                                $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) );
+                        } // if
+                }
         | unary_expression '=' '{' initializer_list_opt comma_opt '}'
                 { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; }