Changeset d4da1535

Timestamp:

Mar 29, 2022, 4:41:30 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4598e03

Parents:

edf247b (diff), 6e47b49 (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:

• libcfa/src/concurrency/io.cfa (modified) (4 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel.hfa (modified) (1 diff)
• libcfa/src/concurrency/kernel/startup.cfa (modified) (1 diff)
• src/AST/Convert.cpp (modified) (1 diff)
• src/AST/Decl.cpp (modified) (1 diff)
• src/AST/Type.cpp (modified) (1 diff)
• src/AST/Type.hpp (modified) (1 diff)
• src/Concurrency/KeywordsNew.cpp (modified) (2 diffs)
• src/ResolvExpr/Resolver.cc (modified) (1 diff)
• src/Validate/Autogen.cpp (modified) (2 diffs)
• src/Validate/ForallPointerDecay.cpp (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -635 +635 @@
 
                         // We can proceed to the fast path
-                        if( !__alloc(ctx, &idx, 1) ) return false;
+                        if( !__alloc(ctx, &idx, 1) ) {
+                                /* paranoid */ verify( false ); // for now check if this happens, next time just abort the sleep.
+                                return false;
+                        }
 
                         // Allocation was successful
@@ -665 +668 @@
 
                         /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                        __submit( ctx, &idx, 1, true );
+                        __submit_only( ctx, &idx, 1 );
 
                         /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
@@ -676 +679 @@
                         iovec iov;
                         __atomic_acquire( &proc->io.ctx->cq.lock );
+
+                        __attribute__((used)) volatile bool was_reset = false;
 
                         with( proc->idle_wctx) {
@@ -687 +692 @@
                                         iov.iov_len  = sizeof(eventfd_t);
                                         __kernel_read(proc, *ftr, iov, evfd );
+                                        ftr->result = 0xDEADDEAD;
+                                        *((eventfd_t *)rdbuf) = 0xDEADDEADDEADDEAD;
+                                        was_reset = true;
                                 }
                         }
 
-                        __ioarbiter_flush( *proc->io.ctx );
-                        ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
+                        if( !__atomic_load_n( &proc->do_terminate, __ATOMIC_SEQ_CST ) ) {
+                                __ioarbiter_flush( *proc->io.ctx );
+                                proc->idle_wctx.sleep_time = rdtscl();
+                                ioring_syscsll( *proc->io.ctx, 1, IORING_ENTER_GETEVENTS);
+                        }
 
                         ready_schedule_lock();
                         __cfa_do_drain( proc->io.ctx, proc->cltr );
                         ready_schedule_unlock();
+
+                        asm volatile ("" :: "m" (was_reset));
                 }
         #endif

libcfa/src/concurrency/kernel.cfa

@@ -682 +682 @@
         this->idle_wctx.sem = 1;
 
+        this->idle_wctx.wake_time = rdtscl();
+
         eventfd_t val;
         val = 1;

libcfa/src/concurrency/kernel.hfa

@@ -74 +74 @@
         // unused if not using io_uring for idle sleep
         io_future_t * ftr;
+
+        volatile unsigned long long wake_time;
+        volatile unsigned long long sleep_time;
 };
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -558 +558 @@
 
         idle_wctx.sem = 0;
+        idle_wctx.wake_time = 0;
 
         // I'm assuming these two are reserved for standard input and output

src/AST/Convert.cpp

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

src/AST/Decl.cpp

@@ -68 +68 @@
         }
         for (auto & tp : this->type_params) {
-                ftype->forall.emplace_back(new TypeInstType(tp->name, tp));
+                ftype->forall.emplace_back(new TypeInstType(tp));
                 for (auto & ap: tp->assertions) {
                         ftype->assertions.emplace_back(new VariableExpr(loc, ap));

src/AST/Type.cpp

@@ -147 +147 @@
 // --- TypeInstType
 
+TypeInstType::TypeInstType( const TypeDecl * b,
+        CV::Qualifiers q, std::vector<ptr<Attribute>> && as )
+: BaseInstType( b->name, q, move(as) ), base( b ), kind( b->kind ) {}
+
 void TypeInstType::set_base( const TypeDecl * b ) {
         base = b;

src/AST/Type.hpp

@@ -421 +421 @@
                 std::vector<ptr<Attribute>> && as = {} )
         : BaseInstType( n, q, std::move(as) ), base( b ), kind( b->kind ) {}
+
+        TypeInstType( const TypeDecl * b,
+                CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
+
         TypeInstType( const std::string& n, TypeDecl::Kind k, CV::Qualifiers q = {},
                 std::vector<ptr<Attribute>> && as = {} )

src/Concurrency/KeywordsNew.cpp

@@ -88 +88 @@
                 auto typeDecl = ast::deepCopy( typeParam );
                 mutFunc->type_params.push_back( typeDecl );
-                mutType->forall.push_back(
-                        new ast::TypeInstType( typeDecl->name, typeDecl ) );
+                mutType->forall.push_back( new ast::TypeInstType( typeDecl ) );
                 for ( auto & assertion : typeDecl->assertions ) {
                         mutFunc->assertions.push_back( assertion );
@@ -108 +107 @@
         for ( const ast::ptr<ast::TypeDecl> & typeDecl : mutFunc->type_params ) {
                 paramTypeInst->params.push_back(
-                        new ast::TypeExpr( location,
-                                new ast::TypeInstType( typeDecl->name, typeDecl ) ) );
+                        new ast::TypeExpr( location, new ast::TypeInstType( typeDecl ) ) );
                 typeParamInst->params.push_back(
-                        new ast::TypeExpr( location,
-                                new ast::TypeInstType( typeDecl->name, typeDecl ) ) );
+                        new ast::TypeExpr( location, new ast::TypeInstType( typeDecl ) ) );
         }
 

src/ResolvExpr/Resolver.cc

@@ -1385 +1385 @@
                         for (auto & typeParam : mutDecl->type_params) {
                                 symtab.addType(typeParam);
-                                mutType->forall.emplace_back(new ast::TypeInstType(typeParam->name, typeParam));
+                                mutType->forall.emplace_back(new ast::TypeInstType(typeParam));
                         }
                         for (auto & asst : mutDecl->assertions) {

src/Validate/Autogen.cpp

@@ -248 +248 @@
                 structInst.params.push_back( new ast::TypeExpr(
                         typeDecl->location,
-                        new ast::TypeInstType( typeDecl->name, typeDecl )
+                        new ast::TypeInstType( typeDecl )
                 ) );
         }
@@ -264 +264 @@
                 unionInst.params.push_back( new ast::TypeExpr(
                         unionDecl->location,
-                        new ast::TypeInstType( typeDecl->name, typeDecl )
+                        new ast::TypeInstType( typeDecl )
                 ) );
         }

src/Validate/ForallPointerDecay.cpp

@@ -41 +41 @@
         for ( auto & type_param : decl->type_params ) {
                 type->forall.emplace_back(
-                        new ast::TypeInstType( type_param->name, type_param ) );
+                        new ast::TypeInstType( type_param ) );
         }
         for ( auto & assertion : decl->assertions ) {