Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9072/src/optimizer/Tests
Modified Files:
inline02.stable.out inline03.stable.out inline04.stable.out
inline06.stable.out partitions00.stable.out tst4601.stable.out
Log Message:
mal_resolve: cleaned up prepost macro
as bats could also be a constant we no longer handel the (incorrectly)
seperate
mal_*/opt_*: ATOMcmp should use GDK types (not mal types)
opt_deadcode: fixed leak
opt_macro/opt_remap: fixed the multiplex push down, ie we can now inline
multiplex calls
approved some output mostly because of the reintroduced nil values for
return values of inlined functions.
Index: inline02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline02.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline02.stable.out 5 Jan 2008 09:48:11 -0000 1.3
+++ inline02.stable.out 7 Jan 2008 21:44:45 -0000 1.4
@@ -50,13 +50,16 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ zz := nil:int;
_16 := calc.+(1,2);
zz := _16;
# base line test for inlining
- _20 := batcalc.+(b,b);
- z:bat[:oid,:int]{inline} := _20;
- _24 := batcalc.+(b,2);
- z:bat[:oid,:int]{inline} := _24;
+ z:bat[:oid,:int]{inline} := nil;
+ _21 := batcalc.+(b,b);
+ z:bat[:oid,:int]{inline} := _21;
+ z:bat[:oid,:int]{inline} := nil;
+ _26 := batcalc.+(b,2);
+ z:bat[:oid,:int]{inline} := _26;
end qry;
# 18:00:43 >
Index: tst4601.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4601.stable.out,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- tst4601.stable.out 5 Jan 2008 09:48:12 -0000 1.16
+++ tst4601.stable.out 7 Jan 2008 21:44:45 -0000 1.17
@@ -41,16 +41,17 @@
function user.main():void; # 0 (main:void)
# the first test for macro expansions and inversions # 1 (_1:str)
io.print("test expansion"); # 2 IOprint_val (_5:void)<-(_6:str)
- _13 := 0; # 3 (_13:int)<-(_14:int)
-barrier _15 := calc.<(_13,2); # 4 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 8
- io.print("Welcome"); # 5 IOprint_val (_16:void)<-(_17:str)
- _13 := calc.+(_13,1); # 6 CALCbinaryADDintint
(_13:int)<-(_13:int)(_18:int)
- redo _15 := calc.<(_13,2); # 7 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 5
-exit _15; # 8 (_15:bit)
- a := _13; # 9 (a:int)<-(_13:int)
- io.print(a); # 10 IOprint_val (_9:void)<-(a:int)
- mdb.list(); # 11 MDBlist (_10:void)
-end main; # 12
+ a := nil:int; # 3 (a:int)<-(_19:int)
+ _13 := 0; # 4 (_13:int)<-(_14:int)
+barrier _15 := calc.<(_13,2); # 5 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 9
+ io.print("Welcome"); # 6 IOprint_val (_16:void)<-(_17:str)
+ _13 := calc.+(_13,1); # 7 CALCbinaryADDintint
(_13:int)<-(_13:int)(_18:int)
+ redo _15 := calc.<(_13,2); # 8 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 6
+exit _15; # 9 (_15:bit)
+ a := _13; # 10 (a:int)<-(_13:int)
+ io.print(a); # 11 IOprint_val (_9:void)<-(a:int)
+ mdb.list(); # 12 MDBlist (_10:void)
+end main; # 13
[ "test expansion" ]
[ "Welcome" ]
[ "Welcome" ]
@@ -58,6 +59,7 @@
function user.main():void;
# the first test for macro expansions and inversions
io.print("test expansion");
+ a := nil:int;
_13 := 0;
barrier _15 := calc.<(_13,2);
io.print("Welcome");
Index: partitions00.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions00.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- partitions00.stable.out 2 Jan 2008 08:23:23 -0000 1.8
+++ partitions00.stable.out 7 Jan 2008 21:44:45 -0000 1.9
@@ -64,17 +64,17 @@
bpm.addPartition(_28,t12);
redo t11 := bpm.hasMoreElements(_20);
exit t11;
- _35 := bpm.new(:oid,:int);
+ _36 := bpm.new(:oid,:int);
t13 := nil;
barrier t12 := bpm.newIterator(_28);
barrier t1:bat[:oid,:int] := bpm.newIterator(bpm1);
t13 := algebra.join(t12,t1);
- bpm.addPartition(_35,t13);
+ bpm.addPartition(_36,t13);
redo t1:bat[:oid,:int] := bpm.hasMoreElements(bpm1);
redo t12 := bpm.hasMoreElements(_28);
exit t1:bat[:oid,:int] ;
exit t12;
- t13 := bpm.fold(_35);
+ t13 := bpm.fold(_36);
t14 := sql.resultSet(1,1,t13);
sql.rsColumn(t14,"sys.t","i","int",32,0,t13);
sql.exportResult(t14,"");
Index: inline04.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline04.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline04.stable.out 5 Jan 2008 09:48:12 -0000 1.3
+++ inline04.stable.out 7 Jan 2008 21:44:45 -0000 1.4
@@ -62,6 +62,7 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := batcalc.+(b,b);
_15 := 1;
barrier _16 := true;
@@ -70,14 +71,15 @@
redo _16 := calc.<(_15,3);
exit _16;
z:bat[:oid,:int]{inline} := _14;
- _22 := batcalc.+(b,2);
- _23 := 1;
-barrier _24 := true;
- _22 := batcalc.*(_22,_22);
- _23 := calc.+(_23,1);
- redo _24 := calc.<(_23,3);
-exit _24;
- z:bat[:oid,:int]{inline} := _22;
+ z:bat[:oid,:int]{inline} := nil;
+ _23 := batcalc.+(b,2);
+ _24 := 1;
+barrier _25 := true;
+ _23 := batcalc.*(_23,_23);
+ _24 := calc.+(_24,1);
+ redo _25 := calc.<(_24,3);
+exit _25;
+ z:bat[:oid,:int]{inline} := _23;
end qry;
# 18:00:43 >
Index: inline06.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline06.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline06.stable.out 5 Jan 2008 09:48:12 -0000 1.3
+++ inline06.stable.out 7 Jan 2008 21:44:45 -0000 1.4
@@ -52,16 +52,18 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := batcalc.+(b,b);
_15 := mmath.rand();
# this has a memory-side effect
_14 := batcalc.*(_14,_15);
z:bat[:oid,:int]{inline} := _14;
- _20 := batcalc.+(b,2);
- _21 := mmath.rand();
+ z:bat[:oid,:int]{inline} := nil;
+ _21 := batcalc.+(b,2);
+ _22 := mmath.rand();
#
- _20 := batcalc.*(_20,_21);
- z:bat[:oid,:int]{inline} := _20;
+ _21 := batcalc.*(_21,_22);
+ z:bat[:oid,:int]{inline} := _21;
end qry;
# 18:00:44 >
Index: inline03.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline03.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline03.stable.out 5 Jan 2008 09:48:11 -0000 1.3
+++ inline03.stable.out 7 Jan 2008 21:44:45 -0000 1.4
@@ -50,14 +50,16 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := 1;
_15 := batcalc.+(b,b);
_15 := batcalc.*(_15,_14);
z:bat[:oid,:int]{inline} := _15;
- _19 := 1;
- _20 := batcalc.+(b,2);
- _20 := batcalc.*(_20,_19);
- z:bat[:oid,:int]{inline} := _20;
+ z:bat[:oid,:int]{inline} := nil;
+ _20 := 1;
+ _21 := batcalc.+(b,2);
+ _21 := batcalc.*(_21,_20);
+ z:bat[:oid,:int]{inline} := _21;
end qry;
# 18:00:43 >
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
