Changeset: 1800790ec412 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1800790ec412
Modified Files:
monetdb5/scheduler/Tests/8RunsJoinCorrectness.mal
monetdb5/scheduler/Tests/gmon.out
monetdb5/scheduler/mut_transforms.c
monetdb5/scheduler/run_multicore.c
monetdb5/scheduler/run_multicore.h
Branch: mutation
Log Message:
language.pass moved to first mat.pack generation
diffs (146 lines):
diff --git a/monetdb5/scheduler/Tests/8RunsJoinCorrectness.mal
b/monetdb5/scheduler/Tests/8RunsJoinCorrectness.mal
--- a/monetdb5/scheduler/Tests/8RunsJoinCorrectness.mal
+++ b/monetdb5/scheduler/Tests/8RunsJoinCorrectness.mal
@@ -7,7 +7,7 @@ function initializeFirst{unsafe}():bat[:
bat.append(b,l);
redo i:= iterator.next(1:lng,16:lng);
exit i;
-# io.print(b);
+ io.print(b);
return b;
end initializeFirst;
@@ -64,13 +64,13 @@ function testrun();
user.query(3,a,b);
user.query(4,a,b);
user.query(5,a,b);
-# user.query(6,a,b);
-# user.query(7,a,b);
-# user.query(8,a,b);
-# user.query(9,a,b);
-# user.query(10,a,b);
-# user.query(11,a,b);
-# user.query(12,a,b);
+ user.query(6,a,b);
+ user.query(7,a,b);
+ user.query(8,a,b);
+ user.query(9,a,b);
+ user.query(10,a,b);
+ user.query(11,a,b);
+ user.query(12,a,b);
# user.query(13,a,b);
# user.query(14,a,b);
# user.query(15,a,b);
diff --git a/monetdb5/scheduler/Tests/gmon.out
b/monetdb5/scheduler/Tests/gmon.out
index
e8b1c2fc265c97489a21fab607a19a2d7ec3f676..caeb680edb52c6bd07e4aea9dffc6f9ebf158aa5
GIT binary patch
literal 37378
zc%1Fhu}fP~6oB!k(5;0BrC8J<cFs^Wsp;ek1g8oabhA=0wTnsAm<}54t0IkCaC9gg
z9UV$_45SVY(%|A~gd&teajaYQonvzh_YZLRejv&HIQQk<i|_KqLYLPe7z(1#gYk6q
z*&6e_-1TSa?M$(dE8UKjI`;tp0000000000000000000000000000000000000000
z00000000000000000000006*!)#W9E=*z-zpyB#2=!o4nvE`gh%A)$H=gF@R8na2q
z<Yh`0KhIOqWZzBnrzQ4h?K3sjmgSkf(K9uk>SLnqVObW%lG$F<crlP_ztaD>XeMLt
zW%1|n%l2e_S>oT<X0oYq)Hla$Y0Nw`Kjf`ACbJsPmdrEvDmvL~emz)~IFc|oe;cpt
zeR^wpO9>NwjT6V_m0}uydp3p=AN(-!dFYsIew6t1#2$0qF*&~>ak6ZWx#5`fHzm%+
zO$;;+Ce8Lx<DGvnzv{TU+LpxairHTOCX1<Yv;EQ)WBU^GnY6jjhQwDd%zK6n$BAkh
y<FoeaT$90fiC3rgLJlQ<-7)cvMsMDn=*y8Tc0bum*7$kUY_DrPe`t=`bi{wvmZJp#
diff --git a/monetdb5/scheduler/mut_transforms.c
b/monetdb5/scheduler/mut_transforms.c
--- a/monetdb5/scheduler/mut_transforms.c
+++ b/monetdb5/scheduler/mut_transforms.c
@@ -68,10 +68,11 @@ mutationJoin(Client cntxt, Mutant m){
}
profiler = m->src->profiler[i].trace;
+
q= newStmt(m->src, batRef, partitionRef);
setVarType(m->src, getArg(q,0), getArgType(m->src, p,
p->retc));
b1 = getArg(q,0);
- q = pushArgument(m->src,q,getArg(p,2));
+ q = pushArgument(m->src,q,getArg(p,p->retc));
q = pushInt(m->src,q,2);
// update the stack as well, because we are executing
m->stk->stk[getArg(q, q->argc-1)].val.ival = 2;
@@ -83,7 +84,7 @@ mutationJoin(Client cntxt, Mutant m){
q= newStmt(m->src, batRef, partitionRef);
setVarType(m->src, getArg(q,0), getArgType(m->src, p,
p->retc));
b2 = getArg(q,0);
- q = pushArgument(m->src,q,getArg(p,2));
+ q = pushArgument(m->src,q,getArg(p,p->retc));
q = pushInt(m->src,q,2);
// update the stack as well, because we are executing
m->stk->stk[getArg(q, q->argc-1)].val.ival = 2;
@@ -108,11 +109,6 @@ mutationJoin(Client cntxt, Mutant m){
// inherit profiling
m->src->profiler[m->src->stop-1].trace = profiler;
- q= newStmt(m->src, languageRef, passRef);
- q = pushArgument(m->src,q, getArg(p,p->retc+1));
- // inherit profiling
- m->src->profiler[m->src->stop-1].trace = profiler;
-
// replace its use in other mat packs
for (j = i+1; j < limit; j++) {
q= old[j];
@@ -158,6 +154,11 @@ mutationJoin(Client cntxt, Mutant m){
q= pushArgument(m->src,q,z1);
q= pushArgument(m->src,q,z2);
m->src->profiler[m->src->stop-1].trace =
profiler;
+
+ q= newStmt(m->src, languageRef, passRef);
+ q = pushArgument(m->src,q, getArg(p,p->retc+1));
+ // inherit profiling
+ m->src->profiler[m->src->stop-1].trace =
profiler;
}
//pushInstruction(m->src,p);
diff --git a/monetdb5/scheduler/run_multicore.c
b/monetdb5/scheduler/run_multicore.c
--- a/monetdb5/scheduler/run_multicore.c
+++ b/monetdb5/scheduler/run_multicore.c
@@ -47,10 +47,6 @@ RUNmulticore(Client cntxt, MalBlkPtr mb,
str msg;
lng clk;
- // Mrunal added this
-// int i;
-// InstrPtr *old, q,t;
-
int *ret = (int*) getArgReference(stk,pci,0);
(void) cntxt;
@@ -90,23 +86,6 @@ RUNmulticore(Client cntxt, MalBlkPtr mb,
// update garbage collection admin
malGarbageCollector(mb);
- // temporary code
-/* old = mutant->src->stmt;
- for (i = getPC(mb,pci); i < mutant->src->stop; i++)
- {
- q = old[i];
-
- if ( getModuleId(q) == algebraRef && getFunctionId(q) ==
joinRef)
- {
- pushInstruction(mutant->src, q);
- t= newStmt(mutant->src, ioRef, printRef);
- t = pushArgument(mutant->src, t, getArg(q, q->retc));
- // inherit profiling
- //m->src->profiler[m->src->stop-1].trace = profiler;
- }
- }
-*/
-
clk = GDKusec();
msg = runMALdataflow(cntxt, mutant->src, getPC(mb,pci), mutant->stk);
mutant->src->calls++;
diff --git a/monetdb5/scheduler/run_multicore.h
b/monetdb5/scheduler/run_multicore.h
--- a/monetdb5/scheduler/run_multicore.h
+++ b/monetdb5/scheduler/run_multicore.h
@@ -48,7 +48,7 @@ typedef struct MUTANT{
int target; // operation changed from previous
struct MUTANT *next;
} *Mutant;
-#define DEBUG_MULTICORE if(0)
+#define DEBUG_MULTICORE if(1)
run_multicore_export str RUNmulticore(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr p);
run_multicore_export void multicorePrint(Client cntxt, Mutant m);
#endif /* MAL_RUN_MULTICORE */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
