Changeset: fd2838c4af62 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd2838c4af62 Added Files: monetdb5/mal/Tests/selecttest.mal Removed Files: monetdb5/mal/Tests/uselecttest.mal Branch: default Log Message:
Cleanup the select performance test diffs (truncated from 337 to 300 lines): diff --git a/monetdb5/mal/Tests/uselecttest.mal b/monetdb5/mal/Tests/selecttest.mal rename from monetdb5/mal/Tests/uselecttest.mal rename to monetdb5/mal/Tests/selecttest.mal --- a/monetdb5/mal/Tests/uselecttest.mal +++ b/monetdb5/mal/Tests/selecttest.mal @@ -2,27 +2,27 @@ n := 100000000:int; io.printf("\ninput count: %9lld\n", n); include microbenchmark; -b := microbenchmark.uniform(0:oid,n,n); +b := microbenchmark.uniform(0:oid,100000000:wrd,n); function user.doit ( b:bat[:oid,:int] , n:int , x1:int , x2:int ) :void; - a := algebra.uselect(b,x1,x2); + a := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); c := aggr.count(a); io.printf("\npredicate: %9d <= x <= %9d; result count: %9lld\n", x1, x2, c); io.printf("1 slice, sequential:\ttime:"); t0 := alarm.time(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); @@ -31,21 +31,21 @@ function user.doit ( b:bat[:oid,:int] , io.printf("1 slice, parallel:\ttime:"); t0 := alarm.time(); barrier P0 := language.dataflow(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P0; t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P0 := language.dataflow(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P0; t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P0 := language.dataflow(); - a1 := algebra.uselect(b,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P0; t1 := alarm.time(); t := t1 - t0; @@ -62,22 +62,22 @@ function user.doit ( b:bat[:oid,:int] , m1 := m1 + m; b2 := algebra.slice(b,m0,m1); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t2 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t2 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t2 := alarm.time(); t := t1 - t0; @@ -94,8 +94,8 @@ function user.doit ( b:bat[:oid,:int] , b2 := algebra.slice(b,m0,m1); t0 := alarm.time(); barrier P1 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P1; t1 := alarm.time(); t2 := alarm.time(); @@ -103,8 +103,8 @@ function user.doit ( b:bat[:oid,:int] , io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P1 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P1; t1 := alarm.time(); t2 := alarm.time(); @@ -112,8 +112,8 @@ function user.doit ( b:bat[:oid,:int] , io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P1 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P1; t1 := alarm.time(); t2 := alarm.time(); @@ -137,26 +137,26 @@ function user.doit ( b:bat[:oid,:int] , m1 := m1 + m; b4 := algebra.slice(b,m0,m1); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); @@ -178,30 +178,30 @@ function user.doit ( b:bat[:oid,:int] , b4 := algebra.slice(b,m0,m1); t0 := alarm.time(); barrier P2 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P2; t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P2 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P2; t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P2 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P2; t1 := alarm.time(); t := t1 - t0; @@ -236,38 +236,38 @@ function user.doit ( b:bat[:oid,:int] , m1 := m1 + m; b8 := algebra.slice(b,m0,m1); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); - a5 := algebra.uselect(b5,x1,x2); - a6 := algebra.uselect(b6,x1,x2); - a7 := algebra.uselect(b7,x1,x2); - a8 := algebra.uselect(b8,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a5 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a6 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a7 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a8 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); - a5 := algebra.uselect(b5,x1,x2); - a6 := algebra.uselect(b6,x1,x2); - a7 := algebra.uselect(b7,x1,x2); - a8 := algebra.uselect(b8,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a5 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a6 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a7 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a8 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); - a5 := algebra.uselect(b5,x1,x2); - a6 := algebra.uselect(b6,x1,x2); - a7 := algebra.uselect(b7,x1,x2); - a8 := algebra.uselect(b8,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a5 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a6 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a7 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a8 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); @@ -301,42 +301,42 @@ function user.doit ( b:bat[:oid,:int] , b8 := algebra.slice(b,m0,m1); t0 := alarm.time(); barrier P2 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); - a5 := algebra.uselect(b5,x1,x2); - a6 := algebra.uselect(b6,x1,x2); - a7 := algebra.uselect(b7,x1,x2); - a8 := algebra.uselect(b8,x1,x2); + a1 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a2 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a3 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a4 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a5 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a6 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a7 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); + a8 := algebra.subselect(b,nil:bat[:oid,:oid],x1,x2,true,true,false); exit P2; t1 := alarm.time(); t := t1 - t0; io.printf(" %5lld ms", t); t0 := alarm.time(); barrier P2 := language.dataflow(); - a1 := algebra.uselect(b1,x1,x2); - a2 := algebra.uselect(b2,x1,x2); - a3 := algebra.uselect(b3,x1,x2); - a4 := algebra.uselect(b4,x1,x2); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list