Changes in / [ad89296:34b2796]


Ignore:
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/containers/array.hfa

    rad89296 r34b2796  
    55
    66// the inverse of Z(-)
    7 #define z(N) sizeof(N)
     7#define z(Zn) sizeof(Zn)
     8
     9// if you're expecting a Z(n), say so, by asking for a ztype, instead of dtype or otype
     10#define ztype(Zn) Zn & | sized(Zn)
    811
    912forall( T & ) struct tag {};
    … …  
    1619//
    1720
    18 forall( [N], [S], Timmed &, Tbase & ) {
     21forall( ztype(Zn), ztype(S), Timmed &, Tbase & ) {
    1922    struct arpk {
    20         S strides[z(N)];
     23        S strides[z(Zn)];
    2124    };
    2225
    23     Timmed & ?[?]( arpk(N, S, Timmed, Tbase) & a, ptrdiff_t i ) {
     26    Timmed & ?[?]( arpk(Zn, S, Timmed, Tbase) & a, ptrdiff_t i ) {
    2427        return (Timmed &) a.strides[i];
    2528    }
    2629
    27     Timmed & ?[?]( arpk(N, S, Timmed, Tbase) & a, int i ) {
    28         return (Timmed &) a.strides[i];
    29     }
    30 
    31     Timmed & ?[?]( arpk(N, S, Timmed, Tbase) & a, size_t i ) {
    32         return (Timmed &) a.strides[i];
    33     }
    34 
    35     size_t ?`len( arpk(N, S, Timmed, Tbase) & a ) {
    36         return z(N);
     30    size_t ?`len( arpk(Zn, S, Timmed, Tbase) & a ) {
     31        return z(Zn);
    3732    }
    3833
    3934    // workaround #226 (and array relevance thereof demonstrated in mike102/otype-slow-ndims.cfa)
    40     void ?{}( arpk(N, S, Timmed, Tbase) & this ) {
    41         void ?{}( S (&inner)[z(N)] ) {}
     35    void ?{}( arpk(Zn, S, Timmed, Tbase) & this ) {
     36        void ?{}( S (&inner)[z(Zn)] ) {}
    4237        ?{}(this.strides);
    4338    }
    44     void ^?{}( arpk(N, S, Timmed, Tbase) & this ) {
    45         void ^?{}( S (&inner)[z(N)] ) {}
     39    void ^?{}( arpk(Zn, S, Timmed, Tbase) & this ) {
     40        void ^?{}( S (&inner)[z(Zn)] ) {}
    4641        ^?{}(this.strides);
    4742    }
    … …  
    5550Te mkar_( tag(Te) ) {}
    5651
    57 forall( [N], ZTags ... , Trslt &, Tatom & | { Trslt mkar_( tag(Tatom), ZTags ); } )
    58 arpk(N, Trslt, Trslt, Tatom) mkar_( tag(Tatom), tag(N), ZTags ) {}
     52forall( ztype(Zn), ZTags ... , Trslt &, Tatom & | { Trslt mkar_( tag(Tatom), ZTags ); } )
     53arpk(Zn, Trslt, Trslt, Tatom) mkar_( tag(Tatom), tag(Zn), ZTags ) {}
    5954
    6055// based on https://stackoverflow.com/questions/1872220/is-it-possible-to-iterate-over-arguments-in-variadic-macros
    … …  
    8580// Core -[[-,-,-]] operator
    8681
    87 #ifdef TRY_BROKEN_DESIRED_MD_SUBSCRIPT
     82// Desired form.  One definition with recursion on IxBC (worked until Jan 2021, see trac #__TODO__)
     83// forall( TA &, TB &, TC &, IxAB, IxBC ... | { TB & ?[?]( TA &, IxAB ); TC & ?[?]( TB &, IxBC ); } )
     84// TC & ?[?]( TA & this, IxAB ab, IxBC bc ) {
     85//     return this[ab][bc];
     86// }
    8887
    89 // Desired form.  One definition with recursion on IxBC (worked until Jan 2021, see trac #__TODO__)
    90 
    91 forall( TA &, TB &, TC &, IxAB, IxBC ... | { TB & ?[?]( TA &, IxAB ); TC & ?[?]( TB &, IxBC ); } )
     88// Workaround form.  Listing all possibilities up to 4 dims.
     89forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
     90            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); } )
    9291TC & ?[?]( TA & this, IxAB ab, IxBC bc ) {
    9392    return this[ab][bc];
    9493}
    95 
    96 #else
    97 
    98 // Workaround form.  Listing all possibilities up to 4 dims.
    99 
    100 forall( TA &, TB &, TC &, IxAB_0, IxBC | { TB & ?[?]( TA &, IxAB_0 ); TC & ?[?]( TB &, IxBC ); } )
    101 TC & ?[?]( TA & this, IxAB_0 ab, IxBC bc ) {
    102     return this[ab][bc];
     94forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
     95            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); }
     96            , TD &, IxCD | { TD & ?[?]( TC &, IxCD ); } )
     97TD & ?[?]( TA & this, IxAB ab, IxBC bc, IxCD cd ) {
     98    return this[ab][bc][cd];
     99}
     100forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
     101            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); }
     102            , TD &, IxCD | { TD & ?[?]( TC &, IxCD ); }
     103            , TE &, IxDE | { TE & ?[?]( TD &, IxDE ); } )
     104TE & ?[?]( TA & this, IxAB ab, IxBC bc, IxCD cd, IxDE de ) {
     105    return this[ab][bc][cd][de];
    103106}
    104107
    105 forall( TA &, TB &, TC &, IxAB_0, IxAB_1, IxBC | { TB & ?[?]( TA &, IxAB_0, IxAB_1 ); TC & ?[?]( TB &, IxBC ); } )
    106 TC & ?[?]( TA & this, IxAB_0 ab0, IxAB_1 ab1, IxBC bc ) {
    107     return this[[ab0,ab1]][bc];
     108// Adapters for "indexed by ptrdiff_t" implies "indexed by [this other integral type]"
     109// Work around restriction that assertions underlying -[[-,-,-]] must match excatly
     110forall( C &, E & | { E & ?[?]( C &, ptrdiff_t ); } ) {
     111
     112    // Targeted to support:  for( i; z(N) ) ... a[[ ..., i, ... ]]
     113    E & ?[?]( C & this, size_t i ) {
     114        return this[ (ptrdiff_t) i ];
     115    }
     116
     117    // Targeted to support:  for( i; 5 ) ... a[[ ..., i, ... ]]
     118    E & ?[?]( C & this, int i ) {
     119        return this[ (ptrdiff_t) i ];
     120    }
    108121}
    109 
    110 forall( TA &, TB &, TC &, IxAB_0, IxAB_1, IxAB_2, IxBC | { TB & ?[?]( TA &, IxAB_0, IxAB_1, IxAB_2 ); TC & ?[?]( TB &, IxBC ); } )
    111 TC & ?[?]( TA & this, IxAB_0 ab0, IxAB_1 ab1, IxAB_2 ab2, IxBC bc ) {
    112     return this[[ab0,ab1,ab2]][bc];
    113 }
    114 
    115 #endif
    116122
    117123//
    … …  
    120126
    121127// Base
    122 forall( [Nq], [Sq], Tbase & )
    123 tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {}
     128forall( ztype(Zq), ztype(Sq), Tbase & )
     129tag(arpk(Zq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Zq), tag(Sq), tag(Tbase) ) {}
    124130
    125131// Rec
    126 forall( [Nq], [Sq], [N], [S], recq &, recr &, Tbase & | { tag(recr) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(recq) ); } )
    127 tag(arpk(N, S, recr, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(arpk(N, S, recq, Tbase)) ) {}
     132forall( ztype(Zq), ztype(Sq), ztype(Z), ztype(S), recq &, recr &, Tbase & | { tag(recr) enq_( tag(Tbase), tag(Zq), tag(Sq), tag(recq) ); } )
     133tag(arpk(Z, S, recr, Tbase)) enq_( tag(Tbase), tag(Zq), tag(Sq), tag(arpk(Z, S, recq, Tbase)) ) {}
    128134
    129135// Wrapper
    130136struct all_t {} all;
    131 forall( [N], [S], Te &, result &, Tbase & | { tag(result) enq_( tag(Tbase), tag(N), tag(S), tag(Te) ); } )
    132 result & ?[?]( arpk(N, S, Te, Tbase) & this, all_t ) {
     137forall( ztype(Z), ztype(S), Te &, result &, Tbase & | { tag(result) enq_( tag(Tbase), tag(Z), tag(S), tag(Te) ); } )
     138result & ?[?]( arpk(Z, S, Te, Tbase) & this, all_t ) {
    133139    return (result&) this;
    134140}

  • src/Parser/DeclarationNode.cc

    rad89296 r34b2796  
    10761076        if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
    10771077                // otype is internally converted to dtype + otype parameters
    1078                 static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::Dtype };
     1078                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::ALtype };
    10791079                static_assert( sizeof(kindMap) / sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
    10801080                assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
    1081                 TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype || variable.tyClass == TypeDecl::ALtype, variable.initializer ? variable.initializer->buildType() : nullptr );
     1081                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
    10821082                buildList( variable.assertions, ret->get_assertions() );
    10831083                return ret;

  • tests/array-container/.expect/array-basic.x64.txt

    rad89296 r34b2796  
    11expect Ws             = 7.060606
    22result Ws [][][][] lo = 7.060606
    3 result Ws [,,,]    lo = 7.060606
    43result Ws [][][][] hi = 7.060606
    5 result Ws [,,,]    hi = 7.060606
    64expect Xs             = 8.150808
    75result Xs [][][][] lo = 8.150808
    8 result Xs [,,,]    lo = 8.150808
    96result Xs [][][][] hi = 8.150808
    10 result Xs [,,,]    hi = 8.150808

  • tests/array-container/array-basic.cfa

    rad89296 r34b2796  
    55//
    66
    7 forall( [Nx], [Ny], [Nz] )
     7forall( ztype(Nx), ztype(Ny), ztype(Nz) )
    88void typesTest( tag(Nx), tag(Ny), tag(Nz) ) {
    99
    … …  
    5959}
    6060
    61 forall( [Nw], [Nx], [Ny], [Nz] )
     61forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
    6262void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) {
    6363    for (w; z(Nw))
    … …  
    6868}
    6969
    70 forall( [Zn]
     70forall( ztype(Zn)
    7171      , S & | sized(S)
    7272      )
    … …  
    8686}
    8787
    88 forall( [Nw], [Nx], [Ny], [Nz] )
     88forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
    8989void runtimeTest( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
    9090
    … …  
    105105    printf("result Ws [][][][] lo = %f\n", result);
    106106
    107     result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
    108     printf("result Ws [,,,]    lo = %f\n", result);
     107    // fixme: -[[-,-,-,-]] not working
     108    // result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
     109    // printf("result Ws [,,,]    lo = %f\n", result);
    109110
    110111    result = total1d_hi( wxyz[all][slice_ix][slice_ix][slice_ix] );
    111112    printf("result Ws [][][][] hi = %f\n", result);
    112113
    113     result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
    114     printf("result Ws [,,,]    hi = %f\n", result);
     114    // fixme: -[[-,-,-,-]] not working
     115    // result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
     116    // printf("result Ws [,,,]    hi = %f\n", result);
    115117
    116118    // summing across X, with w=y=z=1
    … …  
    124126    printf("result Xs [][][][] lo = %f\n", result);
    125127
    126     result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
    127     printf("result Xs [,,,]    lo = %f\n", result);
     128    // fixme: -[[-,-,-,-]] not working
     129    // result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
     130    // printf("result Xs [,,,]    lo = %f\n", result);
    128131
    129132    result = total1d_hi( wxyz[slice_ix][all][slice_ix][slice_ix] );   
    130133    printf("result Xs [][][][] hi = %f\n", result);
    131134
    132     result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
    133     printf("result Xs [,,,]    hi = %f\n", result);
     135    // fixme: -[[-,-,-,-]] not working
     136    // result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
     137    // printf("result Xs [,,,]    hi = %f\n", result);
    134138
    135139}
Note: See TracChangeset for help on using the changeset viewer.