Index: tests/.expect/forall.txt =================================================================== --- tests/.expect/forall.txt (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/.expect/forall.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -1,1 +1,1 @@ -forall.cfa:216:25: warning: Compiled +forall.cfa:242:25: warning: Compiled Index: tests/.expect/gmp.arm64.txt =================================================================== --- tests/.expect/gmp.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/.expect/gmp.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,279 @@ +constructors +50000000000000000000 3 50000000000000000003 +x:50000000000000000000 y:3 z:50000000000000000003 +conversions +y:97 +y:12345678901234567890123456789 +y:200 +y:-400 +y:24691357802469135780246913578 +y:3 +y:-3 +y:4 +y:3 +y:3 b:3 si:3 +comparison +1 +0 +0 +1 +0 +1 +arithmetic +z:100000000000000000006 +z:50000000000000000000 +z:-3 +z:-450000000000000000000 +z:150000000000000000000 +z:150000000000000000000 +z:16666666666666666666 +16666666666666666666, 2 16666666666666666666, 2 +x:16666666666666666666 y:2 + +12345678901234567890123456789 12345678901234567890123456789 12345678901234567890123456789 + +Fibonacci Numbers +0 0 +1 1 +2 1 +3 2 +4 3 +5 5 +6 8 +7 13 +8 21 +9 34 +10 55 +11 89 +12 144 +13 233 +14 377 +15 610 +16 987 +17 1597 +18 2584 +19 4181 +20 6765 +21 10946 +22 17711 +23 28657 +24 46368 +25 75025 +26 121393 +27 196418 +28 317811 +29 514229 +30 832040 +31 1346269 +32 2178309 +33 3524578 +34 5702887 +35 9227465 +36 14930352 +37 24157817 +38 39088169 +39 63245986 +40 102334155 +41 165580141 +42 267914296 +43 433494437 +44 701408733 +45 1134903170 +46 1836311903 +47 2971215073 +48 4807526976 +49 7778742049 +50 12586269025 +51 20365011074 +52 32951280099 +53 53316291173 +54 86267571272 +55 139583862445 +56 225851433717 +57 365435296162 +58 591286729879 +59 956722026041 +60 1548008755920 +61 2504730781961 +62 4052739537881 +63 6557470319842 +64 10610209857723 +65 17167680177565 +66 27777890035288 +67 44945570212853 +68 72723460248141 +69 117669030460994 +70 190392490709135 +71 308061521170129 +72 498454011879264 +73 806515533049393 +74 1304969544928657 +75 2111485077978050 +76 3416454622906707 +77 5527939700884757 +78 8944394323791464 +79 14472334024676221 +80 23416728348467685 +81 37889062373143906 +82 61305790721611591 +83 99194853094755497 +84 160500643816367088 +85 259695496911122585 +86 420196140727489673 +87 679891637638612258 +88 1100087778366101931 +89 1779979416004714189 +90 2880067194370816120 +91 4660046610375530309 +92 7540113804746346429 +93 12200160415121876738 +94 19740274219868223167 +95 31940434634990099905 +96 51680708854858323072 +97 83621143489848422977 +98 135301852344706746049 +99 218922995834555169026 +100 354224848179261915075 +101 573147844013817084101 +102 927372692193078999176 +103 1500520536206896083277 +104 2427893228399975082453 +105 3928413764606871165730 +106 6356306993006846248183 +107 10284720757613717413913 +108 16641027750620563662096 +109 26925748508234281076009 +110 43566776258854844738105 +111 70492524767089125814114 +112 114059301025943970552219 +113 184551825793033096366333 +114 298611126818977066918552 +115 483162952612010163284885 +116 781774079430987230203437 +117 1264937032042997393488322 +118 2046711111473984623691759 +119 3311648143516982017180081 +120 5358359254990966640871840 +121 8670007398507948658051921 +122 14028366653498915298923761 +123 22698374052006863956975682 +124 36726740705505779255899443 +125 59425114757512643212875125 +126 96151855463018422468774568 +127 155576970220531065681649693 +128 251728825683549488150424261 +129 407305795904080553832073954 +130 659034621587630041982498215 +131 1066340417491710595814572169 +132 1725375039079340637797070384 +133 2791715456571051233611642553 +134 4517090495650391871408712937 +135 7308805952221443105020355490 +136 11825896447871834976429068427 +137 19134702400093278081449423917 +138 30960598847965113057878492344 +139 50095301248058391139327916261 +140 81055900096023504197206408605 +141 131151201344081895336534324866 +142 212207101440105399533740733471 +143 343358302784187294870275058337 +144 555565404224292694404015791808 +145 898923707008479989274290850145 +146 1454489111232772683678306641953 +147 2353412818241252672952597492098 +148 3807901929474025356630904134051 +149 6161314747715278029583501626149 +150 9969216677189303386214405760200 +151 16130531424904581415797907386349 +152 26099748102093884802012313146549 +153 42230279526998466217810220532898 +154 68330027629092351019822533679447 +155 110560307156090817237632754212345 +156 178890334785183168257455287891792 +157 289450641941273985495088042104137 +158 468340976726457153752543329995929 +159 757791618667731139247631372100066 +160 1226132595394188293000174702095995 +161 1983924214061919432247806074196061 +162 3210056809456107725247980776292056 +163 5193981023518027157495786850488117 +164 8404037832974134882743767626780173 +165 13598018856492162040239554477268290 +166 22002056689466296922983322104048463 +167 35600075545958458963222876581316753 +168 57602132235424755886206198685365216 +169 93202207781383214849429075266681969 +170 150804340016807970735635273952047185 +171 244006547798191185585064349218729154 +172 394810887814999156320699623170776339 +173 638817435613190341905763972389505493 +174 1033628323428189498226463595560281832 +175 1672445759041379840132227567949787325 +176 2706074082469569338358691163510069157 +177 4378519841510949178490918731459856482 +178 7084593923980518516849609894969925639 +179 11463113765491467695340528626429782121 +180 18547707689471986212190138521399707760 +181 30010821454963453907530667147829489881 +182 48558529144435440119720805669229197641 +183 78569350599398894027251472817058687522 +184 127127879743834334146972278486287885163 +185 205697230343233228174223751303346572685 +186 332825110087067562321196029789634457848 +187 538522340430300790495419781092981030533 +188 871347450517368352816615810882615488381 +189 1409869790947669143312035591975596518914 +190 2281217241465037496128651402858212007295 +191 3691087032412706639440686994833808526209 +192 5972304273877744135569338397692020533504 +193 9663391306290450775010025392525829059713 +194 15635695580168194910579363790217849593217 +195 25299086886458645685589389182743678652930 +196 40934782466626840596168752972961528246147 +197 66233869353085486281758142155705206899077 +198 107168651819712326877926895128666735145224 +199 173402521172797813159685037284371942044301 +200 280571172992510140037611932413038677189525 + +Factorial Numbers +0 1 +1 1 +2 2 +3 6 +4 24 +5 120 +6 720 +7 5040 +8 40320 +9 362880 +10 3628800 +11 39916800 +12 479001600 +13 6227020800 +14 87178291200 +15 1307674368000 +16 20922789888000 +17 355687428096000 +18 6402373705728000 +19 121645100408832000 +20 2432902008176640000 +21 51090942171709440000 +22 1124000727777607680000 +23 25852016738884976640000 +24 620448401733239439360000 +25 15511210043330985984000000 +26 403291461126605635584000000 +27 10888869450418352160768000000 +28 304888344611713860501504000000 +29 8841761993739701954543616000000 +30 265252859812191058636308480000000 +31 8222838654177922817725562880000000 +32 263130836933693530167218012160000000 +33 8683317618811886495518194401280000000 +34 295232799039604140847618609643520000000 +35 10333147966386144929666651337523200000000 +36 371993326789901217467999448150835200000000 +37 13763753091226345046315979581580902400000000 +38 523022617466601111760007224100074291200000000 +39 20397882081197443358640281739902897356800000000 +40 815915283247897734345611269596115894272000000000 Index: tests/.expect/typedefRedef-ERR1.txt =================================================================== --- tests/.expect/typedefRedef-ERR1.txt (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/.expect/typedefRedef-ERR1.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -1,3 +1,3 @@ -typedefRedef.cfa:69:25: warning: Compiled +typedefRedef.cfa:75:25: warning: Compiled typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo -typedefRedef.cfa:59:1 error: Cannot redefine typedef: ARR +typedefRedef.cfa:65:1 error: Cannot redefine typedef: ARR Index: tests/.expect/typedefRedef.txt =================================================================== --- tests/.expect/typedefRedef.txt (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/.expect/typedefRedef.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -1,1 +1,1 @@ -typedefRedef.cfa:69:25: warning: Compiled +typedefRedef.cfa:75:25: warning: Compiled Index: tests/array-container/.expect/array-md-sbscr-cases.arm64.txt =================================================================== --- tests/array-container/.expect/array-md-sbscr-cases.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/array-container/.expect/array-md-sbscr-cases.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,1 @@ +done Index: tests/array-container/.expect/array-md-sbscr-cases.x86.txt =================================================================== --- tests/array-container/.expect/array-md-sbscr-cases.x86.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/array-container/.expect/array-md-sbscr-cases.x86.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,1 @@ +done Index: tests/array-container/.expect/language-dim-mismatch.txt =================================================================== --- tests/array-container/.expect/language-dim-mismatch.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/array-container/.expect/language-dim-mismatch.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,10 @@ +array-container/language-dim-mismatch.cfa:12:1 error: Type argument given for value parameter: instance of struct SN with body 1 +... with parameters + float + +array-container/language-dim-mismatch.cfa:13:1 error: Expression argument given for type parameter: instance of struct ST with body 1 +... with parameters + constant expression (42 42: signed int) + with resolved type: + signed int + Index: tests/array-container/array-basic.cfa =================================================================== --- tests/array-container/array-basic.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/array-container/array-basic.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -61,17 +61,17 @@ forall( [Nw], [Nx], [Ny], [Nz] ) void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) { - for (w; z(Nw)) - for (x; z(Nx)) - for (y; z(Ny)) - for (z; z(Nz)) + for (w; Nw) + for (x; Nx) + for (y; Ny) + for (z; Nz) wxyz[w][x][y][z] = getMagicNumber(w, x, y, z); } -forall( [Zn] +forall( [N] , S & | sized(S) ) -float total1d_low( arpk(Zn, S, float, float ) & a ) { +float total1d_low( arpk(N, S, float, float ) & a ) { float total = 0.0f; - for (i; z(Zn)) + for (i; N) total += a[i]; return total; @@ -98,5 +98,5 @@ expect = 0; - for (i; z(Nw)) + for (i; Nw) expect += getMagicNumber( i, slice_ix, slice_ix, slice_ix ); printf("expect Ws = %f\n", expect); @@ -105,5 +105,5 @@ printf("result Ws [][][][] lo = %f\n", result); - result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] ); + result = total1d_low( wxyz[all, slice_ix, slice_ix, slice_ix] ); printf("result Ws [,,,] lo = %f\n", result); @@ -111,5 +111,5 @@ printf("result Ws [][][][] hi = %f\n", result); - result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] ); + result = total1d_hi( wxyz[all, slice_ix, slice_ix, slice_ix] ); printf("result Ws [,,,] hi = %f\n", result); @@ -117,5 +117,5 @@ expect = 0; - for (i; z(Nx)) + for (i; Nx) expect += getMagicNumber( slice_ix, i, slice_ix, slice_ix ); printf("expect Xs = %f\n", expect); @@ -124,5 +124,5 @@ printf("result Xs [][][][] lo = %f\n", result); - result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] ); + result = total1d_low( wxyz[slice_ix, all, slice_ix, slice_ix] ); printf("result Xs [,,,] lo = %f\n", result); @@ -130,5 +130,5 @@ printf("result Xs [][][][] hi = %f\n", result); - result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] ); + result = total1d_hi( wxyz[slice_ix, all, slice_ix, slice_ix] ); printf("result Xs [,,,] hi = %f\n", result); Index: tests/array-container/array-md-sbscr-cases.cfa =================================================================== --- tests/array-container/array-md-sbscr-cases.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/array-container/array-md-sbscr-cases.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -20,8 +20,8 @@ forall( [Nw], [Nx], [Ny], [Nz] ) void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) { - for (w; z(Nw)) - for (x; z(Nx)) - for (y; z(Ny)) - for (z; z(Nz)) + for (w; Nw) + for (x; Nx) + for (y; Ny) + for (z; Nz) wxyz[w][x][y][z] = getMagicNumber(w, x, y, z); } @@ -53,38 +53,38 @@ // order wxyz, natural split (4-0 or 0-4, no intermediate to declare) - assert(( wxyz[[iw, ix, iy, iz]] == valExpected )); + assert(( wxyz[iw, ix, iy, iz] == valExpected )); // order wxyz, unnatural split 1-3 (three ways declared) typeof( wxyz[iw] ) xyz1 = wxyz[iw]; - assert(( xyz1[[ix, iy, iz]] == valExpected )); + assert(( xyz1[ix, iy, iz] == valExpected )); typeof( wxyz[iw] ) xyz2; &xyz2 = &wxyz[iw]; - assert(( xyz2[[ix, iy, iz]] == valExpected )); - - assert(( wxyz[iw][[ix, iy, iz]] == valExpected )); + assert(( xyz2[ix, iy, iz] == valExpected )); + + assert(( wxyz[iw][ix, iy, iz] == valExpected )); // order wxyz, unnatural split 2-2 (three ways declared) - typeof( wxyz[[iw, ix]] ) yz1 = wxyz[[iw,ix]]; - assert(( yz1[[iy, iz]] == valExpected )); - - typeof( wxyz[[iw, ix]] ) yz2; - &yz2 = &wxyz[[iw, ix]]; - assert(( yz2[[iy, iz]] == valExpected )); - - assert(( wxyz[[iw, ix]][[iy, iz]] == valExpected )); + typeof( wxyz[iw, ix] ) yz1 = wxyz[iw,ix]; + assert(( yz1[iy, iz] == valExpected )); + + typeof( wxyz[iw, ix] ) yz2; + &yz2 = &wxyz[iw, ix]; + assert(( yz2[iy, iz] == valExpected )); + + assert(( wxyz[iw, ix][iy, iz] == valExpected )); // order wxyz, unnatural split 3-1 (three ways declared) - typeof( wxyz[[iw, ix, iy]] ) z1 = wxyz[[iw, ix, iy]]; + typeof( wxyz[iw, ix, iy] ) z1 = wxyz[iw, ix, iy]; assert(( z1[iz] == valExpected )); - typeof( wxyz[[iw, ix, iy]] ) z2; - &z2 = &wxyz[[iw, ix, iy]]; + typeof( wxyz[iw, ix, iy] ) z2; + &z2 = &wxyz[iw, ix, iy]; assert(( z2[iz] == valExpected )); - assert(( wxyz[[iw, ix, iy]][iz] == valExpected )); + assert(( wxyz[iw, ix, iy][iz] == valExpected )); } @@ -104,25 +104,25 @@ // order wxyz (no intermediates to declare) - assert(( wxyz[[iw , ix , iy , iz ]] == valExpected )); - assert(( wxyz[[iw-1, ix , iy , iz ]] != valExpected )); + assert(( wxyz[iw , ix , iy , iz ] == valExpected )); + assert(( wxyz[iw-1, ix , iy , iz ] != valExpected )); // order xyzw: *xyz, w - assert(( wxyz[[all , ix , iy , iz ]][iw ] == valExpected )); - assert(( wxyz[[all , ix-1, iy , iz ]][iw ] != valExpected )); - assert(( wxyz[[all , ix , iy , iz ]][iw-1] != valExpected )); + assert(( wxyz[all , ix , iy , iz ][iw ] == valExpected )); + assert(( wxyz[all , ix-1, iy , iz ][iw ] != valExpected )); + assert(( wxyz[all , ix , iy , iz ][iw-1] != valExpected )); // order wyzx: w*yz, x - assert(( wxyz[[iw , all , iy , iz ]][ix ] == valExpected )); - assert(( wxyz[[iw , all , iy-1, iz ]][ix ] != valExpected )); - assert(( wxyz[[iw , all , iy , iz ]][ix-1] != valExpected )); + assert(( wxyz[iw , all , iy , iz ][ix ] == valExpected )); + assert(( wxyz[iw , all , iy-1, iz ][ix ] != valExpected )); + assert(( wxyz[iw , all , iy , iz ][ix-1] != valExpected )); // order wxzy: wx*z, y #if 0 // not working on 32-bit - assert(( wxyz[[iw , ix , all , iz ]][iy ] == valExpected )); - assert(( wxyz[[iw , ix , all , iz-1]][iy ] != valExpected )); - assert(( wxyz[[iw , ix , all , iz ]][iy-1] != valExpected )); + assert(( wxyz[iw , ix , all , iz ][iy ] == valExpected )); + assert(( wxyz[iw , ix , all , iz-1][iy ] != valExpected )); + assert(( wxyz[iw , ix , all , iz ][iy-1] != valExpected )); #endif } @@ -131,5 +131,5 @@ // The comments specify a covering set of orders, each in its most natural split. // Covering means that each edge on the lattice of dimesnions-provided is used. -// Natural split means the arity of every -[[-,...]] tuple equals the dimensionality of its "this" operand, then that the fewest "all" subscripts are given. +// Natural split means the arity of every -[-,...] tuple equals the dimensionality of its "this" operand, then that the fewest "all" subscripts are given. // The commented-out test code shows cases that don't work. We wish all the comment-coverd cases worked. forall( [Nw], [Nx], [Ny], [Nz] ) @@ -147,5 +147,5 @@ // order wxyz (no intermediates to declare) - assert(( wxyz[[iw, ix, iy, iz]] == valExpected )); + assert(( wxyz[iw, ix, iy, iz] == valExpected )); { @@ -153,16 +153,16 @@ assert( wxyz[iw][all][iy][all] [ix][iz] == valExpected ); - typeof( wxyz[[iw, all, iy, all]] ) xz1 = wxyz[[iw, all, iy, all]]; - assert(( xz1[[ix, iz]] == valExpected )); - - typeof( wxyz[[iw, all, iy, all]] ) xz2; - &xz2 = &wxyz[[iw, all, iy, all]]; - assert(( xz2[[ix, iz]] == valExpected )); - - assert(( wxyz[[iw , all, iy , all]][[ix , iz ]] == valExpected )); - assert(( wxyz[[iw-1, all, iy , all]][[ix , iz ]] != valExpected )); - assert(( wxyz[[iw , all, iy-1, all]][[ix , iz ]] != valExpected )); - assert(( wxyz[[iw , all, iy , all]][[ix-1, iz ]] != valExpected )); - assert(( wxyz[[iw , all, iy , all]][[ix , iz-1]] != valExpected )); + typeof( wxyz[iw, all, iy, all] ) xz1 = wxyz[iw, all, iy, all]; + assert(( xz1[ix, iz] == valExpected )); + + typeof( wxyz[iw, all, iy, all] ) xz2; + &xz2 = &wxyz[iw, all, iy, all]; + assert(( xz2[ix, iz] == valExpected )); + + assert(( wxyz[iw , all, iy , all][ix , iz ] == valExpected )); + assert(( wxyz[iw-1, all, iy , all][ix , iz ] != valExpected )); + assert(( wxyz[iw , all, iy-1, all][ix , iz ] != valExpected )); + assert(( wxyz[iw , all, iy , all][ix-1, iz ] != valExpected )); + assert(( wxyz[iw , all, iy , all][ix , iz-1] != valExpected )); } { @@ -170,16 +170,16 @@ assert( wxyz[iw][all][all][iz] [ix][iy] == valExpected ); - // typeof( wxyz[[iw, all, all, iz]] ) xy1 = wxyz[[iw, all, all, iz]]; - // assert(( xy1[[ix, iy]] == valExpected )); - - // typeof( wxyz[[iw, all, all, iz]] ) xy2; - // &xy2 = &wxyz[[iw, all, all, iz]]; - // assert(( xy2[[ix, iy]] == valExpected )); - - // assert(( wxyz[[iw , all, all, iz ]][[ix , iy ]] == valExpected )); - // assert(( wxyz[[iw-1, all, all, iz ]][[ix , iy ]] != valExpected )); - // assert(( wxyz[[iw , all, all, iz-1]][[ix , iy ]] != valExpected )); - // assert(( wxyz[[iw , all, all, iz ]][[ix-1, iy ]] != valExpected )); - // assert(( wxyz[[iw , all, all, iz ]][[ix , iy-1]] != valExpected )); + // typeof( wxyz[iw, all, all, iz] ) xy1 = wxyz[iw, all, all, iz]; + // assert(( xy1[ix, iy] == valExpected )); + + // typeof( wxyz[iw, all, all, iz] ) xy2; + // &xy2 = &wxyz[iw, all, all, iz]; + // assert(( xy2[ix, iy] == valExpected )); + + // assert(( wxyz[iw , all, all, iz ][ix , iy ] == valExpected )); + // assert(( wxyz[iw-1, all, all, iz ][ix , iy ] != valExpected )); + // assert(( wxyz[iw , all, all, iz-1][ix , iy ] != valExpected )); + // assert(( wxyz[iw , all, all, iz ][ix-1, iy ] != valExpected )); + // assert(( wxyz[iw , all, all, iz ][ix , iy-1] != valExpected )); } { @@ -187,8 +187,8 @@ assert( wxyz[all][ix][iy][all] [iw][iz] == valExpected ); - typeof( wxyz[[all, ix, iy, all]] ) wz1 = wxyz[[all, ix, iy, all]]; - assert(( wz1[[iw, iz]] == valExpected )); - - assert(( wxyz[[all , ix, iy , all]][[iw , iz ]] == valExpected )); + typeof( wxyz[all, ix, iy, all] ) wz1 = wxyz[all, ix, iy, all]; + assert(( wz1[iw, iz] == valExpected )); + + assert(( wxyz[all , ix, iy , all][iw , iz ] == valExpected )); } { @@ -196,5 +196,5 @@ assert( wxyz[all][ix][all][iz] [iw][iy] == valExpected ); - // assert(( wxyz[[all , ix , all , iz ]][[iw , iy ]] == valExpected )); + // assert(( wxyz[all , ix , all , iz ][iw , iy ] == valExpected )); } { @@ -202,5 +202,5 @@ assert( wxyz[all][all][iy][iz] [iw][ix] == valExpected ); - // assert(( wxyz[[all , all , iy , iz ]][[iw , ix ]] == valExpected )); + // assert(( wxyz[all , all , iy , iz ][iw , ix ] == valExpected )); } { @@ -208,9 +208,9 @@ assert( wxyz[all][ix][all][all] [iw][all][iz] [iy] == valExpected ); - typeof( wxyz[all][ix][all][all] ) wyz_workaround = wxyz[[all , ix , all , all ]]; - typeof( wyz_workaround[iw][all][iz] ) y_workaround = wyz_workaround[[iw , all , iz ]]; + typeof( wxyz[all][ix][all][all] ) wyz_workaround = wxyz[all , ix , all , all ]; + typeof( wyz_workaround[iw][all][iz] ) y_workaround = wyz_workaround[iw , all , iz ]; assert( y_workaround[iy] == valExpected ); - // assert(( wxyz[[all , ix , all , all ]][[iw , all , iz ]][iy ] == valExpected )); + // assert(( wxyz[all , ix , all , all ][iw , all , iz ][iy ] == valExpected )); } { @@ -239,33 +239,33 @@ valExpected = getMagicNumber(2, 3, 4, 5); assert(( wxyz [2] [3] [4] [5] == valExpected )); - assert(( wxyz[[2, 3]][4] [5] == valExpected )); - assert(( wxyz [2][[3, 4]][5] == valExpected )); - assert(( wxyz [2] [3][[4, 5]] == valExpected )); - assert(( wxyz[[2, 3, 4]][5] == valExpected )); - assert(( wxyz [2][[3, 4, 5]] == valExpected )); - assert(( wxyz[[2, 3, 4, 5]] == valExpected )); - - for ( i; z(Nw) ) { - assert(( wxyz[[ i, 3, 4, 5 ]] == getMagicNumber(i, 3, 4, 5) )); - } - - for ( i; z(Nx) ) { - assert(( wxyz[[ 2, i, 4, 5 ]] == getMagicNumber(2, i, 4, 5) )); - } - - for ( i; z(Ny) ) { - assert(( wxyz[[ 2, 3, i, 5 ]] == getMagicNumber(2, 3, i, 5) )); - } - - for ( i; z(Nz) ) { - assert(( wxyz[[ 2, 3, 4, i ]] == getMagicNumber(2, 3, 4, i) )); - } - - for ( i; z(Nw) ) { - assert(( wxyz[[ i, all, 4, 5 ]][3] == getMagicNumber(i, 3, 4, 5) )); - } - - for ( i; z(Nw) ) { - assert(( wxyz[[ all, 3, 4, 5 ]][i] == getMagicNumber(i, 3, 4, 5) )); + assert(( wxyz[2, 3][4] [5] == valExpected )); + assert(( wxyz [2][3, 4][5] == valExpected )); + assert(( wxyz [2] [3][4, 5] == valExpected )); + assert(( wxyz[2, 3, 4][5] == valExpected )); + assert(( wxyz [2][3, 4, 5] == valExpected )); + assert(( wxyz[2, 3, 4, 5] == valExpected )); + + for ( i; Nw ) { + assert(( wxyz[ i, 3, 4, 5 ] == getMagicNumber(i, 3, 4, 5) )); + } + + for ( i; Nx ) { + assert(( wxyz[ 2, i, 4, 5 ] == getMagicNumber(2, i, 4, 5) )); + } + + for ( i; Ny ) { + assert(( wxyz[ 2, 3, i, 5 ] == getMagicNumber(2, 3, i, 5) )); + } + + for ( i; Nz ) { + assert(( wxyz[ 2, 3, 4, i ] == getMagicNumber(2, 3, 4, i) )); + } + + for ( i; Nw ) { + assert(( wxyz[ i, all, 4, 5 ][3] == getMagicNumber(i, 3, 4, 5) )); + } + + for ( i; Nw ) { + assert(( wxyz[ all, 3, 4, 5 ][i] == getMagicNumber(i, 3, 4, 5) )); } } Index: tests/array-container/language-dim-mismatch.cfa =================================================================== --- tests/array-container/language-dim-mismatch.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/array-container/language-dim-mismatch.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,15 @@ +forall( [N] ) +struct SN {}; + +forall( T ) +struct ST {}; + +int main() { + + SN(42) good1; + ST(float) good2; + + SN(float) bad1; // first expected error: Type argument given for value parameter + ST(42) bad2; // second expected error: Expression argument given for type parameter + +} Index: tests/collections/.expect/vector-demo.txt =================================================================== --- tests/collections/.expect/vector-demo.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/.expect/vector-demo.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,21 @@ +raiiTests================= +Having pushed, length is 1 +by transit, got pos0 = 1.000000 +by exit, got pos0 = 1.000000 +Having pushed, length is 2 +helperE sees 2.000000 +producerE gave 1.000000 +producerE again gave 1.000000 +helperT sees 2.000000 +producerT gave 1.000000 +by permit, got pos0 = 1.000000 +Having pushed, length is 3 +into permit from call, got ofH = 1.000000 +stayValidTests============ +before 0.100000 +after, logical: 0.100000 +after, physical: -0.100000 +loopTests================= +loop sees 0.000000 +loop sees 0.100000 +loop sees 0.200000 Index: tests/collections/.expect/vector-err-pass-perm-it-byval.txt =================================================================== --- tests/collections/.expect/vector-err-pass-perm-it-byval.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/.expect/vector-err-pass-perm-it-byval.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,270 @@ +error: Unique best alternative includes deleted identifier in Generated Cast of: + Application of + Deleted Expression + Variable Expression: ?{}: static inline forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... with resolved type: + forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... deleted by: ?{}: static inline forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... to arguments + Generated Cast of: + Variable Expression: __tmp: instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + instance of struct vector_permit with body + ... with parameters + float + + ... to: + reference to instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + reference to instance of struct vector_permit with body + ... with parameters + float + + Generated Cast of: + Variable Expression: it: instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + instance of struct vector_permit with body + ... with parameters + float + + ... to: + reference to instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + reference to instance of struct vector_permit with body + ... with parameters + float + + with inferred parameters 0: + ?=?: function + ... with parameters + reference to float + float + ... returning + float + + ?{}: function + ... with parameters + reference to float + ... returning nothing + + ?{}: function + ... with parameters + reference to float + float + ... returning nothing + + ^?{}: function + ... with parameters + reference to float + ... returning nothing + + + ... with resolved type: + void +... to: nothing +... with resolved type: + void Index: tests/collections/.expect/vector-err-retn-perm-it-byval.txt =================================================================== --- tests/collections/.expect/vector-err-retn-perm-it-byval.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/.expect/vector-err-retn-perm-it-byval.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,314 @@ +collections/vector-demo.cfa:105:1 error: Unique best alternative includes deleted identifier in Generated Cast of: + Application of + Deleted Expression + Variable Expression: ?{}: static inline forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... with resolved type: + forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... deleted by: ?{}: static inline forall + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + function + ... with parameters + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + reference to instance of struct vector_permit with body + ... with parameters + instance of type T (not function type) + + ... returning nothing + + ... to arguments + Generated Cast of: + Variable Expression: ofG: instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + instance of struct vector_permit with body + ... with parameters + float + + ... to: + reference to instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + reference to instance of struct vector_permit with body + ... with parameters + float + + Generated Cast of: + Application of + Variable Expression: g: function + ... with parameters + reference to instance of struct vector with body + ... with parameters + float + + ... returning + instance of struct vector_permit with body + ... with parameters + float + + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of struct vector with body + ... with parameters + float + + ... returning + instance of struct vector_permit with body + ... with parameters + float + + + ... to arguments + Generated Cast of: + Variable Expression: v: instance of struct vector with body + ... with parameters + float + + ... with resolved type: + instance of struct vector with body + ... with parameters + float + + ... to: + reference to instance of struct vector with body + ... with parameters + float + + ... with resolved type: + reference to instance of struct vector with body + ... with parameters + float + + + ... with resolved type: + instance of struct vector_permit with body + ... with parameters + float + + ... to: + reference to instance of struct vector_permit with body + ... with parameters + float + + ... with resolved type: + reference to instance of struct vector_permit with body + ... with parameters + float + + with inferred parameters 0: + ?=?: function + ... with parameters + reference to float + float + ... returning + float + + ?{}: function + ... with parameters + reference to float + ... returning nothing + + ?{}: function + ... with parameters + reference to float + float + ... returning nothing + + ^?{}: function + ... with parameters + reference to float + ... returning nothing + + + ... with resolved type: + void +... to: nothing +... with resolved type: + void Index: tests/collections/vector-demo.cfa =================================================================== --- tests/collections/vector-demo.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/vector-demo.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,169 @@ +#include + +void raiiTests() { + printf("raiiTests=================\n"); + + vector( float ) v = { 25 }; + + push_last( v, 1 ); + printf( "Having pushed, length is %ld\n", v`length ); + + float y = v[0]`val; + printf( "by transit, got pos0 = %f\n", y ); + + { + vector_exit(float) it = v[0]; + + float z = it`val; + printf( "by exit, got pos0 = %f\n", z ); + + // forbid modification while locked + #ifdef TRY_MOD_WHILE_LOCKED_1 + push_last( v, 1 ); // runtime assertion failure + printf( "Having pushed, length is %ld\n", v`length ); + #endif + } + + push_last( v, 2 ); + printf( "Having pushed, length is %ld\n", v`length ); + + // deletion scope for some exits + // point is the function decls and calls, though + { + void helperE(vector_exit(float) it) { + float q = it`val; + printf( "helperE sees %f\n", q ); + } + + vector_exit(float) it2 = v[1]; + helperE(it2); + + // can't call with implied exit (wish I could, low priority) + #ifdef TRY_IMPLIED_EXIT_1 + helperE( v[1] ); // Invalid application of existing declaration(s) + #endif + + //------ + + vector_exit(float) producerE( vector( float ) & theVec ) { + return theVec[0]; + } + + vector_exit(float) it3 = producerE( v ); + float z = it3`val; + printf( "producerE gave %f\n", z ); + + float zzzz = producerE( v )`val; + printf( "producerE again gave %f\n", zzzz ); + + //------ + + void helperT(vector_transit(float) it) { + float q = it`val; + printf( "helperT sees %f\n", q ); + } + + helperT( v[1] ); + + //------ + + vector_transit(float) producerT( vector( float ) & theVec ) { + return theVec[0]; + } + + float zz = producerT( v )`val; + printf( "producerT gave %f\n", zz ); + } + + //======= + + { + vector_permit(float) it = v[0]; + + float z = it`val; + printf( "by permit, got pos0 = %f\n", z ); + + // allow modification while permits exist + push_last( v, 1 ); + printf( "Having pushed, length is %ld\n", v`length ); + + // forbid passing permit by value + #ifdef TRY_PASS_PERMIT_BYVAL_1 + void f( vector_permit(float) xx ) { + printf("can't get here\n"); + } + f( it ); // Unique best alternative includes deleted identifier + #endif + + // can declare function that returns permit (wish to forbid) + vector_permit(float) g( vector( float ) & theVec ) { + return theVec[0]; // want to forbid + } + + // forbid calling a function that returns permit by value + #ifdef TRY_RETURN_PERMIT_BYVAL_1 + vector_permit(float) ofG = g( v ); // Unique best alternative includes deleted identifier + #endif + + // allow declaration of permit, populating from exit + vector_exit(float) h( vector( float ) & theVec ) { + return theVec[0]; + } + + vector_permit(float) ofH = h( v ); + float zh = ofH`val; + printf( "into permit from call, got ofH = %f\n", zh ); + } +} + +void stayValidTests() { + printf("stayValidTests============\n"); + vector( float ) v = { 4 }; + push_last(v, 0.0f); + push_last(v, 0.1f); + push_last(v, 0.2f); + // v is [0.0, 0.1, 0.2] + + vector_permit(float) iter = v[1]; // iter at 0.1 + + float val1 = iter`val; + printf("before %f\n", val1); + + insert_before( v, 1, 98.6f ); // v is [0.0, 98.6, 0.1, 0.2]; iter at 0.1 + + float val2 = iter`val; + printf("after, logical: %f\n", val2); + + // we had filled it to the brim + assert( v`capacity == 4 && v`length == 4 ); + + push_last(v, -100); // v is [0.0, 98.6, 0.1, 0.2, 0.3]; iter at 0.1, but RTP it's not looking at the old memory's 0.1 + + // that made it bigger + assert( v`capacity > 5 && v`length == 5 ); + + v[2] = -0.1; // v is [0.0, 98.6, -0.1, 0.2, 0.3]; iter at -0.1, where only the new memory had that change + + float val3 = iter`val; + printf("after, physical: %f\n", val3); +} + +void loopTests() { + printf("loopTests=================\n"); + vector(float) v = { 4 }; + push_last(v, 0.0f); + push_last(v, 0.1f); + push_last(v, 0.2f); + float toPrint; + + while( vector_exit(float) it = v`origin; it`moveNext ) { + toPrint *= it; + printf("loop sees %f\n", toPrint); + } +} + +int main() { + raiiTests(); + stayValidTests(); + loopTests(); +} Index: tests/collections/vector-err-mod-with-excl-it.cfa =================================================================== --- tests/collections/vector-err-mod-with-excl-it.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/vector-err-mod-with-excl-it.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,8 @@ +/* +Temporarily: no associated .expect file, not runnable with test.py. +For human acceptance: Should compile, but crash with an assertion failure when run. +Detail of this error reporting is work in progress. +*/ + +#define TRY_MOD_WHILE_LOCKED_1 +#include "vector-demo.cfa" Index: tests/collections/vector-err-pass-perm-it-byval.cfa =================================================================== --- tests/collections/vector-err-pass-perm-it-byval.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/vector-err-pass-perm-it-byval.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,2 @@ +#define TRY_PASS_PERMIT_BYVAL_1 +#include "vector-demo.cfa" Index: tests/collections/vector-err-retn-perm-it-byval.cfa =================================================================== --- tests/collections/vector-err-retn-perm-it-byval.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/collections/vector-err-retn-perm-it-byval.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,2 @@ +#define TRY_RETURN_PERMIT_BYVAL_1 +#include "vector-demo.cfa" Index: tests/concurrent/signal/disjoint.cfa =================================================================== --- tests/concurrent/signal/disjoint.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/concurrent/signal/disjoint.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -77,5 +77,5 @@ wait( cond ); if( d.state != SIGNAL ) { - sout | "ERROR barging!"; + abort | "ERROR barging!"; } @@ -113,5 +113,5 @@ bool running = TEST(globals.data.counter < N) && globals.data.counter > 0; if( globals.data.state != SIGNAL && running ) { - sout | "ERROR Eager signal" | globals.data.state; + abort | "ERROR Eager signal" | globals.data.state; } } Index: tests/coroutine/fibonacci.cfa =================================================================== --- tests/coroutine/fibonacci.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/coroutine/fibonacci.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -31,13 +31,8 @@ } -int next( Fibonacci & fib ) with( fib ) { - resume( fib ); // restart last suspend - return fn; -} - int main() { Fibonacci f1, f2; for ( 10 ) { // print N Fibonacci values - sout | next( f1 ) | next( f2 ); + sout | resume( f1 ).fn | resume( f2 ).fn; } // for } Index: tests/device/.expect/cpu.txt =================================================================== --- tests/device/.expect/cpu.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/device/.expect/cpu.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,1 @@ +Match! Index: tests/device/cpu.cfa =================================================================== --- tests/device/cpu.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/device/cpu.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,198 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// cpu.cfa -- checks that libcfa correctly counts the number of cpus. +// +// Author : Thierry Delisle +// Created On : Mon Jun 14 13:59:01 2021 +// Last Modified By : +// Last Modified On : +// Update Count : +// + + +#include +#include +#include + +#include +#include +#include +#include + +extern "C" { + #include + #include + #include + #include + #include +} + +// go through a directory calling fn on each file +static int iterate_dir( const char * path, void (*fn)(struct dirent * ent) ) { + // open the directory + DIR *dir = opendir(path); + if(dir == 0p) { return ENOTDIR; } + + // call fn for each + struct dirent * ent; + while ((ent = readdir(dir)) != 0p) { + fn( ent ); + } + + // no longer need this + closedir(dir); + return 0; +} + +// count the number of directories with the specified prefix +// the directories counted have the form '[prefix]N' where prefix is the parameter +// and N is an base 10 integer. +static int count_prefix_dirs(const char * path, const char * prefix) { + // read the directory and find the cpu count + // and make sure everything is as expected + int max = -1; + int count = 0; + void lambda(struct dirent * ent) { + // were are looking for prefixX, where X is a number + // check that it starts with 'cpu + char * s = strstr(ent->d_name, prefix); + if(s == 0p) { return; } + if(s != ent->d_name) { return; } + + // check that the next part is a number + s += strlen(prefix); + char * end; + long int val = strtol(s, &end, 10); + if(*end != '\0' || val < 0) { return; } + + // check that it's a directory + if(ent->d_type != DT_DIR) { return; } + + // it's a match! + max = max(val, max); + count++; + } + iterate_dir(path, lambda); + + /* paranoid */ verifyf(count == max + 1, "Inconsistent %s count, counted %d, but max %s was %d", prefix, count, prefix, (int)max); + + return count; +} + +// Count number of cache *indexes* in the system +// cache indexes are distinct from cache level as Data or Instruction cache +// can share a level but not an index +// PITFALL: assumes all cpus have the same indexes as cpu0 +static int count_cache_indexes(void) { + return count_prefix_dirs("/sys/devices/system/cpu/cpu0/cache", "index"); +} + +// read information about a spcficic cache index/cpu file into the output buffer +static size_t read_cpuidxinfo_into(unsigned cpu, unsigned idx, const char * file, char * out, size_t out_len) { + // Pick the file we want and read it + char buf[128]; + /* paranoid */ __attribute__((unused)) int len = + snprintf(buf, 128, "/sys/devices/system/cpu/cpu%u/cache/index%u/%s", cpu, idx, file); + /* paranoid */ verifyf(len > 0, "Could not generate '%s' filename for cpu %u, index %u", file, cpu, idx); + + int fd = open(buf, 0, O_RDONLY); + /* paranoid */ verifyf(fd > 0, "Could not open file '%s'", buf); + + ssize_t r = read(fd, out, out_len); + /* paranoid */ verifyf(r > 0, "Could not read file '%s'", buf); + + /* paranoid */ __attribute__((unused)) int ret = + close(fd); + /* paranoid */ verifyf(ret == 0, "Could not close file '%s'", buf); + + out[r-1] = '\0'; + return r-1; +} + +unsigned find_idx() { + int idxs = count_cache_indexes(); + + unsigned found_level = 0; + unsigned found = -1u; + for(i; idxs) { + unsigned idx = idxs - 1 - i; + char buf[32]; + + // Level is the cache level: higher means bigger and slower + read_cpuidxinfo_into(0, idx, "level", buf, 32); + char * end; + unsigned long level = strtoul(buf, &end, 10); + /* paranoid */ verifyf(level <= 250, "Cpu %u has more than 250 levels of cache, that doesn't sound right", 0); + /* paranoid */ verify(*end == '\0'); + + if(found_level < level) { + found_level = level; + found = idx; + } + } + + /* paranoid */ verify(found != -1u); + return found; +} + +int main() { + //----------------------------------------------------------------------- + int ret1 = get_nprocs(); + int ret2 = cpu_info.hthrd_count; + if(ret1 != ret2) { + sout | "No match! libcfa says" | ret2 | "hardware threads but linux counts" | ret1 | "processors"; + } + else { + sout | "Match!"; + } + + //----------------------------------------------------------------------- + // Make sure no one has the same self + for(ime; cpu_info.hthrd_count) { + unsigned me = cpu_info.llc_map[ime].self; + { + unsigned s = cpu_info.llc_map[ime].start; + unsigned e = s + cpu_info.llc_map[ime].count; + if(me < s || me >= e) { + sout | "CPU" | ime | "outside of it's own map: " | s | "<=" | me | "<" | e; + } + } + + + for(ithem; cpu_info.hthrd_count) { + if(ime == ithem) continue; + + unsigned them = cpu_info.llc_map[ithem].self; + if(me == them) { + sout | "CPU" | ime | "has conflicting self id with" | ithem | "(" | me | ")"; + } + } + } + + + //----------------------------------------------------------------------- + unsigned idx = find_idx(); + // For all procs check mapping is consistent + for(cpu_me; cpu_info.hthrd_count) { + char buf_me[32]; + size_t len_me = read_cpuidxinfo_into(cpu_me, idx, "shared_cpu_list", buf_me, 32); + for(cpu_them; cpu_info.hthrd_count) { + if(cpu_me == cpu_them) continue; + char buf_them[32]; + size_t len_them = read_cpuidxinfo_into(cpu_them, idx, "shared_cpu_list", buf_them, 32); + + bool match_file = len_them == len_me && 0 == strncmp(buf_them, buf_me, len_me); + bool match_info = cpu_info.llc_map[cpu_me].start == cpu_info.llc_map[cpu_them].start && cpu_info.llc_map[cpu_me].count == cpu_info.llc_map[cpu_them].count; + + if(match_file != match_info) { + sout | "CPU" | cpu_me | "and" | cpu_them | "have inconsitent file and cpu_info"; + sout | cpu_me | ": <" | cpu_info.llc_map[cpu_me ].start | "," | cpu_info.llc_map[cpu_me ].count | "> '" | buf_me | "'"; + sout | cpu_me | ": <" | cpu_info.llc_map[cpu_them].start | "," | cpu_info.llc_map[cpu_them].count | "> '" | buf_them | "'"; + } + } + } +} Index: tests/forall.cfa =================================================================== --- tests/forall.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/forall.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -199,4 +199,30 @@ } +forall( T ) void check_otype() { + T & tr = *0p; + T * tp = 0p; + + &tr += 1; + tp += 1; + T & tx = tp[1]; + + T t; + T t2 = t; +} + +forall( T * ) void check_dstype() { + T & tr = *0p; + T * tp = 0p; + + &tr += 1; + tp += 1; + T & tx = tp[1]; +} + +forall( T & ) void check_dtype() { + T & tr = *0p; + T * tp = 0p; +} + //otype T1 | { void xxx( T1 ); }; Index: tests/generator/fibonacci.cfa =================================================================== --- tests/generator/fibonacci.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/generator/fibonacci.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -8,9 +8,11 @@ // // Author : Thierry Delisle -// Created On : Mon Mar 1 16:54:23 2020 -// Last Modified By : -// Last Modified On : -// Update Count : +// Created On : Mon Mar 1 16:54:23 2020 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Jun 10 21:54:14 2021 +// Update Count : 3 // + +#include generator Fib { @@ -18,5 +20,5 @@ }; -void main(Fib & b) with (b) { +void main(Fib & fib) with (fib) { [fn1, fn] = [1, 0]; for () { @@ -29,9 +31,8 @@ Fib f1, f2; for ( 10 ) { - resume( f1 ); - resume( f2 ); - printf("%d %d\n", f1.fn, f2.fn); + resume( f1 ); resume( f2 ); + sout | f1.fn | f2.fn; + // sout | resume( f1 ).fn | resume( f2 ).fn; // compiler bug } - } Index: tests/generator/fmtLines.cfa =================================================================== --- tests/generator/fmtLines.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/generator/fmtLines.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -9,7 +9,7 @@ // Author : Thierry Delisle // Created On : Thu Mar 5 16:09:08 2020 -// Last Modified By : -// Last Modified On : -// Update Count : +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Jun 10 21:56:22 2021 +// Update Count : 2 // Index: tests/generator/suspend_then.cfa =================================================================== --- tests/generator/suspend_then.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/generator/suspend_then.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -9,7 +9,7 @@ // Author : Peter A. Buhr // Created On : Mon Apr 29 12:01:35 2019 -// Last Modified By : -// Last Modified On : -// Update Count : +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Jun 10 21:55:51 2021 +// Update Count : 1 // Index: tests/literals.cfa =================================================================== --- tests/literals.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/literals.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -10,6 +10,6 @@ // Created On : Sat Sep 9 16:34:38 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Aug 29 10:57:56 2020 -// Update Count : 226 +// Last Modified On : Sat Jun 19 15:47:49 2021 +// Update Count : 237 // @@ -63,53 +63,105 @@ -0X0123456789ABCDEF; -0X0123456789ABCDEFu; -0X0123456789ABCDEFl; -0X0123456789ABCDEFll; -0X0123456789ABCDEFul; -0X0123456789ABCDEFlu; -0X0123456789ABCDEFull; -0X0123456789ABCDEFllu; +// floating literals + + 0123456789.; 0123456789.f; 0123456789.d; 0123456789.l; 0123456789.F; 0123456789.D; 0123456789.L; + +0123456789.; +0123456789.f; +0123456789.d; +0123456789.l; +0123456789.F; +0123456789.D; +0123456789.L; + -0123456789.; -0123456789.f; -0123456789.d; -0123456789.l; -0123456789.F; -0123456789.D; -0123456789.L; + + 0123456789.e09; 0123456789.e09f; 0123456789.e09d; 0123456789.e09l; 0123456789.e09F; 0123456789.e09D; 0123456789.e09L; + +0123456789.e09; +0123456789.e09f; +0123456789.e09d; +0123456789.e09l; +0123456789.e09F; +0123456789.e09D; +0123456789.e09L; + -0123456789.e09; -0123456789.e09f; -0123456789.e09d; -0123456789.e09l; -0123456789.e09F; -0123456789.e09D; -0123456789.e09L; + + 0123456789.e+09; 0123456789.e+09f; 0123456789.e+09d; 0123456789.e+09l; 0123456789.e+09F; 0123456789.e+09D; 0123456789.e+09L; + +0123456789.e+09; +0123456789.e+09f; +0123456789.e+09d; +0123456789.e+09l; +0123456789.e+09F; +0123456789.e+09D; +0123456789.e+09L; + -0123456789.e+09; -0123456789.e+09f; -0123456789.e+09d; -0123456789.e+09l; -0123456789.e+09F; -0123456789.e+09D; -0123456789.e+09L; + + 0123456789.e-09; 0123456789.e-09f; 0123456789.e-09d; 0123456789.e-09l; 0123456789.e-09F; 0123456789.e-09D; 0123456789.e-09L; + +0123456789.e-09; +0123456789.e-09f; +0123456789.e-09d; +0123456789.e-09l; +0123456789.e-09F; +0123456789.e-09D; +0123456789.e-09L; + -0123456789.e-09; -0123456789.e-09f; -0123456789.e-09d; -0123456789.e-09l; -0123456789.e-09F; -0123456789.e-09D; -0123456789.e-09L; + + .0123456789; .0123456789f; .0123456789d; .0123456789l; .0123456789F; .0123456789D; .0123456789L; + +.0123456789; +.0123456789f; +.0123456789d; +.0123456789l; +.0123456789F; +.0123456789D; +.0123456789L; + -.0123456789; -.0123456789f; -.0123456789d; -.0123456789l; -.0123456789F; -.0123456789D; -.0123456789L; + + .0123456789e09; .0123456789e09f; .0123456789e09d; .0123456789e09l; .0123456789e09F; .0123456789e09D; .0123456789e09L; + +.0123456789e09; +.0123456789e09f; +.0123456789e09d; +.0123456789e09l; +.0123456789e09F; +.0123456789e09D; +.0123456789e09L; + -.0123456789e09; -.0123456789e09f; -.0123456789e09d; -.0123456789e09l; -.0123456789e09F; -.0123456789e09D; -.0123456789e09L; + + .0123456789E+09; .0123456789E+09f; .0123456789E+09d; .0123456789E+09l; .0123456789E+09F; .0123456789E+09D; .0123456789E+09L; + +.0123456789E+09; +.0123456789E+09f; +.0123456789E+09d; +.0123456789E+09l; +.0123456789E+09F; +.0123456789E+09D; +.0123456789E+09L; + -.0123456789E+09; -.0123456789E+09f; -.0123456789E+09d; -.0123456789E+09l; -.0123456789E+09F; -.0123456789E+09D; -.0123456789E+09L; + + .0123456789E-09; .0123456789E-09f; .0123456789E-09d; .0123456789E-09l; .0123456789E-09F; .0123456789E-09D; .0123456789E-09L; + -.0123456789E-09; -.0123456789E-09f; -.0123456789E-09d; -.0123456789E-09l; -.0123456789E-09F; -.0123456789E-09D; -.0123456789E-09L; + -.0123456789E-09; -.0123456789E-09f; -.0123456789E-09d; -.0123456789E-09l; -.0123456789E-09F; -.0123456789E-09D; -.0123456789E-09L; + + 0123456789.0123456789; 0123456789.0123456789f; 0123456789.0123456789d; 0123456789.0123456789l; 0123456789.0123456789F; 0123456789.0123456789D; 0123456789.0123456789L; + +0123456789.0123456789; +0123456789.0123456789f; +0123456789.0123456789d; +0123456789.0123456789l; +0123456789.0123456789F; +0123456789.0123456789D; +0123456789.0123456789L; + -0123456789.0123456789; -0123456789.0123456789f; -0123456789.0123456789d; -0123456789.0123456789l; -0123456789.0123456789F; -0123456789.0123456789D; -0123456789.0123456789L; + + 0123456789.0123456789E09; 0123456789.0123456789E09f; 0123456789.0123456789E09d; 0123456789.0123456789E09l; 0123456789.0123456789E09F; 0123456789.0123456789E09D; 0123456789.0123456789E09L; + +0123456789.0123456789E09; +0123456789.0123456789E09f; +0123456789.0123456789E09d; +0123456789.0123456789E09l; +0123456789.0123456789E09F; +0123456789.0123456789E09D; +0123456789.0123456789E09L; + -0123456789.0123456789E09; -0123456789.0123456789E09f; -0123456789.0123456789E09d; -0123456789.0123456789E09l; -0123456789.0123456789E09F; -0123456789.0123456789E09D; -0123456789.0123456789E09L; + + 0123456789.0123456789E+09; 0123456789.0123456789E+09f; 0123456789.0123456789E+09d; 0123456789.0123456789E+09l; 0123456789.0123456789E+09F; 0123456789.0123456789E+09D; 0123456789.0123456789E+09L; + +0123456789.0123456789E+09; +0123456789.0123456789E+09f; +0123456789.0123456789E+09d; +0123456789.0123456789E+09l; +0123456789.0123456789E+09F; +0123456789.0123456789E+09D; +0123456789.0123456789E+09L; + -0123456789.0123456789E+09; -0123456789.0123456789E+09f; -0123456789.0123456789E+09d; -0123456789.0123456789E+09l; -0123456789.0123456789E+09F; -0123456789.0123456789E+09D; -0123456789.0123456789E+09L; + + 0123456789.0123456789E-09; 0123456789.0123456789E-09f; 0123456789.0123456789E-09d; 0123456789.0123456789E-09l; 0123456789.0123456789E-09F; 0123456789.0123456789E-09D; 0123456789.0123456789E-09L; + +0123456789.0123456789E-09; +0123456789.0123456789E-09f; +0123456789.0123456789E-09d; +0123456789.0123456789E-09l; +0123456789.0123456789E-09F; +0123456789.0123456789E-09D; +0123456789.0123456789E-09L; + -0123456789.0123456789E-09; -0123456789.0123456789E-09f; -0123456789.0123456789E-09d; -0123456789.0123456789E-09l; -0123456789.0123456789E-09F; -0123456789.0123456789E-09D; -0123456789.0123456789E-09L; + // decimal floating literals - 0123456789.; 0123456789.f; 0123456789.l; 0123456789.F; 0123456789.L; 0123456789.DL; - +0123456789.; +0123456789.f; +0123456789.l; +0123456789.F; +0123456789.L; +0123456789.DL; - -0123456789.; -0123456789.f; -0123456789.l; -0123456789.F; -0123456789.L; -0123456789.DL; - - 0123456789.e09; 0123456789.e09f; 0123456789.e09l; 0123456789.e09F; 0123456789.e09L; 0123456789.e09DL; - +0123456789.e09; +0123456789.e09f; +0123456789.e09l; +0123456789.e09F; +0123456789.e09L; +0123456789.e09DL; - -0123456789.e09; -0123456789.e09f; -0123456789.e09l; -0123456789.e09F; -0123456789.e09L; -0123456789.e09DL; - - 0123456789.e+09; 0123456789.e+09f; 0123456789.e+09l; 0123456789.e+09F; 0123456789.e+09L; 0123456789.e+09DL; - +0123456789.e+09; +0123456789.e+09f; +0123456789.e+09l; +0123456789.e+09F; +0123456789.e+09L; +0123456789.e+09DL; - -0123456789.e+09; -0123456789.e+09f; -0123456789.e+09l; -0123456789.e+09F; -0123456789.e+09L; -0123456789.e+09DL; - - 0123456789.e-09; 0123456789.e-09f; 0123456789.e-09l; 0123456789.e-09F; 0123456789.e-09L; 0123456789.e-09DL; - +0123456789.e-09; +0123456789.e-09f; +0123456789.e-09l; +0123456789.e-09F; +0123456789.e-09L; +0123456789.e-09DL; - -0123456789.e-09; -0123456789.e-09f; -0123456789.e-09l; -0123456789.e-09F; -0123456789.e-09L; -0123456789.e-09DL; - - .0123456789; .0123456789f; .0123456789l; .0123456789F; .0123456789L; .0123456789DL; - +.0123456789; +.0123456789f; +.0123456789l; +.0123456789F; +.0123456789L; +.0123456789DL; - -.0123456789; -.0123456789f; -.0123456789l; -.0123456789F; -.0123456789L; -.0123456789DL; - - .0123456789e09; .0123456789e09f; .0123456789e09l; .0123456789e09F; .0123456789e09L; .0123456789e09DL; - +.0123456789e09; +.0123456789e09f; +.0123456789e09l; +.0123456789e09F; +.0123456789e09L; +.0123456789e09DL; - -.0123456789e09; -.0123456789e09f; -.0123456789e09l; -.0123456789e09F; -.0123456789e09L; -.0123456789e09DL; - - .0123456789E+09; .0123456789E+09f; .0123456789E+09l; .0123456789E+09F; .0123456789E+09L; .0123456789E+09DL; - +.0123456789E+09; +.0123456789E+09f; +.0123456789E+09l; +.0123456789E+09F; +.0123456789E+09L; +.0123456789E+09DL; - -.0123456789E+09; -.0123456789E+09f; -.0123456789E+09l; -.0123456789E+09F; -.0123456789E+09L; -.0123456789E+09DL; - - .0123456789E-09; .0123456789E-09f; .0123456789E-09l; .0123456789E-09F; .0123456789E-09L; .0123456789E-09DL; - -.0123456789E-09; -.0123456789E-09f; -.0123456789E-09l; -.0123456789E-09F; -.0123456789E-09L; -.0123456789E-09DL; - -.0123456789E-09; -.0123456789E-09f; -.0123456789E-09l; -.0123456789E-09F; -.0123456789E-09L; -.0123456789E-09DL; - - 0123456789.0123456789; 0123456789.0123456789f; 0123456789.0123456789l; 0123456789.0123456789F; 0123456789.0123456789L; 0123456789.0123456789DL; - +0123456789.0123456789; +0123456789.0123456789f; +0123456789.0123456789l; +0123456789.0123456789F; +0123456789.0123456789L; +0123456789.0123456789DL; - -0123456789.0123456789; -0123456789.0123456789f; -0123456789.0123456789l; -0123456789.0123456789F; -0123456789.0123456789L; -0123456789.0123456789DL; - - 0123456789.0123456789E09; 0123456789.0123456789E09f; 0123456789.0123456789E09l; 0123456789.0123456789E09F; 0123456789.0123456789E09L; 0123456789.0123456789E09DL; - +0123456789.0123456789E09; +0123456789.0123456789E09f; +0123456789.0123456789E09l; +0123456789.0123456789E09F; +0123456789.0123456789E09L; +0123456789.0123456789E09DL; - -0123456789.0123456789E09; -0123456789.0123456789E09f; -0123456789.0123456789E09l; -0123456789.0123456789E09F; -0123456789.0123456789E09L; -0123456789.0123456789E09DL; - - 0123456789.0123456789E+09; 0123456789.0123456789E+09f; 0123456789.0123456789E+09l; 0123456789.0123456789E+09F; 0123456789.0123456789E+09L; 0123456789.0123456789E+09DL; - +0123456789.0123456789E+09; +0123456789.0123456789E+09f; +0123456789.0123456789E+09l; +0123456789.0123456789E+09F; +0123456789.0123456789E+09L; +0123456789.0123456789E+09DL; - -0123456789.0123456789E+09; -0123456789.0123456789E+09f; -0123456789.0123456789E+09l; -0123456789.0123456789E+09F; -0123456789.0123456789E+09L; -0123456789.0123456789E+09DL; - - 0123456789.0123456789E-09; 0123456789.0123456789E-09f; 0123456789.0123456789E-09l; 0123456789.0123456789E-09F; 0123456789.0123456789E-09L; 0123456789.0123456789E-09DL; - +0123456789.0123456789E-09; +0123456789.0123456789E-09f; +0123456789.0123456789E-09l; +0123456789.0123456789E-09F; +0123456789.0123456789E-09L; +0123456789.0123456789E-09DL; - -0123456789.0123456789E-09; -0123456789.0123456789E-09f; -0123456789.0123456789E-09l; -0123456789.0123456789E-09F; -0123456789.0123456789E-09L; -0123456789.0123456789E-09DL; +#if ! defined( __aarch64__ ) // unsupported on ARM after gcc-9 + 0123456789.df; 0123456789.dd; 0123456789.dl; 0123456789.DF; 0123456789.DD; 0123456789.DL; + +0123456789.df; +0123456789.dd; +0123456789.dl; +0123456789.DF; +0123456789.DD; +0123456789.DL; + -0123456789.df; -0123456789.dd; -0123456789.dl; -0123456789.DF; -0123456789.DD; -0123456789.DL; + + 0123456789.e09df; 0123456789.e09dd; 0123456789.e09dl; 0123456789.e09DF; 0123456789.e09DD; 0123456789.e09DL; + +0123456789.e09df; +0123456789.e09dd; +0123456789.e09dl; +0123456789.e09DF; +0123456789.e09DD; +0123456789.e09DL; + -0123456789.e09df; -0123456789.e09dd; -0123456789.e09dl; -0123456789.e09DF; -0123456789.e09DD; -0123456789.e09DL; + + 0123456789.e+09df; 0123456789.e+09dd; 0123456789.e+09dl; 0123456789.e+09DF; 0123456789.e+09DD; 0123456789.e+09DL; + +0123456789.e+09df; +0123456789.e+09dd; +0123456789.e+09dl; +0123456789.e+09DF; +0123456789.e+09DD; +0123456789.e+09DL; + -0123456789.e+09df; -0123456789.e+09dd; -0123456789.e+09dl; -0123456789.e+09DF; -0123456789.e+09DD; -0123456789.e+09DL; + + 0123456789.e-09df; 0123456789.e-09dd; 0123456789.e-09dl; 0123456789.e-09DF; 0123456789.e-09DD; 0123456789.e-09DL; + +0123456789.e-09df; +0123456789.e-09dd; +0123456789.e-09dl; +0123456789.e-09DF; +0123456789.e-09DD; +0123456789.e-09DL; + -0123456789.e-09df; -0123456789.e-09dd; -0123456789.e-09dl; -0123456789.e-09DF; -0123456789.e-09DD; -0123456789.e-09DL; + + .0123456789df; .0123456789dd; .0123456789dl; .0123456789DF; .0123456789DD; .0123456789DL; + +.0123456789df; +.0123456789dd; +.0123456789dl; +.0123456789DF; +.0123456789DD; +.0123456789DL; + -.0123456789df; -.0123456789dd; -.0123456789dl; -.0123456789DF; -.0123456789DD; -.0123456789DL; + + .0123456789e09df; .0123456789e09dd; .0123456789e09dl; .0123456789e09DF; .0123456789e09DD; .0123456789e09DL; + +.0123456789e09df; +.0123456789e09dd; +.0123456789e09dl; +.0123456789e09DF; +.0123456789e09DD; +.0123456789e09DL; + -.0123456789e09df; -.0123456789e09dd; -.0123456789e09dl; -.0123456789e09DF; -.0123456789e09DD; -.0123456789e09DL; + + .0123456789E+09df; .0123456789E+09dd; .0123456789E+09dl; .0123456789E+09DF; .0123456789E+09DD; .0123456789E+09DL; + +.0123456789E+09df; +.0123456789E+09dd; +.0123456789E+09dl; +.0123456789E+09DF; +.0123456789E+09DD; +.0123456789E+09DL; + -.0123456789E+09df; -.0123456789E+09dd; -.0123456789E+09dl; -.0123456789E+09DF; -.0123456789E+09DD; -.0123456789E+09DL; + + .0123456789E-09df; .0123456789E-09dd; .0123456789E-09dl; .0123456789E-09DF; .0123456789E-09DD; .0123456789E-09DL; + -.0123456789E-09df; -.0123456789E-09dd; -.0123456789E-09dl; -.0123456789E-09DF; -.0123456789E-09DD; -.0123456789E-09DL; + -.0123456789E-09df; -.0123456789E-09dd; -.0123456789E-09dl; -.0123456789E-09DF; -.0123456789E-09DD; -.0123456789E-09DL; + + 0123456789.0123456789df; 0123456789.0123456789dd; 0123456789.0123456789dl; 0123456789.0123456789DF; 0123456789.0123456789DD; 0123456789.0123456789DL; + +0123456789.0123456789df; +0123456789.0123456789dd; +0123456789.0123456789dl; +0123456789.0123456789DF; +0123456789.0123456789DD; +0123456789.0123456789DL; + -0123456789.0123456789df; -0123456789.0123456789dd; -0123456789.0123456789dl; -0123456789.0123456789DF; -0123456789.0123456789DD; -0123456789.0123456789DL; + + 0123456789.0123456789E09df; 0123456789.0123456789E09dd; 0123456789.0123456789E09dl; 0123456789.0123456789E09DF; 0123456789.0123456789E09DD; 0123456789.0123456789E09DL; + +0123456789.0123456789E09df; +0123456789.0123456789E09dd; +0123456789.0123456789E09dl; +0123456789.0123456789E09DF; +0123456789.0123456789E09DD; +0123456789.0123456789E09DL; + -0123456789.0123456789E09df; -0123456789.0123456789E09dd; -0123456789.0123456789E09dl; -0123456789.0123456789E09DF; -0123456789.0123456789E09DD; -0123456789.0123456789E09DL; + + 0123456789.0123456789E+09df; 0123456789.0123456789E+09dd; 0123456789.0123456789E+09dl; 0123456789.0123456789E+09DF; 0123456789.0123456789E+09DD; 0123456789.0123456789E+09DL; + +0123456789.0123456789E+09df; +0123456789.0123456789E+09dd; +0123456789.0123456789E+09dl; +0123456789.0123456789E+09DF; +0123456789.0123456789E+09DD; +0123456789.0123456789E+09DL; + -0123456789.0123456789E+09df; -0123456789.0123456789E+09dd; -0123456789.0123456789E+09dl; -0123456789.0123456789E+09DF; -0123456789.0123456789E+09DD; -0123456789.0123456789E+09DL; + + 0123456789.0123456789E-09df; 0123456789.0123456789E-09dd; 0123456789.0123456789E-09dl; 0123456789.0123456789E-09DF; 0123456789.0123456789E-09DD; 0123456789.0123456789E-09DL; + +0123456789.0123456789E-09df; +0123456789.0123456789E-09dd; +0123456789.0123456789E-09dl; +0123456789.0123456789E-09DF; +0123456789.0123456789E-09DD; +0123456789.0123456789E-09DL; + -0123456789.0123456789E-09df; -0123456789.0123456789E-09dd; -0123456789.0123456789E-09dl; -0123456789.0123456789E-09DF; -0123456789.0123456789E-09DD; -0123456789.0123456789E-09DL; +#endif // ! __aarch64__ // hexadecimal floating literals, must have exponent Index: tests/math.cfa =================================================================== --- tests/math.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/math.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -10,6 +10,6 @@ // Created On : Fri Apr 22 14:59:21 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Apr 13 21:04:48 2021 -// Update Count : 123 +// Last Modified On : Fri Jun 18 17:02:44 2021 +// Update Count : 124 // @@ -40,9 +40,9 @@ sout | "exp:" | exp( 1.0F ) | exp( 1.0D ) | exp( 1.0L ) | nonl; - sout | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0DL+1.0LI ); + sout | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0L+1.0LI ); sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L ); sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L ); sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | nonl; - sout | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.5DL+1.5LI, 1.5DL+1.5LI ); + sout | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.5L+1.5LI, 1.5L+1.5LI ); int b = 4; @@ -68,5 +68,5 @@ sout | "log:" | log( 1.0F ) | log( 1.0D ) | log( 1.0L ) | nonl; - sout | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0DL+1.0LI ); + sout | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0L+1.0LI ); sout | "log2:" | log2( 1024 ) | log2( 2 \ 17u ) | log2( 2 \ 23u ); sout | "log2:" | log2( 1024l ) | log2( 2l \ 17u ) | log2( 2l \ 23u ); @@ -82,5 +82,5 @@ sout | "sqrt:" | sqrt( 1.0F ) | sqrt( 1.0D ) | sqrt( 1.0L ) | nonl; - sout | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0DL+1.0LI ); + sout | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0L+1.0LI ); sout | "cbrt:" | cbrt( 27.0F ) | cbrt( 27.0D ) | cbrt( 27.0L ); sout | "hypot:" | hypot( 1.0F, -1.0F ) | hypot( 1.0D, -1.0D ) | hypot( 1.0L, -1.0L ); @@ -89,15 +89,15 @@ sout | "sin:" | sin( 1.0F ) | sin( 1.0D ) | sin( 1.0L ) | nonl; - sout | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0DL+1.0LI ); + sout | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0L+1.0LI ); sout | "cos:" | cos( 1.0F ) | cos( 1.0D ) | cos( 1.0L ) | nonl; - sout | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0DL+1.0LI ); + sout | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0L+1.0LI ); sout | "tan:" | tan( 1.0F ) | tan( 1.0D ) | tan( 1.0L ) | nonl; - sout | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0DL+1.0LI ); + sout | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0L+1.0LI ); sout | "asin:" | asin( 1.0F ) | asin( 1.0D ) | asin( 1.0L ) | nonl; - sout | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0DL+1.0LI ); + sout | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0L+1.0LI ); sout | "acos:" | acos( 1.0F ) | acos( 1.0D ) | acos( 1.0L ) | nonl; - sout | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0DL+1.0LI ); + sout | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0L+1.0LI ); sout | "atan:" | atan( 1.0F ) | atan( 1.0D ) | atan( 1.0L ) | nonl; - sout | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0DL+1.0LI ); + sout | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0L+1.0LI ); sout | "atan2:" | atan2( 1.0F, 1.0F ) | atan2( 1.0D, 1.0D ) | atan2( 1.0L, 1.0L ) | nonl; sout | "atan:" | atan( 1.0F, 1.0F ) | atan( 1.0D, 1.0D ) | atan( 1.0L, 1.0L ); @@ -106,15 +106,15 @@ sout | "sinh:" | sinh( 1.0F ) | sinh( 1.0D ) | sinh( 1.0L ) | nonl; - sout | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0DL+1.0LI ); + sout | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0L+1.0LI ); sout | "cosh:" | cosh( 1.0F ) | cosh( 1.0D ) | cosh( 1.0L ) | nonl; - sout | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0DL+1.0LI ); + sout | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0L+1.0LI ); sout | "tanh:" | tanh( 1.0F ) | tanh( 1.0D ) | tanh( 1.0L ) | nonl; - sout | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0DL+1.0LI ); + sout | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0L+1.0LI ); sout | "acosh:" | acosh( 1.0F ) | acosh( 1.0D ) | acosh( 1.0L ) | nonl; - sout | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0DL+1.0LI ); + sout | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0L+1.0LI ); sout | "asinh:" | asinh( 1.0F ) | asinh( 1.0D ) | asinh( 1.0L ) | nonl; - sout | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0DL+1.0LI ); + sout | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0L+1.0LI ); sout | "atanh:" | atanh( 1.0F ) | atanh( 1.0D ) | atanh( 1.0L ) | nonl; - sout | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0DL+1.0LI ); + sout | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0L+1.0LI ); //---------------------- Error / Gamma ---------------------- Index: tests/pybin/tools.py =================================================================== --- tests/pybin/tools.py (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/pybin/tools.py (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -376,5 +376,8 @@ return 1, "ERR No core dump" - return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE) + try: + return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE) + except: + return 1, "ERR Could not read core with gdb" def core_archive(dst, name, exe): Index: tests/test.py =================================================================== --- tests/test.py (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/test.py (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -13,5 +13,4 @@ import os -import psutil import signal Index: tests/typedefRedef.cfa =================================================================== --- tests/typedefRedef.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/typedefRedef.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -45,4 +45,10 @@ typedef int X2; +X2 value __attribute__((aligned(4 * sizeof(X2)))); + +__attribute__((aligned(4 * sizeof(X2)))) struct rseq_cs { + int foo; +}; + // xxx - this doesn't work yet due to parsing problems with generic types // #ifdef __CFA__ Index: tests/unified_locking/fast.cfa =================================================================== --- tests/unified_locking/fast.cfa (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ tests/unified_locking/fast.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -22,5 +22,5 @@ uint32_t cs() { $thread * me = active_thread(); - uint32_t value = (uint32_t)me; + uint32_t value; lock(mo.l); { @@ -28,4 +28,5 @@ mo.id = me; yield(random(5)); + value = ((uint32_t)random()) ^ ((uint32_t)me); if(mo.id != me) sout | "Intruder!"; mo.sum = tsum + value; Index: tests/vector_math/.expect/vec2_ldouble.arm64.txt =================================================================== --- tests/vector_math/.expect/vec2_ldouble.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/vector_math/.expect/vec2_ldouble.arm64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,2 @@ +ctor(x,y):<1.18973149535723176508575932662801e+4932,3.36210314311209350626267781732175e-4932> +dot(v2,v3):324.67070973663903806599369057642 Index: tests/vector_math/.expect/vec2_ldouble.txt =================================================================== --- tests/vector_math/.expect/vec2_ldouble.txt (revision 5a46e09dae381c4d10eda5d14c8e5293ab0dcbb9) +++ (revision ) @@ -1,2 +1,0 @@ -ctor(x,y):<1.18973149535723177e+4932,3.36210314311209351e-4932> -dot(v2,v3):324.670709736639038 Index: tests/vector_math/.expect/vec2_ldouble.x64.txt =================================================================== --- tests/vector_math/.expect/vec2_ldouble.x64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/vector_math/.expect/vec2_ldouble.x64.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,2 @@ +ctor(x,y):<1.18973149535723177e+4932,3.36210314311209351e-4932> +dot(v2,v3):324.670709736639038 Index: tests/vector_math/.expect/vec2_ldouble.x86.txt =================================================================== --- tests/vector_math/.expect/vec2_ldouble.x86.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/vector_math/.expect/vec2_ldouble.x86.txt (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,2 @@ +ctor(x,y):<1.18973149535723177e+4932,3.36210314311209351e-4932> +dot(v2,v3):324.670709736639038 Index: tests/zombies/vector-perf/iteration-perf.cfa =================================================================== --- tests/zombies/vector-perf/iteration-perf.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/zombies/vector-perf/iteration-perf.cfa (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,32 @@ +#include "vector2.hfa" + +#include + +enum { NumElements = 10000, NumReps = 50000 }; + +// A layer of indirection to improve performance (naturally!) +// Works around trac #248. +// This test keeps a vector of notfloat, instead of a vector of float. The optimizer removes this added indirection. +// Furthermore, by passing notfloat's static-inline constructors, defined in this compile unit, to vector, the vector's element's constructors become eligible for inlining. +// Skipping this optimization costs about a 25% slowdown. +struct notfloat{ inline float; }; + +int main() { + clock_t start, end; + vector(notfloat) x = { 4 }; + for (i; NumElements) { + push_last(x, (notfloat){0.1f * i}); + } + float total; + start = clock(); + for (rep; NumReps) { + total = 0; + while( vector_exit(notfloat) it = x`origin; it`moveNext ) { + total += it`val; + } + } + end = clock(); + printf("last total was %f\n", total); + double elapsed = ((double) (end - start)) / CLOCKS_PER_SEC; \ + printf("iterating duration was %f\n", elapsed); +} Index: tests/zombies/vector-perf/iteration-perf.cpp =================================================================== --- tests/zombies/vector-perf/iteration-perf.cpp (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) +++ tests/zombies/vector-perf/iteration-perf.cpp (revision dcad80aa4b528dd2299317e7cf9d0e46c0cd589d) @@ -0,0 +1,25 @@ +#include +#include +#include + +enum { NumElements = 10000, NumReps = 50000 }; + +int main() { + clock_t start, end; + std::vector x; + for (int i = 0; i < NumElements; i++) { + x.push_back(0.1f * i); + } + float total; + start = clock(); + for (int rep = 0; rep < NumReps; rep++) { + total = 0; + for( std::vector::iterator it = x.begin(); it < x.end(); it ++ ) { + total += *it; + } + } + end = clock(); + std::cout << "last total was " << total << std::endl; + double elapsed = ((double) (end - start)) / CLOCKS_PER_SEC; \ + std::cout << "iterating duration was " << elapsed << std::endl; +}