Changeset 4b4f95f

Timestamp:

Apr 29, 2022, 9:39:24 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

24ceace

Parents:

433905a (diff), 0c939dd (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/Cargo.toml.in (modified) (1 diff)
• benchmark/Makefile.am (modified) (1 diff)
• benchmark/c.c (deleted)
• benchmark/readyQ/churn.cfa (modified) (7 diffs)
• benchmark/readyQ/churn.rs (added)
• src/AST/Convert.cpp (modified) (1 diff)
• src/Common/utility.h (modified) (2 diffs)
• src/SymTab/Validate.cc (modified) (3 diffs)
• src/SymTab/Validate.h (modified) (1 diff)
• src/Validate/EliminateTypedef.cpp (added)
• src/Validate/EliminateTypedef.hpp (added)
• src/Validate/FixQualifiedTypes.cpp (added)
• src/Validate/FixQualifiedTypes.hpp (added)
• src/Validate/ForallPointerDecay.cpp (modified) (2 diffs)
• src/Validate/ForallPointerDecay.hpp (modified) (2 diffs)
• src/Validate/GenericParameter.cpp (modified) (3 diffs)
• src/Validate/HoistStruct.cpp (added)
• src/Validate/HoistStruct.hpp (added)
• src/Validate/NoIdSymbolTable.hpp (added)
• src/Validate/module.mk (modified) (2 diffs)
• src/main.cc (modified) (5 diffs)
• tests/.expect/nested-types-ERR2.nast.txt (added)
• tests/.expect/nested-types-ERR2.oast.txt (moved) (moved from tests/.expect/nested-types-ERR2.txt)

benchmark/Cargo.toml.in

@@ -4 +4 @@
 authors = ["Cforall"]
 edition = "2018"
+
+[[bin]]
+name = "rdq-churn-tokio"
+path = "@abs_srcdir@/readyQ/churn.rs"
 
 [[bin]]

benchmark/Makefile.am

@@ -614 +614 @@
 RDQBENCHES = \
         rdq-churn-cfa \
+        rdq-churn-tokio \
+        rdq-churn-go \
+        rdq-churn-fibre \
         rdq-cycle-cfa \
         rdq-cycle-tokio \

benchmark/readyQ/churn.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
+#include <locks.hfa>
+
 unsigned spot_cnt = 2;
-bench_sem * volatile * spots;
+semaphore * spots;
 
 thread BThrd {
         unsigned long long count;
         unsigned long long blocks;
-        bench_sem sem;
+        bool skip;
 };
 
@@ -14 +16 @@
         this.count  = 0;
         this.blocks = 0;
+        this.skip = false;
 }
 
