http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/codegen/wdivmmbasic.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/codegen/wdivmmbasic.dml 
b/src/test/scripts/functions/codegen/wdivmmbasic.dml
index dc74699..4c2365b 100644
--- a/src/test/scripts/functions/codegen/wdivmmbasic.dml
+++ b/src/test/scripts/functions/codegen/wdivmmbasic.dml
@@ -23,7 +23,7 @@ X = matrix( 3, rows=1000, cols=1500)
 U = matrix( 4, rows=1000, cols=10)
 V = matrix( 5, rows=1500, cols=10)
 
-if(1==1){}
+while(FALSE){}
 
 eps = 0.1
 S= X/((U%*%t(V))+eps);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/codegen/wsigmoid.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/codegen/wsigmoid.dml 
b/src/test/scripts/functions/codegen/wsigmoid.dml
index 3841c3b..a0a247e 100644
--- a/src/test/scripts/functions/codegen/wsigmoid.dml
+++ b/src/test/scripts/functions/codegen/wsigmoid.dml
@@ -23,7 +23,7 @@ X = matrix( 3, rows=1000, cols=2000)
 U = matrix( 4, rows=1000, cols=10)
 V = matrix( 5, rows=2000, cols=10)
 
-if(1==1){}
+while(FALSE){}
 
 eps = 0.1
 S= X*(1/(1+exp(-(U%*%t(V)))));

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/frame/FrameFunction.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/frame/FrameFunction.dml 
b/src/test/scripts/functions/frame/FrameFunction.dml
index 591e63b..843ef7c 100644
--- a/src/test/scripts/functions/frame/FrameFunction.dml
+++ b/src/test/scripts/functions/frame/FrameFunction.dml
@@ -23,7 +23,7 @@ foo = function(Frame[String] F, String jspec)
   return (Matrix[Double] RX, Frame[String] RM) 
 {
   #prevent function inlining
-  if( 1==1 ){}
+  while(FALSE){}
 
   [RX, RM] = transformencode(target=F, spec=jspec);
 }

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/frame/FrameMetaReadWrite.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/frame/FrameMetaReadWrite.dml 
b/src/test/scripts/functions/frame/FrameMetaReadWrite.dml
index 8c4130d..6c1dc5f 100644
--- a/src/test/scripts/functions/frame/FrameMetaReadWrite.dml
+++ b/src/test/scripts/functions/frame/FrameMetaReadWrite.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 A = read($1, data_type="frame", rows=$2, cols=$3, format=$4);
-if(1==1){}
+while(FALSE){}
 
 B = A;
 write(B, $5, format=$4);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/frame/FrameSchemaRead1.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/frame/FrameSchemaRead1.dml 
b/src/test/scripts/functions/frame/FrameSchemaRead1.dml
index be96621..e7b126f 100644
--- a/src/test/scripts/functions/frame/FrameSchemaRead1.dml
+++ b/src/test/scripts/functions/frame/FrameSchemaRead1.dml
@@ -21,7 +21,7 @@
 
 
 A = read($1, data_type="frame", schema=$2, rows=$3, cols=$4, format="csv");
-if(1==1){}
+while(FALSE){}
 
 B = A;
 write(B, $5, format="binary");

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/frame/FrameSchemaRead2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/frame/FrameSchemaRead2.dml 
b/src/test/scripts/functions/frame/FrameSchemaRead2.dml
index 88766c9..6b34c18 100644
--- a/src/test/scripts/functions/frame/FrameSchemaRead2.dml
+++ b/src/test/scripts/functions/frame/FrameSchemaRead2.dml
@@ -21,7 +21,7 @@
 
 
 A = read($1, data_type="frame", rows=$3, cols=$4, format="csv");
-if(1==1){}
+while(FALSE){}
 
 B = A;
 write(B, $5, format="binary");       

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/indexing/RowBatchIndexingTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/indexing/RowBatchIndexingTest.dml 
b/src/test/scripts/functions/indexing/RowBatchIndexingTest.dml
index 164de84..4fbfa58 100644
--- a/src/test/scripts/functions/indexing/RowBatchIndexingTest.dml
+++ b/src/test/scripts/functions/indexing/RowBatchIndexingTest.dml
@@ -24,7 +24,7 @@ A = read($1)
 s = 0;
 for( i in 1:nrow(A)/500 ) {
   Xi = A[((i-1)*500+1):(i*500),]
-  if(1==1){}
+  while(FALSE){}
   s = s + sum(Xi);
 }
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation1.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation1.dml
 
b/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation1.dml
index 17f4bb3..2f7df82 100644
--- 
a/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation1.dml
+++ 
b/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation1.dml
@@ -50,7 +50,7 @@ dWc1_agg = matrix(0, rows=num_batches, 
cols=nrow(Wc1)*ncol(Wc1))
 # Imagine that a loop over mini-batches would go here, but for this test, we 
will
 # hardcode to the first iteration.
 j = 1
-if (1==1) {print("HI")}  # cut DAG!
+while(FALSE){}  # cut DAG!
 
 # Get a mini-batch in this group
 beg = ((j-1) * batch_size) + 1
@@ -83,5 +83,5 @@ doutc1_agg[j,] = matrix(doutc1, rows=1, 
cols=batch_size*F1*Hin*Win)
 dWc1_agg[j,] = matrix(dWc1, rows=1, cols=nrow(Wc1)*ncol(Wc1))
 
 # Print outputs to force execution
-if (1==1) {print("HI")}  # cut DAG!
+while(FALSE){} # cut DAG!
 print(sum(doutc1_agg) + " " + sum(dWc1_agg))

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation2.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation2.dml
 
