MonetDB: default - MAL revamping tests

[Martin Kersten]

Changeset: f8bd60ca9211 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8bd60ca9211
Modified Files:
        monetdb5/mal/Tests/tst901a.malC
        monetdb5/mal/Tests/tst901b.malC
        monetdb5/mal/Tests/tst903.malC
Branch: default
Log Message:

MAL revamping tests


diffs (83 lines):

diff --git a/monetdb5/mal/Tests/tst901a.malC b/monetdb5/mal/Tests/tst901a.malC
--- a/monetdb5/mal/Tests/tst901a.malC
+++ b/monetdb5/mal/Tests/tst901a.malC
@@ -1,4 +1,5 @@
 # what is the overhead of MAL in multiplex situations
+function foo();
 b:= bat.new(:oid,:lng);
 
 INT_MAX := 2147483647;
@@ -6,7 +7,7 @@ dbgmsk_restore := mdb.getDebug();
 dbgmsk_unset := 8+8388608;
 dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
 dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
-#mdb.setDebug(dbgmsk_set);
+mdb.setDebug(dbgmsk_set);
 
 t0:= alarm.usec();
 barrier i:= 0:lng;
@@ -15,7 +16,7 @@ barrier i:= 0:lng;
 exit i;
 t1:= alarm.usec();
 
-#mdb.setDebug(dbgmsk_restore);
+mdb.setDebug(dbgmsk_restore);
 
 c:= algebra.copy(b);
 t2:= alarm.usec();
@@ -27,3 +28,5 @@ xc:= aggr.count(b);
 io.printf("#count %d\n",xc);
 io.printf("#make %d \n",d1);
 io.printf("#multiplex %d\n",d2);
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst901b.malC b/monetdb5/mal/Tests/tst901b.malC
--- a/monetdb5/mal/Tests/tst901b.malC
+++ b/monetdb5/mal/Tests/tst901b.malC
@@ -1,15 +1,15 @@
 # what is the overhead of MAL in multiplex situations
 # using a BATloop !! This is 40x slower as the V4.3 multiplex implementation
-#profiler.setAll();
-#profiler.setLogFile("/tmp/MonetProfile.xml");
+
+function foo();
 b:= bat.new(:oid,:lng);
 
 INT_MAX := 2147483647;
-#dbgmsk_restore := mdb.getDebug();
+dbgmsk_restore := mdb.getDebug();
 dbgmsk_unset := 8+8388608;
 dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
 dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
-#mdb.setDebug(dbgmsk_set);
+mdb.setDebug(dbgmsk_set);
 
 t0:= alarm.usec();
 barrier i:= 0:lng;
@@ -40,7 +40,6 @@ t3:= alarm.usec();
 
 mdb.setDebug(dbgmsk_restore);
 
-#CMD000(b,b);
 t4:= alarm.usec();
 d1:= t1-t0;
 d2:= t3-t2;
@@ -50,4 +49,5 @@ io.printf("#cnt %d ",cnt);
 io.printf("#make %d ",d1);
 io.printf("#multiplex %d\n",d2);
 io.printf("#compiled multiplex %d\n",d3);
-#profiler.stop();
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst903.malC b/monetdb5/mal/Tests/tst903.malC
--- a/monetdb5/mal/Tests/tst903.malC
+++ b/monetdb5/mal/Tests/tst903.malC
@@ -122,7 +122,7 @@ cnt:= aggr.count(z9);
 mdb.setDebug(dbgmsk_set);
 
 t0:= alarm.usec();
-x:bat[:oid,:lng]:= mal.multiplex("batcalc","+",b,c);
+x:bat[:oid,:lng]:= mal.multiplex("calc","+",b,c);
 t1:= alarm.usec();
 
 mdb.setDebug(dbgmsk_restore);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list