@@ -19 +22 @@
 
 void main( BThrd & this ) with( this ) {
-        wait( sem );
+        park();
         for() {
-                uint32_t r = prng();
-                bench_sem * next = __atomic_exchange_n(&spots[r % spot_cnt], &sem, __ATOMIC_SEQ_CST);
-                if(next) post( *next );
-                blocks += wait( sem );
+                uint32_t r = prng(this);
+                semaphore & sem = spots[r % spot_cnt];
+                if(!skip) V( sem );
+                blocks += P( sem );
+                skip = false;
+
                 count ++;
                 if( clock_mode && stop) break;
@@ -49 +54 @@
                         spots = aalloc(spot_cnt);
                         for(i; spot_cnt) {
-                                spots[i] = 0p;
+                                (spots[i]){ 0 };
                         }
 
@@ -55 +60 @@
                         BThrd * threads[nthreads];
                         for(i; nthreads ) {
-                                threads[i] = malloc();
-                                (*threads[i]){};
+                                BThrd & t = *(threads[i] = malloc());
+                                (t){};
+                                t.skip = i < spot_cnt;
                         }
                         printf("Starting\n");
@@ -64 +70 @@
 
                         for(i; nthreads) {
-                                post( threads[i]->sem );
+                                unpark( *threads[i] );
                         }
                         wait(start, is_tty);
@@ -72 +78 @@
                         printf("\nDone\n");
 
+                        for(i; spot_cnt) {
+                                for(10000) V( spots[i] );
+                        }
+
                         for(i; nthreads) {
-                                post( threads[i]->sem );
                                 BThrd & thrd = join( *threads[i] );
                                 global_counter += thrd.count;

src/AST/Convert.cpp

@@ -2729 +2729 @@
                         ty->forall.emplace_back(new ast::TypeInstType(param));
                         for (auto asst : param->assertions) {
-                                ty->assertions.emplace_back(new ast::VariableExpr({}, asst));
+                                ty->assertions.emplace_back(
+                                        new ast::VariableExpr(param->location, asst));
                         }
                 }

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 11 13:00:36 2020
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Apr 25 14:26:00 2022
+// Update Count     : 51
 //
 
@@ -230 +230 @@
 }
 
+template<typename Container, typename Pred>
+void erase_if( Container & cont, Pred && pred ) {
+        auto keep_end = std::remove_if( cont.begin(), cont.end(), pred );
+        cont.erase( keep_end, cont.end() );
+}
+
 template< typename... Args >
 auto zip(Args&&... args) -> decltype(zipWith(std::forward<Args>(args)..., std::make_pair)) {

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Nov 12 11:00:00 2021
-// Update Count     : 364
+// Last Modified On : Fri Apr 29  9:45:00 2022
+// Update Count     : 365
 //
 
@@ -143 +143 @@
         struct LinkReferenceToTypes_old final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes_old>, public WithShortCircuiting {
                 LinkReferenceToTypes_old( const Indexer * indexer );
+
                 void postvisit( TypeInstType * typeInst );
 
@@ -370 +371 @@
         }
 
+        void linkReferenceToTypes( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
+                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+        }
+
         void validate_B( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
                 PassVisitor<FixQualifiedTypes> fixQual;
                 {
                         Stats::Heap::newPass("validate-B");
                         Stats::Time::BlockGuard guard("validate-B");
-                        acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                        //linkReferenceToTypes( translationUnit );
                         mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
                         HoistStruct::hoistStruct( translationUnit );

src/SymTab/Validate.h

@@ -42 +42 @@
         void validate_E( std::list< Declaration * > &translationUnit );
         void validate_F( std::list< Declaration * > &translationUnit );
+        void linkReferenceToTypes( std::list< Declaration * > &translationUnit );
 
         const ast::Type * validateType(

src/Validate/ForallPointerDecay.cpp

@@ -10 +10 @@
 // Created On       : Tue Dec  7 16:15:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Feb 11 10:59:00 2022
-// Update Count     : 0
+// Last Modified On : Sat Apr 23 13:10:00 2022
+// Update Count     : 1
 //
 
@@ -237 +237 @@
 }
 
+std::vector<ast::ptr<ast::DeclWithType>> expandAssertions(
+                std::vector<ast::ptr<ast::DeclWithType>> const & old ) {
+        return TraitExpander::expandAssertions( old );
+}
+
 } // namespace Validate
 

src/Validate/ForallPointerDecay.hpp

@@ -10 +10 @@
 // Created On       : Tue Dec  7 16:15:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Dec  8 11:50:00 2021
-// Update Count     : 0
+// Last Modified On : Sat Apr 23 13:13:00 2022
+// Update Count     : 1
 //
 
 #pragma once
 
+#include <vector>
+#include "AST/Node.hpp"
+
 namespace ast {
+        class DeclWithType;
         class TranslationUnit;
 }
@@ -27 +31 @@
 void decayForallPointers( ast::TranslationUnit & transUnit );
 
+/// Expand all traits in an assertion list.
+std::vector<ast::ptr<ast::DeclWithType>> expandAssertions(
+        std::vector<ast::ptr<ast::DeclWithType>> const & );
+
 }
 

src/Validate/GenericParameter.cpp

@@ -10 +10 @@
 // Created On       : Fri Mar 21 10:02:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 13 10:09:00 2022
-// Update Count     : 0
+// Last Modified On : Fri Apr 22 16:43:00 2022
+// Update Count     : 1
 //
 
@@ -22 +22 @@
 #include "AST/TranslationUnit.hpp"
 #include "AST/Type.hpp"
+#include "Validate/NoIdSymbolTable.hpp"
 
 namespace Validate {
@@ -138 +139 @@
 // --------------------------------------------------------------------------
 
-// A SymbolTable that only has the operations used in the Translate Dimension
-// pass. More importantly, it doesn't have some methods that should no be
-// called by the Pass template (lookupId and addId).
-class NoIdSymbolTable {
-        ast::SymbolTable base;
-public:
-#       define FORWARD_X( func, types_and_names, just_names ) \
-        inline auto func types_and_names -> decltype( base.func just_names ) { \
-                return base.func just_names ; \
-        }
-#       define FORWARD_0( func )         FORWARD_X( func, (),             () )
-#       define FORWARD_1( func, type )   FORWARD_X( func, (type arg),     (arg) )
-#       define FORWARD_2( func, t0, t1 ) FORWARD_X( func, (t0 a0, t1 a1), (a0, a1) )
-
-        FORWARD_0( enterScope )
-        FORWARD_0( leaveScope )
-        FORWARD_1( lookupType, const std::string &        )
-        FORWARD_1( addType   , const ast::NamedTypeDecl * )
-        FORWARD_1( addStruct , const ast::StructDecl *    )
-        FORWARD_1( addEnum   , const ast::EnumDecl *      )
-        FORWARD_1( addUnion  , const ast::UnionDecl *     )
-        FORWARD_1( addTrait  , const ast::TraitDecl *     )
-        FORWARD_2( addWith   , const std::vector< ast::ptr<ast::Expr> > &, const ast::Decl * )
-};
-
-struct TranslateDimensionCore : public ast::WithGuards {
-        NoIdSymbolTable symtab;
+struct TranslateDimensionCore :
+                public WithNoIdSymbolTable, public ast::WithGuards {
 
         // SUIT: Struct- or Union- InstType

src/Validate/module.mk

@@ -20 +20 @@
         Validate/CompoundLiteral.cpp \
         Validate/CompoundLiteral.hpp \
+        Validate/EliminateTypedef.cpp \
+        Validate/EliminateTypedef.hpp \
+        Validate/FixQualifiedTypes.cpp \
+        Validate/FixQualifiedTypes.hpp \
         Validate/ForallPointerDecay.cpp \
         Validate/ForallPointerDecay.hpp \
@@ -26 +30 @@
         Validate/HandleAttributes.cc \
         Validate/HandleAttributes.h \
+        Validate/HoistStruct.cpp \
+        Validate/HoistStruct.hpp \
         Validate/InitializerLength.cpp \
         Validate/InitializerLength.hpp \
         Validate/LabelAddressFixer.cpp \
         Validate/LabelAddressFixer.hpp \
+        Validate/NoIdSymbolTable.hpp \
         Validate/ReturnCheck.cpp \
         Validate/ReturnCheck.hpp \

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 13 11:11:00 2022
-// Update Count     : 672
+// Last Modified On : Fri Apr 29  9:52:00 2022
+// Update Count     : 673
 //
 
@@ -75 +75 @@
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
+#include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
+#include "Validate/EliminateTypedef.hpp"    // for eliminateTypedef
+#include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
+#include "Validate/FixQualifiedTypes.hpp"   // for fixQualifiedTypes
+#include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
 #include "Validate/GenericParameter.hpp"    // for fillGenericParameters, tr...
-#include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
-#include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
-#include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
+#include "Validate/HoistStruct.hpp"         // for hoistStruct
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
@@ -328 +331 @@
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
-                PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
+
+                // Must happen before auto-gen, because it uses the sized flag.
+                PASS( "Link Reference To Types", SymTab::linkReferenceToTypes( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -342 +347 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Must happen after Link References To Types,
+                        // because aggregate members are accessed.
+                        PASS( "Fix Qualified Types", Validate::fixQualifiedTypes( transUnit ) );
+
+                        PASS( "Hoist Struct", Validate::hoistStruct( transUnit ) );
+                        PASS( "Eliminate Typedef", Validate::eliminateTypedef( transUnit ) );
 
                         // Check as early as possible. Can't happen before
@@ -438 +450 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
                         PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
                         PASS( "Validate-D", SymTab::validate_D( translationUnit ) );