Changeset 1c85ffc


Ignore:
Timestamp:
Dec 5, 2023, 11:50:10 AM (3 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
81da3da4
Parents:
2b12d6e (diff), 2345ab3 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Chain.hpp

    r2b12d6e r1c85ffc  
    3333        template<typename actual_node_t, typename child_t>
    3434        auto operator()( child_t actual_node_t::*child ) {
    35                 auto n = mutate(base.get());
     35                node_t * n = base.get_and_mutate();
    3636                actual_node_t * node = strict_dynamic_cast<actual_node_t *>(n);
    37                 base = node;
    3837                return _chain_mutator< typename std::remove_reference< decltype(node->*child) >::type >{node->*child};
    3938        }
    4039
    4140        node_t * operator->() {
    42                 auto n = mutate(base.get());
    43                 base = n;
    44                 return n;
     41                return base.get_and_mutate();
    4542        }
    4643};
  • src/ResolvExpr/Resolver.cc

    r2b12d6e r1c85ffc  
    2929#include "Unify.h"                       // for unify
    3030#include "CompilationState.h"
    31 #include "AST/Chain.hpp"
    3231#include "AST/Decl.hpp"
    3332#include "AST/Init.hpp"
     
    104103                                                                }
    105104                                                        }
    106                                                 } 
    107                                         } 
     105                                                }
     106                                        }
    108107                                        visit_children = false;
    109108                                }
     
    607606                                ( objectDecl->get_type() )->base->base ) {
    608607                                objectDecl = fixObjectType( objectDecl, context );
    609                                 currentObject = ast::CurrentObject{ 
    610                                         objectDecl->location, 
     608                                currentObject = ast::CurrentObject{
     609                                        objectDecl->location,
    611610                                        enumBase
    612611                                };
  • tests/.expect/PRNG.x86.txt

    r2b12d6e r1c85ffc  
    2626
    2727Sequential
    28 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
     28trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
    2929
    3030Concurrent
    31 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    32 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    33 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    34 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
     31trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     32trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     33trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     34trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
    3535
    3636                    prng()     prng(5)   prng(0,5)
     
    5858
    5959Sequential
    60 trials 20000000 buckets 100000 min 144 max 270 avg 200.0 std 14.1 rstd 7.1%
     60trials 2000000 buckets 100000 min 3 max 42 avg 20.0 std 4.5 rstd 22.4%
    6161
    6262Concurrent
    63 trials 20000000 buckets 100000 min 144 max 270 avg 200.0 std 14.1 rstd 7.1%
    64 trials 20000000 buckets 100000 min 144 max 270 avg 200.0 std 14.1 rstd 7.1%
    65 trials 20000000 buckets 100000 min 144 max 270 avg 200.0 std 14.1 rstd 7.1%
    66 trials 20000000 buckets 100000 min 144 max 270 avg 200.0 std 14.1 rstd 7.1%
     63trials 2000000 buckets 100000 min 3 max 42 avg 20.0 std 4.5 rstd 22.4%
     64trials 2000000 buckets 100000 min 3 max 42 avg 20.0 std 4.5 rstd 22.4%
     65trials 2000000 buckets 100000 min 3 max 42 avg 20.0 std 4.5 rstd 22.4%
     66trials 2000000 buckets 100000 min 3 max 42 avg 20.0 std 4.5 rstd 22.4%
    6767
    6868                   prng(t)   prng(t,5) prng(t,0,5)
     
    9090
    9191Sequential
    92 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
     92trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
    9393
    9494Concurrent
    95 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    96 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    97 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
    98 trials 100000000 buckets 100000 min 858 max 1147 avg 1000.0 std 31.5 rstd 3.2%
     95trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     96trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     97trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
     98trials 10000000 buckets 100000 min 62 max 144 avg 100.0 std 10.0 rstd 10.0%
Note: See TracChangeset for help on using the changeset viewer.