b/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation2.dml
index 0e29a7a..ec1a7fc 100644
--- 
a/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation2.dml
+++ 
b/src/test/scripts/functions/misc/IPAConstantFoldingScalarVariablePropagation2.dml
@@ -51,7 +51,7 @@ dWc1_agg = matrix(0, rows=num_batches, 
cols=nrow(Wc1)*ncol(Wc1))
 # Imagine that a loop over mini-batches would go here, but for this test, we 
will
 # hardcode to the first iteration.
 j = 1
-if (1==1) {print("HI")}  # cut DAG!
+while(FALSE){}  # cut DAG!
 
 # Get a mini-batch in this group
 beg = ((j-1) * batch_size) + 1
@@ -86,5 +86,5 @@ doutc1_agg[j,] = matrix(doutc1, rows=1, 
cols=batch_size*F1*Hin*Win)
 dWc1_agg[j,] = matrix(dWc1, rows=1, cols=nrow(Wc1)*ncol(Wc1))
 
 # Print outputs to force execution
-if (1==1) {print("HI")}  # cut DAG!
+while(FALSE){}  # cut DAG!
 print(sum(doutc1_agg) + " " + sum(dWc1_agg))

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/IPANnzPropagation1.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/IPANnzPropagation1.dml 
b/src/test/scripts/functions/misc/IPANnzPropagation1.dml
index 919dc32..711302a 100644
--- a/src/test/scripts/functions/misc/IPANnzPropagation1.dml
+++ b/src/test/scripts/functions/misc/IPANnzPropagation1.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 foo = function(matrix[double] X) return (double sum) {
-    if( 1==1 ) {}
+    while(FALSE){}
     sum = sum(X);
 }
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/IPANnzPropagation2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/IPANnzPropagation2.dml 
b/src/test/scripts/functions/misc/IPANnzPropagation2.dml
index 86990ca..de0a1df 100644
--- a/src/test/scripts/functions/misc/IPANnzPropagation2.dml
+++ b/src/test/scripts/functions/misc/IPANnzPropagation2.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 foo = function(matrix[double] X) return (double sum) {
-    if( 1==1 ) {}
+    while(FALSE){}
     sum = sum(X);
 }
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/ReadAfterWriteMatrix2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/ReadAfterWriteMatrix2.dml 
b/src/test/scripts/functions/misc/ReadAfterWriteMatrix2.dml
index bfbb81d..2ffa496 100644
--- a/src/test/scripts/functions/misc/ReadAfterWriteMatrix2.dml
+++ b/src/test/scripts/functions/misc/ReadAfterWriteMatrix2.dml
@@ -23,7 +23,7 @@
 A = rand(rows=10, cols=10);
 write(A, $1);
 
-if(1==1){}
+while(FALSE){}
 
 B = read($2);
 print(sum(B));

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/ReadAfterWriteScalar2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/ReadAfterWriteScalar2.dml 
b/src/test/scripts/functions/misc/ReadAfterWriteScalar2.dml
index 43ff306..05a4158 100644
--- a/src/test/scripts/functions/misc/ReadAfterWriteScalar2.dml
+++ b/src/test/scripts/functions/misc/ReadAfterWriteScalar2.dml
@@ -23,7 +23,7 @@
 A = 7;
 write(A, $1);
 
-if(1==1){}
+while(FALSE){}
 
 B = read($2);
 print(B);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteCSETransposeScalarMult.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteCSETransposeScalarMult.dml 
b/src/test/scripts/functions/misc/RewriteCSETransposeScalarMult.dml
index 07e67dc..0a7dcf6 100644
--- a/src/test/scripts/functions/misc/RewriteCSETransposeScalarMult.dml
+++ b/src/test/scripts/functions/misc/RewriteCSETransposeScalarMult.dml
@@ -20,12 +20,12 @@
 #-------------------------------------------------------------
 
 X = rand(rows=$1, cols=$2, min=1, max=10);
-if(1==1){}
+while(FALSE){}
 
 a = t(X);
 b = t(2*X);
 
-if(1==1){}
+while(FALSE){}
 
 R = sum(2*a == b);
 write(R, $3);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteCSETransposeScalarPow.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteCSETransposeScalarPow.dml 
b/src/test/scripts/functions/misc/RewriteCSETransposeScalarPow.dml
index f47c227..bf8f7ea 100644
--- a/src/test/scripts/functions/misc/RewriteCSETransposeScalarPow.dml
+++ b/src/test/scripts/functions/misc/RewriteCSETransposeScalarPow.dml
@@ -20,12 +20,12 @@
 #-------------------------------------------------------------
 
 X = rand(rows=$1, cols=$2, min=1, max=10);
-if(1==1){}
+while(FALSE){}
 
 a = t(X);
 b = t(X^2);
 
-if(1==1){}
+while(FALSE){}
 
 R = sum(a^2 == b);
 write(R, $3);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest1.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest1.dml 
b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest1.dml
index 077b8a9..dbac1a1 100644
--- a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest1.dml
+++ b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest1.dml
@@ -21,7 +21,7 @@
 
 X=matrix(1,rows=10,cols=10)
 Y=matrix(1,rows=10,cols=10)
-if(1==1){}
+while(FALSE){}
 lamda=7
 S=X+lamda*Y
 write(S,$1)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest2.dml 
b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest2.dml
index f3c6b9a..bae013a 100644
--- a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest2.dml
+++ b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest2.dml
@@ -21,7 +21,7 @@
 
 X=matrix(1,rows=10,cols=10)
 Y=matrix(1,rows=10,cols=10)
