Index: doc/LaTeXmacros/common.sty =================================================================== --- doc/LaTeXmacros/common.sty (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ doc/LaTeXmacros/common.sty (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Mon May 31 09:08:37 2021 -%% Update Count : 565 +%% Last Modified On : Mon Feb 7 23:00:46 2022 +%% Update Count : 569 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -43,4 +43,5 @@ \newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon \newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace} % C++ symbolic name +\newcommand{\Cpp}[1][]{\CC{#1}} % C++ synonym % numbers disallowed in latex variables names => use number names \newcommand{\CCeleven}{\protect\CCIcon{11}\xspace} % C++11 symbolic name @@ -51,4 +52,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage{pslatex} % reduce size of san serif font +\usepackage{relsize} % must be after change to small or selects old size +\usepackage{rotating} +\usepackage{calc} % latex arithmetic % remove special-character warning in PDF side-bar names @@ -71,9 +77,4 @@ \newlength{\parindentlnth} \setlength{\parindentlnth}{\parindent} - -\usepackage{pslatex} % reduce size of san serif font -\usepackage{relsize} % must be after change to small or selects old size -\usepackage{rotating} -\usepackage{calc} % latex arithmetic % reduce size of chapter/section titles @@ -151,4 +152,25 @@ \newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} +% \snake{} +% Improves writing of snake case (or any convention that uses _) by allowing +% line breaks after _. Disables commands inside the block and formats the +% identifier to look like code. +\newcommand*\snake[1]{\snakefont{\expandafter\snake@next\detokenize{#1}\@nil}} + +% \snakefont{} +% Command used by \snake, you may renew the command to change its formating. +\newcommand*\snakefont[1]{\LstBasicStyle{#1}} + +% Thanks Manuel of TeX Stack exchange. (I got the base pattern from one of +% their answers.) Note: \@nil should never be defined. +\newcommand*\snake@next[1]{\ifx\@nil#1\else + \expandafter\ifx\string_#1\string_\allowbreak\else#1\fi + \expandafter\snake@next\fi +} + +% \lang{}{} +% Use the listings package to format the snipit of in . +\newcommand{\lang}[2]{\lstinline[language=#1]{#2}} + % Latin abbreviation \newcommand{\abbrevFont}{\textit} % set empty for no italics @@ -263,5 +285,5 @@ extendedchars=true, % allow ASCII characters in the range 128-255 escapechar=\$, % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-' -mathescape=false, % LaTeX math escape in CFA code $...$ +mathescape=false, % disable LaTeX math escape in CFA code $...$ keepspaces=true, % showstringspaces=false, % do not show spaces with cup @@ -308,7 +330,5 @@ }{} % inline code @...@ (at symbol) -\makeatother \lstMakeShortInline@ % single-character for \lstinline -\makeatletter \fi% Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ doc/LaTeXmacros/common.tex (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Mon May 31 09:10:49 2021 -%% Update Count : 546 +%% Last Modified On : Mon Feb 7 23:00:08 2022 +%% Update Count : 552 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -43,4 +43,5 @@ \newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon \newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace} % C++ symbolic name +\newcommand{\Cpp}[1][]{\CC{#1}} % C++ synonym % numbers disallowed in latex variables names => use number names \newcommand{\CCeleven}{\protect\CCIcon{11}\xspace} % C++11 symbolic name @@ -51,4 +52,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\usepackage{pslatex} % reduce size of san serif font +\usepackage{relsize} % must be after change to small or selects old size +\usepackage{rotating} +\usepackage{calc} % latex arithmetic % remove special-character warning in PDF side-bar names @@ -72,9 +78,4 @@ \newlength{\parindentlnth} \setlength{\parindentlnth}{\parindent} - -\usepackage{pslatex} % reduce size of san serif font -\usepackage{relsize} % must be after change to small or selects old size -\usepackage{rotating} -\usepackage{calc} % latex arithmetic % reduce size of chapter/section titles @@ -152,4 +153,25 @@ \newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} +% \snake{} +% Improves writing of snake case (or any convention that uses _) by allowing +% line breaks after _. Disables commands inside the block and formats the +% identifier to look like code. +\newcommand*\snake[1]{\snakefont{\expandafter\snake@next\detokenize{#1}\@nil}} + +% \snakefont{} +% Command used by \snake, you may renew the command to change its formating. +\newcommand*\snakefont[1]{\LstBasicStyle{#1}} + +% Thanks Manuel of TeX Stack exchange. (I got the base pattern from one of +% their answers.) Note: \@nil should never be defined. +\newcommand*\snake@next[1]{\ifx\@nil#1\else + \expandafter\ifx\string_#1\string_\allowbreak\else#1\fi + \expandafter\snake@next\fi +} + +% \lang{}{} +% Use the listings package to format the snipit of in . +\newcommand{\lang}[2]{\lstinline[language=#1]{#2}} + % Latin abbreviation \newcommand{\abbrevFont}{\textit} % set empty for no italics @@ -268,5 +290,5 @@ extendedchars=true, % allow ASCII characters in the range 128-255 escapechar=\$, % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-' -mathescape=false, % LaTeX math escape in CFA code $...$ +mathescape=false, % disable LaTeX math escape in CFA code $...$ keepspaces=true, % showstringspaces=false, % do not show spaces with cup Index: doc/theses/thierry_delisle_PhD/thesis/Makefile =================================================================== --- doc/theses/thierry_delisle_PhD/thesis/Makefile (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ doc/theses/thierry_delisle_PhD/thesis/Makefile (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -48,5 +48,5 @@ ## Define the documents that need to be made. all: thesis.pdf -thesis.pdf: ${TEXTS} ${FIGURES} ${PICTURES} thesis.tex glossary.tex local.bib +thesis.pdf: ${TEXTS} ${FIGURES} ${PICTURES} thesis.tex glossary.tex local.bib ../../../LaTeXmacros/common.tex ../../../LaTeXmacros/common.sty DOCUMENT = thesis.pdf Index: libcfa/src/concurrency/preemption.cfa =================================================================== --- libcfa/src/concurrency/preemption.cfa (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ libcfa/src/concurrency/preemption.cfa (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -251,7 +251,18 @@ bool enabled = __cfaabi_tls.preemption_state.enabled; + // Check if there is a pending preemption + processor * proc = __cfaabi_tls.this_processor; + bool pending = proc ? proc->pending_preemption : false; + if( enabled && pending ) proc->pending_preemption = false; + // create a assembler label after // marked as clobber all to avoid movement __cfaasm_label(check, after); + + // If we can preempt and there is a pending one + // this is a good time to yield + if( enabled && pending ) { + force_yield( __POLL_PREEMPTION ); + } return enabled; } @@ -282,4 +293,6 @@ // marked as clobber all to avoid movement __cfaasm_label(get, after); + + // This is used everywhere, to avoid cost, we DO NOT poll pending preemption return val; } @@ -358,24 +371,20 @@ if(!ready) { abort("Preemption should be ready"); } - __cfaasm_label(debug, before); - - sigset_t oldset; - int ret; - ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset); // workaround trac#208: cast should be unnecessary - if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); } - - ret = sigismember(&oldset, SIGUSR1); - if(ret < 0) { abort("ERROR sigismember returned %d", ret); } - if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); } - - ret = sigismember(&oldset, SIGALRM); - if(ret < 0) { abort("ERROR sigismember returned %d", ret); } - if(ret == 0) { abort("ERROR SIGALRM is enabled"); } - - ret = sigismember(&oldset, SIGTERM); - if(ret < 0) { abort("ERROR sigismember returned %d", ret); } - if(ret == 1) { abort("ERROR SIGTERM is disabled"); } - - __cfaasm_label(debug, after); + sigset_t oldset; + int ret; + ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset); // workaround trac#208: cast should be unnecessary + if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); } + + ret = sigismember(&oldset, SIGUSR1); + if(ret < 0) { abort("ERROR sigismember returned %d", ret); } + if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); } + + ret = sigismember(&oldset, SIGALRM); + if(ret < 0) { abort("ERROR sigismember returned %d", ret); } + if(ret == 0) { abort("ERROR SIGALRM is enabled"); } + + ret = sigismember(&oldset, SIGTERM); + if(ret < 0) { abort("ERROR sigismember returned %d", ret); } + if(ret == 1) { abort("ERROR SIGTERM is disabled"); } } @@ -548,5 +557,5 @@ __cfaasm_label( check ); __cfaasm_label( dsable ); - __cfaasm_label( debug ); + // __cfaasm_label( debug ); // Check if preemption is safe @@ -555,5 +564,5 @@ if( __cfaasm_in( ip, check ) ) { ready = false; goto EXIT; }; if( __cfaasm_in( ip, dsable ) ) { ready = false; goto EXIT; }; - if( __cfaasm_in( ip, debug ) ) { ready = false; goto EXIT; }; + // if( __cfaasm_in( ip, debug ) ) { ready = false; goto EXIT; }; if( !__cfaabi_tls.preemption_state.enabled) { ready = false; goto EXIT; }; if( __cfaabi_tls.preemption_state.in_progress ) { ready = false; goto EXIT; }; @@ -661,5 +670,10 @@ // Check if it is safe to preempt here - if( !preemption_ready( ip ) ) { return; } + if( !preemption_ready( ip ) ) { + #if !defined(__CFA_NO_STATISTICS__) + __cfaabi_tls.this_stats->ready.threads.preempt.rllfwd++; + #endif + return; + } __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p @ %p).\n", __cfaabi_tls.this_processor, __cfaabi_tls.this_thread, (void *)(cxt->uc_mcontext.CFA_REG_IP) ); @@ -680,4 +694,8 @@ // Preemption can occur here + + #if !defined(__CFA_NO_STATISTICS__) + __cfaabi_tls.this_stats->ready.threads.preempt.yield++; + #endif force_yield( __ALARM_PREEMPTION ); // Do the actual __cfactx_switch Index: libcfa/src/concurrency/stats.cfa =================================================================== --- libcfa/src/concurrency/stats.cfa (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ libcfa/src/concurrency/stats.cfa (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -29,4 +29,6 @@ stats->ready.threads.threads = 0; stats->ready.threads.cthreads = 0; + stats->ready.threads.preempt.yield = 0; + stats->ready.threads.preempt.rllfwd = 0; stats->ready.sleep.halts = 0; stats->ready.sleep.cancels = 0; @@ -77,28 +79,30 @@ void __tally_stats( struct __stats_t * cltr, struct __stats_t * proc ) { - tally_one( &cltr->ready.push.local.attempt, &proc->ready.push.local.attempt ); - tally_one( &cltr->ready.push.local.success, &proc->ready.push.local.success ); - tally_one( &cltr->ready.push.share.attempt, &proc->ready.push.share.attempt ); - tally_one( &cltr->ready.push.share.success, &proc->ready.push.share.success ); - tally_one( &cltr->ready.push.extrn.attempt, &proc->ready.push.extrn.attempt ); - tally_one( &cltr->ready.push.extrn.success, &proc->ready.push.extrn.success ); - tally_one( &cltr->ready.pop.local .attempt, &proc->ready.pop.local .attempt ); - tally_one( &cltr->ready.pop.local .success, &proc->ready.pop.local .success ); - tally_one( &cltr->ready.pop.help .attempt, &proc->ready.pop.help .attempt ); - tally_one( &cltr->ready.pop.help .success, &proc->ready.pop.help .success ); - tally_one( &cltr->ready.pop.steal .attempt, &proc->ready.pop.steal .attempt ); - tally_one( &cltr->ready.pop.steal .success, &proc->ready.pop.steal .success ); - tally_one( &cltr->ready.pop.search.attempt, &proc->ready.pop.search.attempt ); - tally_one( &cltr->ready.pop.search.success, &proc->ready.pop.search.success ); - tally_one( &cltr->ready.threads.migration , &proc->ready.threads.migration ); - tally_one( &cltr->ready.threads.extunpark , &proc->ready.threads.extunpark ); - tally_one( &cltr->ready.threads.threads , &proc->ready.threads.threads ); - tally_one( &cltr->ready.threads.cthreads , &proc->ready.threads.cthreads ); - tally_one( &cltr->ready.sleep.halts , &proc->ready.sleep.halts ); - tally_one( &cltr->ready.sleep.cancels , &proc->ready.sleep.cancels ); - tally_one( &cltr->ready.sleep.early , &proc->ready.sleep.early ); - tally_one( &cltr->ready.sleep.wakes , &proc->ready.sleep.wakes ); - tally_one( &cltr->ready.sleep.seen , &proc->ready.sleep.wakes ); - tally_one( &cltr->ready.sleep.exits , &proc->ready.sleep.exits ); + tally_one( &cltr->ready.push.local.attempt , &proc->ready.push.local.attempt ); + tally_one( &cltr->ready.push.local.success , &proc->ready.push.local.success ); + tally_one( &cltr->ready.push.share.attempt , &proc->ready.push.share.attempt ); + tally_one( &cltr->ready.push.share.success , &proc->ready.push.share.success ); + tally_one( &cltr->ready.push.extrn.attempt , &proc->ready.push.extrn.attempt ); + tally_one( &cltr->ready.push.extrn.success , &proc->ready.push.extrn.success ); + tally_one( &cltr->ready.pop.local .attempt , &proc->ready.pop.local .attempt ); + tally_one( &cltr->ready.pop.local .success , &proc->ready.pop.local .success ); + tally_one( &cltr->ready.pop.help .attempt , &proc->ready.pop.help .attempt ); + tally_one( &cltr->ready.pop.help .success , &proc->ready.pop.help .success ); + tally_one( &cltr->ready.pop.steal .attempt , &proc->ready.pop.steal .attempt ); + tally_one( &cltr->ready.pop.steal .success , &proc->ready.pop.steal .success ); + tally_one( &cltr->ready.pop.search.attempt , &proc->ready.pop.search.attempt ); + tally_one( &cltr->ready.pop.search.success , &proc->ready.pop.search.success ); + tally_one( &cltr->ready.threads.migration , &proc->ready.threads.migration ); + tally_one( &cltr->ready.threads.extunpark , &proc->ready.threads.extunpark ); + tally_one( &cltr->ready.threads.threads , &proc->ready.threads.threads ); + tally_one( &cltr->ready.threads.cthreads , &proc->ready.threads.cthreads ); + tally_one( &cltr->ready.threads.preempt.yield , &proc->ready.threads.preempt.yield ); + tally_one( &cltr->ready.threads.preempt.rllfwd, &proc->ready.threads.preempt.rllfwd ); + tally_one( &cltr->ready.sleep.halts , &proc->ready.sleep.halts ); + tally_one( &cltr->ready.sleep.cancels , &proc->ready.sleep.cancels ); + tally_one( &cltr->ready.sleep.early , &proc->ready.sleep.early ); + tally_one( &cltr->ready.sleep.wakes , &proc->ready.sleep.wakes ); + tally_one( &cltr->ready.sleep.seen , &proc->ready.sleep.wakes ); + tally_one( &cltr->ready.sleep.exits , &proc->ready.sleep.exits ); #if defined(CFA_HAVE_LINUX_IO_URING_H) @@ -168,4 +172,5 @@ | eng3(ready.sleep.wakes + ready.sleep.early) | '(' | eng3(ready.sleep.early) | ',' | eng3(ready.sleep.seen) | ')' | " wake(early, seen)," | eng3(ready.sleep.exits) | "exit"; + sstr | "- Preemption : " | eng3(ready.threads.preempt.yield) | "yields," | eng3(ready.threads.preempt.rllfwd) | "delayed"; sstr | nl; } Index: libcfa/src/concurrency/stats.hfa =================================================================== --- libcfa/src/concurrency/stats.hfa (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ libcfa/src/concurrency/stats.hfa (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -65,4 +65,8 @@ volatile int64_t threads; // number of threads in the system, includes only local change volatile int64_t cthreads; // number of threads in the system, includes only local change + struct { + volatile uint64_t yield; + volatile uint64_t rllfwd; + } preempt; } threads; struct { Index: libcfa/src/stdhdr/pthread.h =================================================================== --- libcfa/src/stdhdr/pthread.h (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ libcfa/src/stdhdr/pthread.h (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -10,15 +10,34 @@ // Created On : Wed Jun 16 13:39:06 2021 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 16 13:39:42 2021 -// Update Count : 1 +// Last Modified On : Thu Feb 3 21:53:26 2022 +// Update Count : 13 // +// pthread.h and setjmp.h cannot agree on the type of __sigsetjmp: +// +// extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __attribute__ ((__nothrow__)); +// extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __attribute__ ((__nothrow__)); +// +// With -Wall, gcc-11 warns about the disagreement unless the CPP directive +// +// # 1 "/usr/include/pthread.h" 1 3 4 +// +// appears, which appears to be witchcraft. Unfortunately, this directive is removed by the CFA preprocessor, so the +// batchtest fails because of the spurious warning message. Hence, the warning is elided. + extern "C" { +#if defined(__GNUC__) && __GNUC__ == 11 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Warray-parameter" +#endif // defined(__GNUC__) && __GNUC__ == 11 + #include_next // has internal check for multiple expansion + +#if defined(__GNUC__) && __GNUC__ == 11 + #pragma GCC diagnostic pop +#endif // defined(__GNUC__) && __GNUC__ == 11 } // extern "C" // Local Variables: // -// tab-width: 4 // // mode: c++ // -// compile-command: "make install" // // End: // Index: libcfa/src/stdhdr/setjmp.h =================================================================== --- libcfa/src/stdhdr/setjmp.h (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ libcfa/src/stdhdr/setjmp.h (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -10,15 +10,34 @@ // Created On : Mon Jul 4 23:25:26 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 5 20:38:33 2016 -// Update Count : 12 +// Last Modified On : Thu Feb 3 21:53:28 2022 +// Update Count : 18 // +// pthread.h and setjmp.h cannot agree on the type of __sigsetjmp: +// +// extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __attribute__ ((__nothrow__)); +// extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __attribute__ ((__nothrow__)); +// +// With -Wall, gcc-11 warns about the disagreement unless the CPP directive +// +// # 1 "/usr/include/pthread.h" 1 3 4 +// +// appears, which appears to be witchcraft. Unfortunately, this directive is removed by the CFA preprocessor, so the +// batchtest fails because of the spurious warning message. Hence, the warning is elided. + extern "C" { +#if defined(__GNUC__) && __GNUC__ == 11 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Warray-parameter" +#endif // defined(__GNUC__) && __GNUC__ == 11 + #include_next // has internal check for multiple expansion + +#if defined(__GNUC__) && __GNUC__ == 11 + #pragma GCC diagnostic pop +#endif // defined(__GNUC__) && __GNUC__ == 11 } // extern "C" // Local Variables: // -// tab-width: 4 // // mode: c++ // -// compile-command: "make install" // // End: // Index: src/AST/Pass.hpp =================================================================== --- src/AST/Pass.hpp (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ src/AST/Pass.hpp (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -238,31 +238,99 @@ private: - const ast::Stmt * call_accept( const ast::Stmt * ); - const ast::Expr * call_accept( const ast::Expr * ); - - // requests WithStmtsToAdd directly add to this statement, as if it is a compound. - - const ast::Stmt * call_accept_as_compound(const ast::Stmt *); - + + // Regular nodes template< typename node_t > - auto call_accept( const node_t * node ) -> typename std::enable_if< + struct result1 { + bool differs; + const node_t * value; + + template< typename object_t, typename super_t, typename field_t > + void apply(object_t *, field_t super_t::* field); + }; + + result1 call_accept( const ast::Stmt * ); + result1 call_accept( const ast::Expr * ); + + template< typename node_t > + auto call_accept( const node_t * node ) + -> typename std::enable_if< !std::is_base_of::value && !std::is_base_of::value - , decltype( node->accept(*this) ) + , result1< + typename std::remove_pointer< decltype( node->accept(*this) ) >::type + > >::type; + // requests WithStmtsToAdd directly add to this statement, as if it is a compound. + result1 call_accept_as_compound(const ast::Stmt *); + + // Container of statements template< template class container_t > - container_t< ptr > call_accept( const container_t< ptr > & ); - + struct resultNstmt { + struct delta { + ptr nval; + ssize_t old_idx; + bool is_old; + + delta(const Stmt * s, ssize_t i, bool old) : nval{s}, old_idx{i}, is_old{old} {} + }; + + bool differs; + container_t< delta > values; + + resultNstmt() : differs(false), values{} {} + resultNstmt(bool diff, container_t< delta > && vals) : differs(diff), values(vals) {} + + template< typename object_t, typename super_t, typename field_t > + void apply(object_t *, field_t super_t::* field); + + template< template class incontainer_t > + void take_all( incontainer_t> * stmts ) { + if(!stmts || stmts->empty()) return; + + std::transform(stmts->begin(), stmts->end(), std::back_inserter( values ), [](ast::ptr& decl) -> delta { + return delta( decl.release(), -1, false ); + }); + stmts->clear(); + differs = true; + } + + template< template class incontainer_t > + void take_all( incontainer_t> * decls ) { + if(!decls || decls->empty()) return; + + std::transform(decls->begin(), decls->end(), std::back_inserter( values ), [](ast::ptr& decl) -> auto { + auto loc = decl->location; + auto stmt = new DeclStmt( loc, decl.release() ); + return delta( stmt, -1, false ); + }); + decls->clear(); + differs = true; + } + }; + + template< template class container_t > + resultNstmt call_accept( const container_t< ptr > & ); + + // Container of something template< template class container_t, typename node_t > - container_t< ptr > call_accept( const container_t< ptr > & container ); + struct resultN { + bool differs; + container_t> values; + + template< typename object_t, typename super_t, typename field_t > + void apply(object_t *, field_t super_t::* field); + }; + + template< template class container_t, typename node_t > + resultN< container_t, node_t > call_accept( const container_t< ptr > & container ); public: /// Logic to call the accept and mutate the parent if needed, delegates call to accept - template - void maybe_accept(const node_t * &, child_t parent_t::* child); - - template - void maybe_accept_as_compound(const node_t * &, child_t parent_t::* child); + template + void maybe_accept(const node_t * &, field_t parent_t::* field); + + template + void maybe_accept_as_compound(const node_t * &, field_t parent_t::* field); private: Index: src/AST/Pass.impl.hpp =================================================================== --- src/AST/Pass.impl.hpp (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ src/AST/Pass.impl.hpp (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -79,9 +79,9 @@ template class container_t> - static inline void take_all( it_t it, container_t> * decls, bool * mutated = nullptr ) { - if(empty(decls)) return; - - std::move(decls->begin(), decls->end(), it); - decls->clear(); + static inline void take_all( it_t it, container_t> * stmts, bool * mutated = nullptr ) { + if(empty(stmts)) return; + + std::move(stmts->begin(), stmts->end(), it); + stmts->clear(); if(mutated) *mutated = true; } @@ -123,4 +123,12 @@ return !new_val.empty(); } + } + + + template< typename core_t > + template< typename node_t > + template< typename object_t, typename super_t, typename field_t > + void ast::Pass< core_t >::result1< node_t >::apply(object_t * object, field_t super_t::* field) { + object->*field = value; } @@ -131,5 +139,7 @@ !std::is_base_of::value && !std::is_base_of::value - , decltype( node->accept(*this) ) + , ast::Pass< core_t >::result1< + typename std::remove_pointer< decltype( node->accept(*this) ) >::type + > >::type { @@ -140,9 +150,15 @@ static_assert( !std::is_base_of::value, "ERROR"); - return node->accept( *this ); + auto nval = node->accept( *this ); + ast::Pass< core_t >::result1< + typename std::remove_pointer< decltype( node->accept(*this) ) >::type + > res; + res.differs = nval != node; + res.value = nval; + return res; } template< typename core_t > - const ast::Expr * ast::Pass< core_t >::call_accept( const ast::Expr * expr ) { + typename ast::Pass< core_t >::template result1 ast::Pass< core_t >::call_accept( const ast::Expr * expr ) { __pedantic_pass_assert( __visit_children() ); __pedantic_pass_assert( expr ); @@ -153,17 +169,19 @@ } - return expr->accept( *this ); + auto nval = expr->accept( *this ); + return { nval != expr, nval }; } template< typename core_t > - const ast::Stmt * ast::Pass< core_t >::call_accept( const ast::Stmt * stmt ) { + typename ast::Pass< core_t >::template result1 ast::Pass< core_t >::call_accept( const ast::Stmt * stmt ) { __pedantic_pass_assert( __visit_children() ); __pedantic_pass_assert( stmt ); - return stmt->accept( *this ); + const ast::Stmt * nval = stmt->accept( *this ); + return { nval != stmt, nval }; } template< typename core_t > - const ast::Stmt * ast::Pass< core_t >::call_accept_as_compound( const ast::Stmt * stmt ) { + typename ast::Pass< core_t >::template result1 ast::Pass< core_t >::call_accept_as_compound( const ast::Stmt * stmt ) { __pedantic_pass_assert( __visit_children() ); __pedantic_pass_assert( stmt ); @@ -190,5 +208,5 @@ // If the pass doesn't want to add anything then we are done if( empty(stmts_before) && empty(stmts_after) && empty(decls_before) && empty(decls_after) ) { - return nstmt; + return { nstmt != stmt, nstmt }; } @@ -212,10 +230,33 @@ __pass::take_all( std::back_inserter( compound->kids ), stmts_after ); - return compound; + return {true, compound}; } template< typename core_t > template< template class container_t > - container_t< ptr > ast::Pass< core_t >::call_accept( const container_t< ptr > & statements ) { + template< typename object_t, typename super_t, typename field_t > + void ast::Pass< core_t >::resultNstmt::apply(object_t * object, field_t super_t::* field) { + auto & container = object->*field; + __pedantic_pass_assert( container.size() <= values.size() ); + + auto cit = enumerate(container).begin(); + + container_t> nvals; + for(delta & d : values) { + if( d.is_old ) { + __pedantic_pass_assert( cit.idx <= d.old_idx ); + std::advance( cit, d.old_idx - cit.idx ); + nvals.push_back( std::move( (*cit).val) ); + } else { + nvals.push_back( std::move(d.nval) ); + } + } + + object->*field = std::move(nvals); + } + + template< typename core_t > + template< template class container_t > + typename ast::Pass< core_t >::template resultNstmt ast::Pass< core_t >::call_accept( const container_t< ptr > & statements ) { __pedantic_pass_assert( __visit_children() ); if( statements.empty() ) return {}; @@ -244,12 +285,13 @@ pass_visitor_stats.avg->push(pass_visitor_stats.depth); - bool mutated = false; - container_t< ptr > new_kids; - for( const Stmt * stmt : statements ) { + resultNstmt new_kids; + for( auto value : enumerate( statements ) ) { try { + size_t i = value.idx; + const Stmt * stmt = value.val; __pedantic_pass_assert( stmt ); const ast::Stmt * new_stmt = stmt->accept( *this ); assert( new_stmt ); - if(new_stmt != stmt ) mutated = true; + if(new_stmt != stmt ) { new_kids.differs = true; } // Make sure that it is either adding statements or declartions but not both @@ -261,13 +303,17 @@ // Take all the statements which should have gone after, N/A for first iteration - __pass::take_all( std::back_inserter( new_kids ), decls_before, &mutated ); - __pass::take_all( std::back_inserter( new_kids ), stmts_before, &mutated ); + new_kids.take_all( decls_before ); + new_kids.take_all( stmts_before ); // Now add the statement if there is one - new_kids.emplace_back( new_stmt ); + if(new_stmt != stmt) { + new_kids.values.emplace_back( new_stmt, i, false ); + } else { + new_kids.values.emplace_back( nullptr, i, true ); + } // Take all the declarations that go before - __pass::take_all( std::back_inserter( new_kids ), decls_after, &mutated ); - __pass::take_all( std::back_inserter( new_kids ), stmts_after, &mutated ); + new_kids.take_all( decls_after ); + new_kids.take_all( stmts_after ); } catch ( SemanticErrorException &e ) { @@ -278,10 +324,27 @@ if ( !errors.isEmpty() ) { throw errors; } - return mutated ? new_kids : container_t< ptr >(); + return new_kids; } template< typename core_t > template< template class container_t, typename node_t > - container_t< ast::ptr > ast::Pass< core_t >::call_accept( const container_t< ast::ptr > & container ) { + template< typename object_t, typename super_t, typename field_t > + void ast::Pass< core_t >::resultN::apply(object_t * object, field_t super_t::* field) { + auto & container = object->*field; + __pedantic_pass_assert( container.size() == values.size() ); + + for(size_t i = 0; i < container.size(); i++) { + // Take all the elements that are different in 'values' + // and swap them into 'container' + if( values[i] != nullptr ) std::swap(container[i], values[i]); + } + + // Now the original containers should still have the unchanged values + // but also contain the new values + } + + template< typename core_t > + template< template class container_t, typename node_t > + typename ast::Pass< core_t >::template resultN ast::Pass< core_t >::call_accept( const container_t< ast::ptr > & container ) { __pedantic_pass_assert( __visit_children() ); if( container.empty() ) return {}; @@ -293,12 +356,16 @@ bool mutated = false; - container_t< ast::ptr > new_kids; + container_t> new_kids; for ( const node_t * node : container ) { try { __pedantic_pass_assert( node ); const node_t * new_stmt = strict_dynamic_cast< const node_t * >( node->accept( *this ) ); - if(new_stmt != node ) mutated = true; - - new_kids.emplace_back( new_stmt ); + if(new_stmt != node ) { + mutated = true; + new_kids.emplace_back( new_stmt ); + } else { + new_kids.emplace_back( nullptr ); + } + } catch( SemanticErrorException &e ) { @@ -306,8 +373,10 @@ } } + + __pedantic_pass_assert( new_kids.size() == container.size() ); pass_visitor_stats.depth--; if ( ! errors.isEmpty() ) { throw errors; } - return mutated ? new_kids : container_t< ast::ptr >(); + return ast::Pass< core_t >::resultN{ mutated, new_kids }; } @@ -327,9 +396,9 @@ auto new_val = call_accept( old_val ); - static_assert( !std::is_same::value || std::is_same::value, "ERROR"); - - if( __pass::differs(old_val, new_val) ) { + static_assert( !std::is_same::value /* || std::is_same::value */, "ERROR"); + + if( new_val.differs ) { auto new_parent = __pass::mutate(parent); - new_parent->*child = new_val; + new_val.apply(new_parent, child); parent = new_parent; } @@ -353,7 +422,7 @@ static_assert( !std::is_same::value || std::is_same::value, "ERROR"); - if( __pass::differs(old_val, new_val) ) { + if( new_val.differs ) { auto new_parent = __pass::mutate(parent); - new_parent->*child = new_val; + new_val.apply( new_parent, child ); parent = new_parent; } @@ -941,4 +1010,5 @@ const Expr * func = clause.target.func ? clause.target.func->accept(*this) : nullptr; if(func != clause.target.func) mutated = true; + else func = nullptr; std::vector> new_args; @@ -946,13 +1016,18 @@ for( const auto & arg : clause.target.args ) { auto a = arg->accept(*this); - new_args.push_back( a ); - if( a != arg ) mutated = true; + if( a != arg ) { + mutated = true; + new_args.push_back( a ); + } else + new_args.push_back( nullptr ); } const Stmt * stmt = clause.stmt ? clause.stmt->accept(*this) : nullptr; if(stmt != clause.stmt) mutated = true; + else stmt = nullptr; const Expr * cond = clause.cond ? clause.cond->accept(*this) : nullptr; if(cond != clause.cond) mutated = true; + else cond = nullptr; new_clauses.push_back( WaitForStmt::Clause{ {func, std::move(new_args) }, stmt, cond } ); @@ -961,5 +1036,14 @@ if(mutated) { auto n = __pass::mutate(node); - n->clauses = std::move( new_clauses ); + for(size_t i = 0; i < new_clauses.size(); i++) { + if(new_clauses.at(i).target.func != nullptr) std::swap(n->clauses.at(i).target.func, new_clauses.at(i).target.func); + + for(size_t j = 0; j < new_clauses.at(i).target.args.size(); j++) { + if(new_clauses.at(i).target.args.at(j) != nullptr) std::swap(n->clauses.at(i).target.args.at(j), new_clauses.at(i).target.args.at(j)); + } + + if(new_clauses.at(i).stmt != nullptr) std::swap(n->clauses.at(i).stmt, new_clauses.at(i).stmt); + if(new_clauses.at(i).cond != nullptr) std::swap(n->clauses.at(i).cond, new_clauses.at(i).cond); + } node = n; } @@ -969,7 +1053,7 @@ if(node->field) { \ auto nval = call_accept( node->field ); \ - if(nval != node->field ) { \ + if(nval.differs ) { \ auto nparent = __pass::mutate(node); \ - nparent->field = nval; \ + nparent->field = nval.value; \ node = nparent; \ } \ Index: src/AST/Stmt.cpp =================================================================== --- src/AST/Stmt.cpp (revision 21a99ccc1c184c5bca78dca70582d46fc6488bc3) +++ src/AST/Stmt.cpp (revision a554e5f423752296e46ab9ced5a34d32676e55d5) @@ -9,7 +9,7 @@ // Author : Aaron B. Moss // Created On : Wed May 8 13:00:00 2019 -// Last Modified By : Andrew Beach -// Last Modified On : Wed May 15 15:53:00 2019 -// Update Count : 2 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Feb 2 19:01:20 2022 +// Update Count : 3 // @@ -56,6 +56,6 @@ // --- BranchStmt -BranchStmt::BranchStmt( const CodeLocation& loc, Kind kind, Label target, std::vector