Ignore:
Timestamp:
Jun 19, 2023, 1:57:11 PM (21 months ago)
Author:
caparson <caparson@…>
Branches:
master
Children:
adc73a5
Parents:
fa5e1aa5 (diff), 33d4bc8 (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

Location:
doc/theses/colby_parsons_MMAth/benchmarks
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/balance.cfa

    rfa5e1aa5 rb7b3e41  
    3131
    3232d_actor ** actor_arr;
    33 Allocation receive( d_actor & this, start_msg & msg ) with( this ) {
     33allocation receive( d_actor & this, start_msg & msg ) with( this ) {
    3434    for ( i; Set ) {
    35         *actor_arr[i + gstart] << shared_msg;
     35        *actor_arr[i + gstart] | shared_msg;
    3636    }
    3737    return Nodelete;
    3838}
    3939
    40 Allocation receive( d_actor & this, d_msg & msg ) with( this ) {
     40allocation receive( d_actor & this, d_msg & msg ) with( this ) {
    4141    if ( recs == rounds ) return Delete;
    4242    if ( recs % Batch == 0 ) {
    4343        for ( i; Batch ) {
    44             *actor_arr[gstart + sends % Set] << shared_msg;
     44            *actor_arr[gstart + sends % Set] | shared_msg;
    4545            sends += 1;
    4646        }
    … …  
    5050}
    5151
    52 Allocation receive( filler & this, d_msg & msg ) { return Delete; }
     52allocation receive( filler & this, d_msg & msg ) { return Delete; }
    5353
    5454int main( int argc, char * argv[] ) {
    … …  
    163163    #ifndef MULTI
    164164        for ( i; qpw )
    165                 *actors[i * ActorsPerQueue] << start_send;
     165                *actors[i * ActorsPerQueue] | start_send;
    166166    #else
    167167    for ( i; qpw * ActorProcs ) {
    168                 *actors[i * ActorsPerQueue] << start_send;
     168                *actors[i * ActorsPerQueue] | start_send;
    169169    }
    170170    #endif
    171171   
    172172    for ( i; FillActors )
    173         *filler_actors[i] << shared_msg;
     173        *filler_actors[i] | shared_msg;
    174174
    175175    stop_actor_system();

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/dynamic.cfa

    rfa5e1aa5 rb7b3e41  
    2424
    2525uint64_t start_time;
    26 Allocation receive( derived_actor & receiver, derived_msg & msg ) {
     26allocation receive( derived_actor & receiver, derived_msg & msg ) {
    2727    if ( msg.cnt >= Times ) {
    2828        printf("%.2f\n", ((double)(bench_time() - start_time)) / ((double)Times) ); // ns
    … …  
    3333    derived_actor * d_actor = malloc();
    3434    (*d_actor){};
    35     *d_actor << *d_msg;
     35    *d_actor | *d_msg;
    3636    return Delete;
    3737}
    … …  
    6262    derived_actor * d_actor = malloc();
    6363    (*d_actor){};
    64     *d_actor << *d_msg;
     64    *d_actor | *d_msg;
    6565
    6666

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/executor.cfa

    rfa5e1aa5 rb7b3e41  
    2525struct d_msg { inline message; } shared_msg;
    2626
    27 Allocation receive( d_actor & this, d_msg & msg ) with( this ) {
     27allocation receive( d_actor & this, d_msg & msg ) with( this ) {
    2828    if ( recs == rounds ) return Finished;
    2929    if ( recs % Batch == 0 ) {
    3030        for ( i; Batch ) {
    31             gstart[sends % Set] << shared_msg;
     31            gstart[sends % Set] | shared_msg;
    3232            sends += 1;
    3333        }
    … …  
    9494
    9595        for ( i; Actors ) {
    96                 actors[i] << shared_msg;
     96                actors[i] | shared_msg;
    9797        } // for
    9898

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/matrix.cfa

    rfa5e1aa5 rb7b3e41  
    2424}
    2525
    26 Allocation receive( derived_actor & receiver, derived_msg & msg ) {
     26allocation receive( derived_actor & receiver, derived_msg & msg ) {
    2727    for ( unsigned int i = 0; i < yc; i += 1 ) { // multiply X_row by Y_col and sum products
    2828        msg.Z[i] = 0;
    … …  
    103103
    104104        for ( unsigned int r = 0; r < xr; r += 1 ) {
    105                 actors[r] << messages[r];
     105                actors[r] | messages[r];
    106106        } // for
    107107

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/repeat.cfa

    rfa5e1aa5 rb7b3e41  
    4646
    4747Client * cl;
    48 Allocation receive( Server & this, IntMsg & msg ) { msg.val = 7; *cl << msg; return Nodelete; }
    49 Allocation receive( Server & this, CharMsg & msg ) { msg.val = 'x'; *cl << msg; return Nodelete; }
    50 Allocation receive( Server & this, StateMsg & msg ) { return Finished; }
     48allocation receive( Server & this, IntMsg & msg ) { msg.val = 7; *cl | msg; return Nodelete; }
     49allocation receive( Server & this, CharMsg & msg ) { msg.val = 'x'; *cl | msg; return Nodelete; }
     50allocation receive( Server & this, StateMsg & msg ) { return Finished; }
    5151
    5252void terminateServers( Client & this ) with(this) {
    5353    for ( i; Messages ) {
    54         servers[i] << stateMsg;
     54        servers[i] | stateMsg;
    5555    } // for
    5656}
    5757
    58 Allocation reset( Client & this ) with(this) {
     58allocation reset( Client & this ) with(this) {
    5959    times += 1;
    6060    if ( times == Times ) { terminateServers( this ); return Finished; }
    6161    results = 0;
    62     this << stateMsg;
     62    this | stateMsg;
    6363    return Nodelete;
    6464}
    6565
    66 Allocation process( Client & this ) with(this) {
     66allocation process( Client & this ) with(this) {
    6767    this.results++;
    6868    if ( results == 2 * Messages ) { return reset( this ); }
    … …  
    7070}
    7171
    72 Allocation receive( Client & this, IntMsg & msg ) { return process( this ); }
    73 Allocation receive( Client & this, CharMsg & msg ) { return process( this ); }
    74 Allocation receive( Client & this, StateMsg & msg ) with(this) {
     72allocation receive( Client & this, IntMsg & msg ) { return process( this ); }
     73allocation receive( Client & this, CharMsg & msg ) { return process( this ); }
     74allocation receive( Client & this, StateMsg & msg ) with(this) {
    7575    for ( i; Messages ) {
    76         servers[i] << intmsg[i];
    77         servers[i] << charmsg[i];
     76        servers[i] | intmsg[i];
     77        servers[i] | charmsg[i];
    7878    }
    7979    return Nodelete;
    … …  
    124124    Client client;
    125125    cl = &client;
    126     client << stateMsg;
     126    client | stateMsg;
    127127
    128128    stop_actor_system();

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/cfa/static.cfa

    rfa5e1aa5 rb7b3e41  
    2323
    2424uint64_t start_time;
    25 Allocation receive( derived_actor & receiver, derived_msg & msg ) {
     25allocation receive( derived_actor & receiver, derived_msg & msg ) {
    2626    if ( msg.cnt >= Times ) {
    2727        printf("%.2f\n", ((double)(bench_time() - start_time)) / ((double)Times) ); // ns
    … …  
    2929    }
    3030    msg.cnt++;
    31     receiver << msg;
     31    receiver | msg;
    3232    return Nodelete;
    3333}
    … …  
    5858    derived_actor actor;
    5959
    60     actor << msg;
     60    actor | msg;
    6161
    6262    stop_actor_system();

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/actors/plotData.py

    rfa5e1aa5 rb7b3e41  
    166166                    for idx, arr in enumerate(data):
    167167                        plt.errorbar( procs, arr, [bars[idx][0], bars[idx][1]], capsize=2, marker=next(marker) )
     168                    marker = itertools.cycle(('o', 's', 'D', 'x', 'p', '^', 'h', '*', 'v' ))
    168169                    if currBench == Bench.Executor or currBench == Bench.Matrix or currBench == Bench.Balance_One or currBench == Bench.Repeat:
    169170                        plt.yscale("log")

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/channels/plotData.py

    rfa5e1aa5 rb7b3e41  
    130130                for idx, arr in enumerate(data):
    131131                    plt.errorbar( procs, arr, [bars[idx][0], bars[idx][1]], capsize=2, marker=next(marker) )
    132                
     132                marker = itertools.cycle(('o', 's', 'D', 'x', 'p', '^', 'h', '*', 'v' ))
    133133                plt.yscale("log")
    134134                # plt.ylim(1, None)

  • TabularUnified doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/plotData.py

    rfa5e1aa5 rb7b3e41  
    103103                for idx, arr in enumerate(data):
    104104                    plt.errorbar( procs, arr, [bars[idx][0], bars[idx][1]], capsize=2, marker=next(marker) )
     105                marker = itertools.cycle(('o', 's', 'D', 'x', 'p', '^', 'h', '*', 'v' ))
    105106                plt.yscale("log")
    106107                plt.xticks(procs)
Note: See TracChangeset for help on using the changeset viewer.