-if(1==1){}
+while(FALSE){}
 lamda=7
 S=X-lamda*Y
 write(S,$1)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest3.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest3.dml 
b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest3.dml
index af84884..a80669c 100644
--- a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest3.dml
+++ b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest3.dml
@@ -21,7 +21,7 @@
 
 X=matrix(1,rows=10,cols=10)
 Y=matrix(1,rows=10,cols=10)
-if(1==1){}
+while(FALSE){}
 lamda=7
 S=lamda*Y+X
 write(S,$1)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest4.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest4.dml 
b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest4.dml
index 0599f02..85c023d 100644
--- a/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest4.dml
+++ b/src/test/scripts/functions/misc/RewriteFuseBinaryOpChainTest4.dml
@@ -22,7 +22,7 @@
 X = matrix(1, 10, 1);
 Y = matrix(2, 1, 10);
 lambda = 7;
-if(1==1){}
+while(FALSE){}
 
 S = outer(X, lambda*Y, "+");
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteFusedRand.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteFusedRand.dml 
b/src/test/scripts/functions/misc/RewriteFusedRand.dml
index 6e2cb58..ab00f04 100644
--- a/src/test/scripts/functions/misc/RewriteFusedRand.dml
+++ b/src/test/scripts/functions/misc/RewriteFusedRand.dml
@@ -21,7 +21,7 @@
 
 X1 = rand(rows=$1, cols=$2, pdf=$3, seed=$4) * 7;
 
