Changeset ee6dbae

Timestamp:

Jul 11, 2019, 1:34:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

302d84c2, 7870799

Parents:

d6a8aef (diff), 1d760934 (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:

• doc/papers/concurrency/Paper.tex (modified) (4 diffs)
• doc/papers/concurrency/mail2 (added)
• libcfa/prelude/builtins.c (modified) (3 diffs)
• libcfa/src/bits/containers.hfa (modified) (4 diffs)
• libcfa/src/executor.cfa (added)
• libcfa/src/stdlib.cfa (modified) (2 diffs)
• src/Parser/LinkageSpec.h (modified) (2 diffs)
• src/ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)
• src/SynTree/BaseSyntaxNode.h (modified) (3 diffs)
• src/SynTree/Constant.h (modified) (2 diffs)
• tests/.expect/completeTypeError.txt (modified) (3 diffs)

doc/papers/concurrency/Paper.tex

@@ -2 +2 @@
 
 \articletype{RESEARCH ARTICLE}%
+
+% Referees
+% Doug Lea, dl@cs.oswego.edu, SUNY Oswego
+% Herb Sutter, hsutter@microsoft.com, Microsoft Corp
+% Gor Nishanov, gorn@microsoft.com, Microsoft Corp
+% James Noble, kjx@ecs.vuw.ac.nz, Victoria University of Wellington, School of Engineering and Computer Science
 
 \received{XXXXX}
@@ -312 +318 @@
 As a result, languages like Java, Scala, Objective-C~\cite{obj-c-book}, \CCeleven~\cite{C11}, and C\#~\cite{Csharp} adopt the 1:1 kernel-threading model, with a variety of presentation mechanisms.
 From 2000 onwards, languages like Go~\cite{Go}, Erlang~\cite{Erlang}, Haskell~\cite{Haskell}, D~\cite{D}, and \uC~\cite{uC++,uC++book} have championed the M:N user-threading model, and many user-threading libraries have appeared~\cite{Qthreads,MPC,Marcel}, including putting green threads back into Java~\cite{Quasar}.
-The main argument for user-level threading is that they are lighter weight than kernel threads (locking and context switching do not cross the kernel boundary), so there is less restriction on programming styles that encourage large numbers of threads performing medium work units to facilitate load balancing by the runtime~\cite{Verch12}.
+The main argument for user-level threading is that it is lighter weight than kernel threading (locking and context switching do not cross the kernel boundary), so there is less restriction on programming styles that encourage large numbers of threads performing medium work units to facilitate load balancing by the runtime~\cite{Verch12}.
 As well, user-threading facilitates a simpler concurrency approach using thread objects that leverage sequential patterns versus events with call-backs~\cite{Adya02,vonBehren03}.
 Finally, performant user-threading implementations (both time and space) meet or exceed direct kernel-threading implementations, while achieving the programming advantages of high concurrency levels and safety.
@@ -669 +675 @@
 In contrast, the execution state is large, with one @resume@ and seven @suspend@s.
 Hence, the key benefits of the generator are correctness, safety, and maintenance because the execution states are transcribed directly into the programming language rather than using a table-driven approach.
-Because FSMs can be complex and frequently occur in important domains, direct support of the generator is crucial in a system programming language.
+Because FSMs can be complex and frequently occur in important domains, direct generator support is important in a system programming language.
 
 \begin{figure}
@@ -796 +802 @@
 This semantics is basically a tail-call optimization, which compilers already perform.
 The example shows the assembly code to undo the generator's entry code before the direct jump.
-This assembly code depends on what entry code is generated, specifically if there are local variables, and the level of optimization.
+This assembly code depends on what entry code is generated, specifically if there are local variables and the level of optimization.
 To provide this new calling convention requires a mechanism built into the compiler, which is beyond the scope of \CFA at this time.
 Nevertheless, it is possible to hand generate any symmetric generators for proof of concept and performance testing.

libcfa/prelude/builtins.c

@@ -10 +10 @@
 // Created On       : Fri Jul 21 16:21:03 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 26 23:10:36 2019
-// Update Count     : 95
+// Last Modified On : Tue Jun 25 18:06:52 2019
+// Update Count     : 97
 //
 
@@ -49 +49 @@
 void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
-// increment/decrement unification
+// implicit increment, decrement if += defined, and implicit not if != defined
 
 static inline {
@@ -63 +63 @@
         forall( dtype DT | sized(DT) | { void ?{}( DT &, DT ); void ^?{}( DT & ); DT & ?-=?( DT &, one_t ); } )
         DT & ?--( DT & x ) { DT tmp = x; x -= 1; return tmp; }
+
+        forall( dtype DT | { int ?!=?( const DT &, zero_t ); } )
+        int !?( const DT & x ) { return !( x != 0 ); }
 } // distribution
 

libcfa/src/bits/containers.hfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 16:38:50 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 26 08:52:20 2019
+// Update Count     : 4
 
 #pragma once
@@ -115 +115 @@
                 }
                 return top;
+        }
+
+        forall(dtype T | is_node(T))
+        static inline int ?!=?( const __stack(T) & this, __attribute__((unused)) zero_t zero ) {
+                return this.top != 0;
         }
 #endif
@@ -186 +191 @@
 
         forall(dtype T | is_node(T))
-        static inline bool ?!=?( __queue(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __queue(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }
@@ -268 +273 @@
 
         forall(dtype T | sized(T))
-        static inline bool ?!=?( __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 08:03:59 2018
-// Update Count     : 458
+// Last Modified On : Mon Jun 24 17:34:44 2019
+// Update Count     : 462
 //
 
@@ -65 +65 @@
 forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } )
 T * anew( size_t dim, Params p ) {
-        T *arr = alloc( dim );
+        T * arr = alloc( dim );
         for ( unsigned int i = 0; i < dim; i += 1 ) {
                 (arr[i]){ p };                                                                  // run constructor

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Spt 13 15:59:00 2018
-// Update Count     : 17
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:02:34 2019
+// Update Count     : 18
 //
 
@@ -35 +35 @@
                 constexpr Spec( unsigned int val ) : val( val ) {}
                 constexpr Spec( Spec const & other ) : val( other.val ) {}
+                constexpr Spec & operator=( const Spec & ) = default;
                 // Operators may go here.
                 // Supports == and !=

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Oct 05 13:46:00 2018
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:10:37 2019
+// Update Count     : 2
 //
 
@@ -368 +368 @@
                 std::string resKey = SymTab::Mangler::mangleType( resType );
                 delete resType;
-                return std::move( resKey );
+                return resKey;
         }
         

src/SynTree/BaseSyntaxNode.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Feb 14 07:44:20 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 13:44:00
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:13:49 2019
+// Update Count     : 4
 //
 
@@ -25 +25 @@
 class BaseSyntaxNode {
   public:
-  static Stats::Counters::SimpleCounter* new_nodes;
+        static Stats::Counters::SimpleCounter* new_nodes;
 
         CodeLocation location;
 
-  BaseSyntaxNode() { ++*new_nodes; }
-  BaseSyntaxNode( const BaseSyntaxNode& o ) : location(o.location) { ++*new_nodes; }
-
+        BaseSyntaxNode() { ++*new_nodes; }
+        BaseSyntaxNode( const BaseSyntaxNode & o ) : location(o.location) { ++*new_nodes; }
+        BaseSyntaxNode & operator=( const BaseSyntaxNode & ) = default;
+        
         virtual ~BaseSyntaxNode() {}
 
@@ -37 +38 @@
         virtual void accept( Visitor & v ) = 0;
         virtual BaseSyntaxNode * acceptMutator( Mutator & m ) = 0;
-  /// Notes:
-  /// * each node is responsible for indenting its children.
-  /// * Expressions should not finish with a newline, since the expression's parent has better information.
+        /// Notes:
+        /// * each node is responsible for indenting its children.
+        /// * Expressions should not finish with a newline, since the expression's parent has better information.
         virtual void print( std::ostream & os, Indenter indent = {} ) const = 0;
 };

src/SynTree/Constant.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Spt 28 14:48:00 2018
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 15:57:38 2019
+// Update Count     : 19
 //
 
@@ -30 +30 @@
         Constant( Type * type, std::string rep, std::optional<unsigned long long> i );
         Constant( const Constant & other );
+        Constant & operator=( const Constant & ) = default;
         virtual ~Constant();
 

tests/.expect/completeTypeError.txt

@@ -27 +27 @@
     void 
   )
-  Environment:( _82_4_DT ) -> instance of struct A with body 0 (no widening)
+  Environment:( _83_4_DT ) -> instance of struct A with body 0 (no widening)
 
 
@@ -50 +50 @@
     void 
   )
-  Environment:( _82_4_DT ) -> instance of struct B with body 1 (no widening)
+  Environment:( _83_4_DT ) -> instance of struct B with body 1 (no widening)
 
 
@@ -127 +127 @@
           void 
         )
-        Environment:( _101_0_T ) -> instance of type T (not function type) (no widening)
+        Environment:( _102_0_T ) -> instance of type T (not function type) (no widening)
 
       Could not satisfy assertion:
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _101_0_T (not function type)
-          instance of type _101_0_T (not function type)
+          reference to instance of type _102_0_T (not function type)
+          instance of type _102_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _101_0_T (not function type)
+          _retval__operator_assign: instance of type _102_0_T (not function type)
           ... with attributes:
             Attribute with name: unused