-if(1==1){} #prevent cse
+while(FALSE){} #prevent cse
 
 X2 = rand(rows=$1, cols=$2, pdf=$3, seed=$4) * 7;
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteMergeFunctionCut.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteMergeFunctionCut.R 
b/src/test/scripts/functions/misc/RewriteMergeFunctionCut.R
new file mode 100644
index 0000000..5c3d7ce
--- /dev/null
+++ b/src/test/scripts/functions/misc/RewriteMergeFunctionCut.R
@@ -0,0 +1,36 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+
+args <- commandArgs(TRUE)
+options(digits=22)
+library("Matrix")
+library("matrixStats")
+
+X = matrix(0.5, 600, 10);
+ssX_V = matrix(0.9, 10, 1);
+P = matrix(0.7, 600, 2);
+
+Q = P[,1:1] * (X %*% ssX_V);
+Y = X;
+R = t(X) %*% (Q - P[,1:1] * rowSums(Q));
+
+writeMM(as(R, "CsparseMatrix"), paste(args[1], "R", sep="")); 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteMergeFunctionCut.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteMergeFunctionCut.dml 
b/src/test/scripts/functions/misc/RewriteMergeFunctionCut.dml
new file mode 100644
index 0000000..9e247a9
--- /dev/null
+++ b/src/test/scripts/functions/misc/RewriteMergeFunctionCut.dml
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+printAndAssign = function(Matrix[Double] X) return (Matrix[Double] Y) {
+       if( sum(X) > 0 )
+     print("sum(X) = " + sum(X));
+  Y = X;
+}
+
+
+X = matrix(0.5, 600, 10);
+ssX_V = matrix(0.9, 10, 1);
+P = matrix(0.7, 600, 2);
+
+Q = P[,1:1] * (X %*% ssX_V);
+Y = X + 2;
+Y = printAndAssign(X);
+R = t(X) %*% (Q - P[,1:1] * rowSums(Q));
+
+write(R, $1);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteMergeIfCut.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteMergeIfCut.R 
b/src/test/scripts/functions/misc/RewriteMergeIfCut.R
new file mode 100644
index 0000000..a034ef1
--- /dev/null
+++ b/src/test/scripts/functions/misc/RewriteMergeIfCut.R
@@ -0,0 +1,35 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+
+args <- commandArgs(TRUE)
+options(digits=22)
+library("Matrix")
+library("matrixStats")
+
+X = matrix(0.5, 600, 10);
+ssX_V = matrix(0.9, 10, 1);
+P = matrix(0.7, 600, 2);
+
+Q = P[,1:1] * (X %*% ssX_V);
+R = t(X) %*% (Q - P[,1:1] * rowSums(Q));
+
+writeMM(as(R, "CsparseMatrix"), paste(args[1], "R", sep="")); 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewriteMergeIfCut.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewriteMergeIfCut.dml 
b/src/test/scripts/functions/misc/RewriteMergeIfCut.dml
new file mode 100644
index 0000000..cde0edf
--- /dev/null
+++ b/src/test/scripts/functions/misc/RewriteMergeIfCut.dml
@@ -0,0 +1,31 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+
+X = matrix(0.5, 600, 10);
+ssX_V = matrix(0.9, 10, 1);
+P = matrix(0.7, 600, 2);
+
+Q = P[,1:1] * (X %*% ssX_V);
+if(1==1){}
+R = t(X) %*% (Q - P[,1:1] * rowSums(Q));
+
+write(R, $1);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult.dml 
b/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult.dml
index 9850242..9b7f6ce 100644
--- a/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult.dml
+++ b/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 X=matrix(1,10,10)
-if(1==1){}
+while(FALSE){}
 lamda=sum(X)
 y=sum(lamda*X)
 write(y, $1)

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult2.dml 
b/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult2.dml
index 07e0e54..c200dd0 100644
--- a/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult2.dml
+++ b/src/test/scripts/functions/misc/RewritePushdownSumBinaryMult2.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 X=matrix(1,10,10)
-if(1==1){}
+while(FALSE){}
 lamda=sum(X)
 y=sum(X*lamda)
 write(y, $1)

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/dt_change_4c.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/dt_change_4c.dml 
b/src/test/scripts/functions/misc/dt_change_4c.dml
index 3cf60fa..988fab3 100644
--- a/src/test/scripts/functions/misc/dt_change_4c.dml
+++ b/src/test/scripts/functions/misc/dt_change_4c.dml
@@ -22,7 +22,7 @@
 
 foo = function(Matrix[Double] input) return (Double out) 
 {
-   if( 1==1 ){} #prevent inlining
+   while(FALSE){} #prevent inlining
   
    out = as.scalar(input[1,1]);
 }

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/dt_change_4d.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/dt_change_4d.dml 
b/src/test/scripts/functions/misc/dt_change_4d.dml
index e04683d..13d8519 100644
--- a/src/test/scripts/functions/misc/dt_change_4d.dml
+++ b/src/test/scripts/functions/misc/dt_change_4d.dml
@@ -22,7 +22,7 @@
 
 foo = function(Integer input) return (Matrix[Double] out) 
 {
-   if( 1==1 ){} #prevent inlining
+   while(FALSE){} #prevent inlining
    out = matrix(1, rows=10, cols=10);
    out = out*input;
    #out = matrix(input, rows=10, cols=10); unsupported expression in rand

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/dt_change_4e.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/dt_change_4e.dml 
b/src/test/scripts/functions/misc/dt_change_4e.dml
index 413bc12..f6947d8 100644
--- a/src/test/scripts/functions/misc/dt_change_4e.dml
+++ b/src/test/scripts/functions/misc/dt_change_4e.dml
@@ -22,7 +22,7 @@
 
 Y = matrix(1, rows=10, cols=10);
 X = matrix(7, rows=10, cols=10);
-if(1==1){}
+while(FALSE){}
 X = 7;
 
 print("Result: "+sum(X + Y));

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/dt_change_4f.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/dt_change_4f.dml 
b/src/test/scripts/functions/misc/dt_change_4f.dml
index 1050a2c..0fb23aa 100644
--- a/src/test/scripts/functions/misc/dt_change_4f.dml
+++ b/src/test/scripts/functions/misc/dt_change_4f.dml
@@ -22,7 +22,7 @@
 
 Y = matrix(1, rows=10, cols=10);
 X = matrix(7, rows=10, cols=10);
-if(1==1){}
+while(FALSE){}
 X = as.scalar(X[1,1]);
 
 print("Result: "+sum(X + Y));

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/misc/functionNoInlining.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/misc/functionNoInlining.dml 
b/src/test/scripts/functions/misc/functionNoInlining.dml
index cdcc67b..14e83b8 100644
--- a/src/test/scripts/functions/misc/functionNoInlining.dml
+++ b/src/test/scripts/functions/misc/functionNoInlining.dml
@@ -22,16 +22,14 @@
 
 foo = function(Double input) return (Double out)
 {
-   if( 1==1 ){ #prevent inlining
-      out = input + input;
-   }
+   while(FALSE){} #prevent inlining
+   out = input + input;
 }
 
 foo2 = function(Integer input) return (Double out)
 { 
-   if( 1==1 ){ #prevent inlining
-      out = input + input;
-   }
+   while(FALSE){} #prevent inlining
+   out = input + input;
 }
 
 x = $1;

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/parfor/parfor49b.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/parfor/parfor49b.dml 
b/src/test/scripts/functions/parfor/parfor49b.dml
index 4035d9a..f67daec 100644
--- a/src/test/scripts/functions/parfor/parfor49b.dml
+++ b/src/test/scripts/functions/parfor/parfor49b.dml
@@ -22,7 +22,7 @@
 
 foo = function (Integer inval) return (Matrix[Double] out)
 {   
-   if( 1==1 ) {} #prevent inlining
+   while(FALSE){} #prevent inlining
    
    A = matrix( 1, rows=10, cols=10 );
    out = A

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml 
b/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml
index 2c6e1c9..c3bba05 100644
--- a/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml
+++ b/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml
@@ -29,7 +29,7 @@ R = matrix(0,rows=m,cols=n);
 parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, opt=NONE )
 {
    col = V[,i];
-   if(1==1){}
+   while(FALSE){}
    R[,i] = col; 
 }   
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/parfor/parfor_rdatapartition_leftindexing.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/parfor/parfor_rdatapartition_leftindexing.dml 
b/src/test/scripts/functions/parfor/parfor_rdatapartition_leftindexing.dml
index b3fed2d..f771372 100644
--- a/src/test/scripts/functions/parfor/parfor_rdatapartition_leftindexing.dml
+++ b/src/test/scripts/functions/parfor/parfor_rdatapartition_leftindexing.dml
@@ -30,7 +30,7 @@ R = matrix(0,rows=m,cols=n);
 parfor( i in 1:m )
 {
    col = V[i,];
-   if(1==1){}
+   while(FALSE){}
    R[i,] = col; 
 }   
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusLeft.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusLeft.dml 
b/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusLeft.dml
index 87c035f..462e000 100644
--- a/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusLeft.dml
+++ b/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusLeft.dml
@@ -26,7 +26,7 @@ U = read($2);
 V = read($3);
 
 X = W/0.7;
-if(1==1){}
+while(FALSE){}
 R = t(t(U) %*% (W*(U%*%t(V)-X)));
 
 write(R, $4);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusRight.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusRight.dml 
b/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusRight.dml
index 7376abd..0f7652c 100644
--- a/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusRight.dml
+++ b/src/test/scripts/functions/quaternary/WeightedDivMM4MultMinusRight.dml
@@ -26,7 +26,7 @@ U = read($2);
 V = read($3);
 
 X = W/0.3
-if(1==1){}
+while(FALSE){}
 R = (W*(U%*%t(V)-X)) %*% V;
 
 write(R, $4);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/append_nnz.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/append_nnz.dml 
b/src/test/scripts/functions/recompile/append_nnz.dml
index 04cdf5d..4c10fcb 100644
--- a/src/test/scripts/functions/recompile/append_nnz.dml
+++ b/src/test/scripts/functions/recompile/append_nnz.dml
@@ -32,12 +32,13 @@ zero_cell = matrix (0, rows = 1, cols = 1);
 
 shift_X_cols = matrix (0, rows = 1, cols = m);
 
+while(FALSE){}
 if (intercept_status == 2) {
     X = (X + ones_n %*% shift_X_cols);
 }
 
 X = cbind (X, ones_n);
 
-if(1==1){ }
+while(FALSE){}
 
 print("sum="+sum(X)) 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/constant_propagation_if.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/constant_propagation_if.R 
b/src/test/scripts/functions/recompile/constant_propagation_if.R
index 1b86630..deb92e5 100644
--- a/src/test/scripts/functions/recompile/constant_propagation_if.R
+++ b/src/test/scripts/functions/recompile/constant_propagation_if.R
@@ -27,12 +27,8 @@ library("Matrix")
 
 numrows = as.integer(args[1]);
 numcols = as.integer(args[2]);
-
-if( 1==1 )
-{
-   numrows = numrows + 1;
-   numcols = numcols + 2;
-}  
+numrows = numrows + 1;
+numcols = numcols + 2;
 
 X = matrix(1, numrows, numcols);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/constant_propagation_sb.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/constant_propagation_sb.R 
b/src/test/scripts/functions/recompile/constant_propagation_sb.R
index cfa6a00..f9c033f 100644
--- a/src/test/scripts/functions/recompile/constant_propagation_sb.R
+++ b/src/test/scripts/functions/recompile/constant_propagation_sb.R
@@ -28,18 +28,9 @@ library("Matrix")
 numrows = as.integer(args[1]);
 numcols = as.integer(args[2]);
 
-if( 1==1 ){}
-
 numrows2 = numrows;
 numcols2 = numcols;
 
-if( 1!=1 )
-{
-   numrows2 = numrows + 1;
-   numcols2 = numcols + 2;
-}  
-
-
 X = matrix(1, numrows2, numcols2);
 
 writeMM(as(X, "CsparseMatrix"), paste(args[3], "X", sep="")); 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/if_recompile_sparse.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/if_recompile_sparse.dml 
b/src/test/scripts/functions/recompile/if_recompile_sparse.dml
index 9b878cc..25bbd1a 100644
--- a/src/test/scripts/functions/recompile/if_recompile_sparse.dml
+++ b/src/test/scripts/functions/recompile/if_recompile_sparse.dml
@@ -21,15 +21,18 @@
 
 
 V = read($1);
-print(sum(V)); 
+print(sum(V));
+while(FALSE){}
 if( 1==1 ){
    V[1,1] = $2;
 }
 else {
    print(sum(V));
 }
+while(FALSE){}
 if( 1==1 ){
    print(sum(V));
 }
+while(FALSE){}
 
 write(V, $3);         
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/multiple_reads.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/multiple_reads.R 
b/src/test/scripts/functions/recompile/multiple_reads.R
index 9f86072..fa801c1 100644
--- a/src/test/scripts/functions/recompile/multiple_reads.R
+++ b/src/test/scripts/functions/recompile/multiple_reads.R
@@ -25,11 +25,6 @@ options(digits=22)
 
 library("Matrix")
 
-X <- readMM(paste(args[1], "X1.mtx", sep=""))
+X <- readMM(paste(args[1], "X2.mtx", sep=""))
 
-if( 1==1 )
-{
-   X <- readMM(paste(args[1], "X2.mtx", sep=""))
-}
-
-writeMM(as(X, "CsparseMatrix"), paste(args[2], "X", sep="")); 
\ No newline at end of file
+writeMM(as(X, "CsparseMatrix"), paste(args[2], "X", sep=""));

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/remove_empty_potpourri2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/remove_empty_potpourri2.dml 
b/src/test/scripts/functions/recompile/remove_empty_potpourri2.dml
index 70027dd..75eb2a0 100644
--- a/src/test/scripts/functions/recompile/remove_empty_potpourri2.dml
+++ b/src/test/scripts/functions/recompile/remove_empty_potpourri2.dml
@@ -24,6 +24,6 @@ A = matrix(0, rows=100,cols=1);
 R = colSums(A)
 
 #force original error on cpvar
-if(1==1){} 
+while(FALSE){} 
 
 write(R, $1);       
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/remove_empty_potpourri3.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/remove_empty_potpourri3.dml 
b/src/test/scripts/functions/recompile/remove_empty_potpourri3.dml
index a29acd6..7444f9c 100644
--- a/src/test/scripts/functions/recompile/remove_empty_potpourri3.dml
+++ b/src/test/scripts/functions/recompile/remove_empty_potpourri3.dml
@@ -21,7 +21,7 @@
 
 
 S = matrix(1,rows=100,cols=1);
-if(1==1){}
+while(FALSE){}
 
 A = diag(S);
 A = removeEmpty (target = A, margin = "rows");
@@ -30,7 +30,7 @@ C = table (B, seq (1, nrow(A), 1));
 R = removeEmpty (target = C, margin = "rows");
 R = R %*% A;
 
-if(1==1){} 
+while(FALSE){} 
 
 print(sum(R));
 write(R, $1);       
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/remove_empty_potpourri4.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/remove_empty_potpourri4.dml 
b/src/test/scripts/functions/recompile/remove_empty_potpourri4.dml
index 5158a38..1b15fef 100644
--- a/src/test/scripts/functions/recompile/remove_empty_potpourri4.dml
+++ b/src/test/scripts/functions/recompile/remove_empty_potpourri4.dml
@@ -25,7 +25,7 @@ B = matrix(1, rows=1000, cols=2);
 C = matrix(7, rows=1000, cols=1);
 D = matrix(3, rows=1000, cols=1);
 
-if(1==1){}
+while(FALSE){}
 
 tmp = cbind(X [, 1 : 2], B) * (C * (1 - D));
 E = removeEmpty (target = tmp, margin = "rows");
@@ -33,7 +33,7 @@ E = removeEmpty (target = tmp, margin = "rows");
 X = removeEmpty (target = X * C, margin = "rows");
 n = nrow (X);
 
-if(1==1){} 
+while(FALSE){} 
 
 R = X + sum(E) + n;
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/rewrite_mapmultchain1.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/rewrite_mapmultchain1.dml 
b/src/test/scripts/functions/recompile/rewrite_mapmultchain1.dml
index ab4eef2..0d93799 100644
--- a/src/test/scripts/functions/recompile/rewrite_mapmultchain1.dml
+++ b/src/test/scripts/functions/recompile/rewrite_mapmultchain1.dml
@@ -25,11 +25,11 @@ P = read($2);
 v = read($3);
 k = ncol(P);
 
-if(1==1){}
+while(FALSE){}
 
 Q = P * (X %*% v);
 HV = t(X) %*% (Q - P * (rowSums (Q) %*% matrix(1, rows=1, cols=k)));
 
-if(1==1){}
+while(FALSE){}
 
 write(HV, $4);       

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/recompile/rewrite_mapmultchain2.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/recompile/rewrite_mapmultchain2.dml 
b/src/test/scripts/functions/recompile/rewrite_mapmultchain2.dml
index fa4db5f..bd62140 100644
--- a/src/test/scripts/functions/recompile/rewrite_mapmultchain2.dml
+++ b/src/test/scripts/functions/recompile/rewrite_mapmultchain2.dml
@@ -25,11 +25,11 @@ P = read($2);
 v = read($3);
 k = ncol(P);
 
-if(1==1){}
+while(FALSE){}
 
 Q = P[, 1:k] * (X %*% v);
 HV = t(X) %*% (Q - P[, 1:k] * (rowSums (Q) %*% matrix(1, rows=1, cols=k)));
         
-if(1==1){}
+while(FALSE){}
 
 write(HV, $4);       

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/reorg/Order.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/reorg/Order.dml 
b/src/test/scripts/functions/reorg/Order.dml
index 3ac2fce..a3fb3bd 100644
--- a/src/test/scripts/functions/reorg/Order.dml
+++ b/src/test/scripts/functions/reorg/Order.dml
@@ -22,7 +22,7 @@
 
 A = read($1);
 
-if(1==1){} #for recompilation rewrites
+while(FALSE){} #for recompilation rewrites
 
 B = order(target=A, by=$2, decreasing=$3, index.return=$4);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/reorg/OrderDyn.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/reorg/OrderDyn.dml 
b/src/test/scripts/functions/reorg/OrderDyn.dml
index 35f4d0a..63b0a96 100644
--- a/src/test/scripts/functions/reorg/OrderDyn.dml
+++ b/src/test/scripts/functions/reorg/OrderDyn.dml
@@ -22,7 +22,7 @@
 
 A = read($1);
 
-if(1==1){} #for recompilation rewrites
+while(FALSE){} #for recompilation rewrites
 
 desc = (sum(A)>100)
 ixret = (sum(A)>200)

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/AAATernaryAggregateC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/AAATernaryAggregateC.dml 
b/src/test/scripts/functions/ternary/AAATernaryAggregateC.dml
index b576a4d..cd2695a 100644
--- a/src/test/scripts/functions/ternary/AAATernaryAggregateC.dml
+++ b/src/test/scripts/functions/ternary/AAATernaryAggregateC.dml
@@ -21,7 +21,7 @@
 
 A = read($1);
 
-if(1==1){}
+while(FALSE){}
 
 R = colSums(A * A * A);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/AAATernaryAggregateRC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/AAATernaryAggregateRC.dml 
b/src/test/scripts/functions/ternary/AAATernaryAggregateRC.dml
index 7283703..527cbb1 100644
--- a/src/test/scripts/functions/ternary/AAATernaryAggregateRC.dml
+++ b/src/test/scripts/functions/ternary/AAATernaryAggregateRC.dml
@@ -21,7 +21,7 @@
 
 A = read($1);
 
-if(1==1){}
+while(FALSE){}
 
 s = sum(A * A * A);
 R = as.matrix(s);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/ABATernaryAggregateC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/ABATernaryAggregateC.dml 
b/src/test/scripts/functions/ternary/ABATernaryAggregateC.dml
index 737b409..f0f87f4 100644
--- a/src/test/scripts/functions/ternary/ABATernaryAggregateC.dml
+++ b/src/test/scripts/functions/ternary/ABATernaryAggregateC.dml
@@ -22,7 +22,7 @@
 A = read($1);
 B = A * 2;
 
-if(1==1){}
+while(FALSE){}
 
 R = colSums(A * B * A);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/ABATernaryAggregateRC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/ABATernaryAggregateRC.dml 
b/src/test/scripts/functions/ternary/ABATernaryAggregateRC.dml
index 965c8d3..fd6c89c 100644
--- a/src/test/scripts/functions/ternary/ABATernaryAggregateRC.dml
+++ b/src/test/scripts/functions/ternary/ABATernaryAggregateRC.dml
@@ -22,7 +22,7 @@
 A = read($1);
 B = A * 2;
 
-if(1==1){}
+while(FALSE){}
 
 s = sum(A * B * A);
 R = as.matrix(s);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/CTableSequenceLeft.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/CTableSequenceLeft.dml 
b/src/test/scripts/functions/ternary/CTableSequenceLeft.dml
index 64facbf..755f2f6 100644
--- a/src/test/scripts/functions/ternary/CTableSequenceLeft.dml
+++ b/src/test/scripts/functions/ternary/CTableSequenceLeft.dml
@@ -25,5 +25,6 @@ B = table(seq(1, nrow(A)), A);
 if( $4==1 ){ #withAgg
    print("sum="+sum(B));
 }
+while(FALSE){}
 
 write(B, $5, format="text");
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/CTableSequenceRight.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/CTableSequenceRight.dml 
b/src/test/scripts/functions/ternary/CTableSequenceRight.dml
index ff4afed..4e449c6 100644
--- a/src/test/scripts/functions/ternary/CTableSequenceRight.dml
+++ b/src/test/scripts/functions/ternary/CTableSequenceRight.dml
@@ -25,5 +25,6 @@ B = table(A,seq(1, nrow(A)));
 if( $4==1 ){ #withAgg
    print("sum="+sum(B));
 }
+while(FALSE){}
 
 write(B, $5, format="text");
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/TernaryAggregateC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/TernaryAggregateC.dml 
b/src/test/scripts/functions/ternary/TernaryAggregateC.dml
index a171ff4..822d24d 100644
--- a/src/test/scripts/functions/ternary/TernaryAggregateC.dml
+++ b/src/test/scripts/functions/ternary/TernaryAggregateC.dml
@@ -23,7 +23,7 @@ A = read($1);
 B = A * 2;
 C = A * 3;
 
-if(1==1){}
+while(FALSE){}
 
 R = colSums(A * B * C);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/ternary/TernaryAggregateRC.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/ternary/TernaryAggregateRC.dml 
b/src/test/scripts/functions/ternary/TernaryAggregateRC.dml
index 485570d..b0f9fae 100644
--- a/src/test/scripts/functions/ternary/TernaryAggregateRC.dml
+++ b/src/test/scripts/functions/ternary/TernaryAggregateRC.dml
@@ -23,7 +23,7 @@ A = read($1);
 B = A * 2;
 C = A * 3;
 
-if(1==1){}
+while(FALSE){}
 
 s = sum(A * B * C);
 R = as.matrix(s);

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/transform/FrameCSVReadWrite.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/transform/FrameCSVReadWrite.dml 
b/src/test/scripts/functions/transform/FrameCSVReadWrite.dml
index 88f0cf5..c376975 100644
--- a/src/test/scripts/functions/transform/FrameCSVReadWrite.dml
+++ b/src/test/scripts/functions/transform/FrameCSVReadWrite.dml
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------
 
 X = read($1, data_type="frame", format="csv");
-if(1==1){}
+while(FALSE){}
 
 print(toString(X));
 write(X, $2, format="csv");

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/transform/TransformCSVFrameEncodeDecode.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/transform/TransformCSVFrameEncodeDecode.dml 
b/src/test/scripts/functions/transform/TransformCSVFrameEncodeDecode.dml
index 50ec83c..a38f105 100644
--- a/src/test/scripts/functions/transform/TransformCSVFrameEncodeDecode.dml
+++ b/src/test/scripts/functions/transform/TransformCSVFrameEncodeDecode.dml
@@ -24,7 +24,7 @@ jspec = "{\"ids\": true, \"recode\": [1,2,3]}";
 
 [X, M] = transformencode(target=F1, spec=jspec);
 
-if(1==1){}
+while(FALSE){}
 
 F2 = transformdecode(target=X, spec=jspec, meta=M);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/transform/TransformFrameEncodeApply.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/transform/TransformFrameEncodeApply.dml 
b/src/test/scripts/functions/transform/TransformFrameEncodeApply.dml
index 08c98d0..f7be1aa 100644
--- a/src/test/scripts/functions/transform/TransformFrameEncodeApply.dml
+++ b/src/test/scripts/functions/transform/TransformFrameEncodeApply.dml
@@ -25,7 +25,7 @@ jspec = read($TFSPEC, data_type="scalar", 
value_type="string");
 
 [X, M] = transformencode(target=F1, spec=jspec);
 
-if(1==1){}
+while(FALSE){}
 
 X2 = transformapply(target=F1, spec=jspec, meta=M);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/transform/TransformFrameEncodeDecode.dml
----------------------------------------------------------------------
diff --git 
a/src/test/scripts/functions/transform/TransformFrameEncodeDecode.dml 
b/src/test/scripts/functions/transform/TransformFrameEncodeDecode.dml
index 0b2b6b7..ac9a5d2 100644
--- a/src/test/scripts/functions/transform/TransformFrameEncodeDecode.dml
+++ b/src/test/scripts/functions/transform/TransformFrameEncodeDecode.dml
@@ -23,7 +23,7 @@ jspec = read($TFSPEC, data_type="scalar", 
value_type="string");
 
 [X, M] = transformencode(target=F1, spec=jspec);
 
-if(1==1){}
+while(FALSE){}
 
 F2 = transformdecode(target=X, spec=jspec, meta=M);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/unary/matrix/PrintTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/unary/matrix/PrintTest.dml 
b/src/test/scripts/functions/unary/matrix/PrintTest.dml
index 50cdc1c..dfabc2a 100644
--- a/src/test/scripts/functions/unary/matrix/PrintTest.dml
+++ b/src/test/scripts/functions/unary/matrix/PrintTest.dml
@@ -21,13 +21,13 @@
 
 X = read($1, rows=$2, cols=$3);
 X = X*1;
-if(1==1){} #ensure X is in symbol table
+while(FALSE){} #ensure X is in symbol table
 print("X");
-if(1==1){} #ensure X is in symbol table
+while(FALSE){} #ensure X is in symbol table
 y = (ncol(X));
-if(1==1){} #ensure y is in symbol table
+while(FALSE){} #ensure y is in symbol table
 print("y");
-if(1==1){} #ensure y is in symbol table
+while(FALSE){} #ensure y is in symbol table
 y = y*2;
 print(y);
 

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/unary/matrix/replace_Infinity.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/unary/matrix/replace_Infinity.dml 
b/src/test/scripts/functions/unary/matrix/replace_Infinity.dml
index 233d771..28ef73e 100644
--- a/src/test/scripts/functions/unary/matrix/replace_Infinity.dml
+++ b/src/test/scripts/functions/unary/matrix/replace_Infinity.dml
@@ -21,6 +21,6 @@
 
 
 A = read($1, rows=$2, cols=$3, format="text");
-if(1==1){} #for replace test in mappers
+while(FALSE){} #for replace test in mappers
 C = replace(target=A, pattern=1/0, replacement=4711);
 write(C, $4, format="text");  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/unary/matrix/replace_NInfinity.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/unary/matrix/replace_NInfinity.dml 
b/src/test/scripts/functions/unary/matrix/replace_NInfinity.dml
index 42a592d..b458bec 100644
--- a/src/test/scripts/functions/unary/matrix/replace_NInfinity.dml
+++ b/src/test/scripts/functions/unary/matrix/replace_NInfinity.dml
@@ -21,6 +21,6 @@
 
 
 A = read($1, rows=$2, cols=$3, format="text");
-if(1==1){} #for replace test in mappers
+while(FALSE){} #for replace test in mappers
 C = replace(target=A, pattern=-1/0, replacement=4711);
 write(C, $4, format="text");  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/unary/matrix/replace_NaN.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/unary/matrix/replace_NaN.dml 
b/src/test/scripts/functions/unary/matrix/replace_NaN.dml
index edc815c..1ef0420 100644
--- a/src/test/scripts/functions/unary/matrix/replace_NaN.dml
+++ b/src/test/scripts/functions/unary/matrix/replace_NaN.dml
@@ -21,6 +21,6 @@
 
 
 A = read($1, rows=$2, cols=$3, format="text");
-if(1==1){} #for replace test in mappers
+while(FALSE){} #for replace test in mappers
 C = replace(target=A, pattern=0/0, replacement=4711);
 write(C, $4, format="text");  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/updateinplace/updateinplace1.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/updateinplace/updateinplace1.dml 
b/src/test/scripts/functions/updateinplace/updateinplace1.dml
index 6d19ab2..2603f37 100644
--- a/src/test/scripts/functions/updateinplace/updateinplace1.dml
+++ b/src/test/scripts/functions/updateinplace/updateinplace1.dml
@@ -26,8 +26,8 @@ parfor (j in 1:m, log=DEBUG){
   A = matrix(3, rows=n, cols=1);
   i = 1
   while (i <= n){
-               if (1 == 1)
-                       print("i = " + i + " j = " + j + " Sum(A) = " + sum(A));
+               print("i = " + i + " j = " + j + " Sum(A) = " + sum(A));
+               while(FALSE){}
                A[i,1] = j*7+i;
                i = i + 1
        }

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test/scripts/functions/updateinplace/updateinplace10.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/updateinplace/updateinplace10.dml 
b/src/test/scripts/functions/updateinplace/updateinplace10.dml
index 0d3a99a..44cc104 100644
--- a/src/test/scripts/functions/updateinplace/updateinplace10.dml
+++ b/src/test/scripts/functions/updateinplace/updateinplace10.dml
@@ -28,11 +28,11 @@ parfor (j in 1:m, log=DEBUG){
   for (i in 1:n){
                print("i = " + i + " j = " + j + " Sum(B) = " + sum(B));
                A[i,1] = j*2+i;
-               if(1 == 1)
-                       B = A
+               while(FALSE){}
+               B = A
                A[i,2] = j*3+i;
-               if(1 == 1)
-                       B = A
+               while(FALSE){}
+               B = A
                A[i,3] = j*4+i;
        }
 }

http://git-wip-us.apache.org/repos/asf/systemml/blob/4b81d0dd/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
----------------------------------------------------------------------
diff --git 
a/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
 
b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
index 95ed276..52f71f8 100644
--- 
a/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
+++ 
b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
@@ -57,6 +57,7 @@ import org.junit.runners.Suite;
        RewriteFusedRandTest.class,
        RewriteLoopVectorization.class,
        RewriteMatrixMultChainOptTest.class,
+       RewriteMergeBlocksTest.class,
        RewritePushdownSumBinaryMult.class,
        RewritePushdownSumOnBinaryTest.class,
        RewritePushdownUaggTest.class,

Reply via email to