Merge pull request #116 from astojanov/develop

PrimitiveOps updates.

Author: TiarkRompf

src/common/PrimitiveOps.scala

@@ -28,41 +28,34 @@ overlap1:
 (Sym(9),Sym(15))
 (Sym(6),Sym(12))
 overlap2:
-var inits: List(Sym(9), Sym(6)) -> List(Variable(Sym(32)), Variable(Sym(33)))
+var inits: List(Sym(9), Sym(6)) -> List(Variable(Sym(25)), Variable(Sym(26)))
 will become var reads: List(Sym(9), Sym(6))
 will become var writes: List(Sym(15), Sym(12))
-var reads: List((Sym(9),Sym(36)), (Sym(6),Sym(37)))
+var reads: List((Sym(9),Sym(29)), (Sym(6),Sym(30)))
 var writes: List((Sym(15),Const(())), (Sym(12),Const(())))
 /*****************************************
   Emitting Generated Code                  
 *******************************************/
 class staged$0 extends ((Array[Double])=>(Array[Double])) {
 def apply(x0:Array[Double]): Array[Double] = {
 val x1 = new Array[Double](20)
-val x24 = 0.doubleValue()
-val x25 = 2.0 * x24
-val x26 = x25 + 3.0
-val x27 = 1.doubleValue()
-val x28 = 2.0 * x27
-val x29 = x28 + 3.0
-val x30 = x26 + x29
-val x31 = x1(0) = x30
-var x32: Double = x29
-var x33: Int = 1
-var x35 : Int = 1
-val x48 = while (x35 < 20) {
-val x36 = x32
-val x37 = x33
-val x39 = x35 + 1
-val x40 = x39.doubleValue()
-val x41 = 2.0 * x40
-val x42 = x41 + 3.0
-val x43 = x36 + x42
-val x44 = x1(x37) = x43
-x32 = x42
-x33 = x39
+val x24 = x1(0) = 8.0
+var x25: Double = 5.0
+var x26: Int = 1
+var x28 : Int = 1
+val x41 = while (x28 < 20) {
+val x29 = x25
+val x30 = x26
+val x32 = x28 + 1
+val x33 = x32.doubleValue()
+val x34 = 2.0 * x33
+val x35 = x34 + 3.0
+val x36 = x29 + x35
+val x37 = x1(x30) = x36
+x25 = x35
+x26 = x32
 
-x35 = x35 + 1
+x28 = x28 + 1
 }
 x1
 }

test-out/epfl/test11-stencil1.check

@@ -23,7 +23,7 @@ class TestHMM extends FileDiffSuite {
     def staticData[T:Typ](x: T): Rep[T]
     def test(x: Rep[Array[Int]]): Rep[Array[Int]]
   }
-  trait Impl extends DSL with Runner with ArrayOpsExpOpt with NumericOpsExpOpt with PrimitiveOpsExp with OrderingOpsExpOpt with BooleanOpsExp
+  trait Impl extends DSL with Runner with ArrayOpsExpOpt with NumericOpsExpOpt with PrimitiveOpsExpOpt with OrderingOpsExpOpt with BooleanOpsExp
       with EqualExpOpt with VariablesExpOpt with RangeOpsExp with StaticDataExp
       with StringOpsExp with SeqOpsExp
       with IfThenElseExpOpt with PrintExp 

test-src/epfl/test11-shonan/TestHMM.scala

@@ -27,7 +27,7 @@ class TestStencil extends FileDiffSuite {
       with OrderingOpsExpOpt with BooleanOpsExp
       with EqualExpOpt with VariablesExpOpt with RangeOpsExp with StaticDataExp
       with StringOpsExp with SeqOpsExp
-      with IfThenElseExpOpt with PrintExp with PrimitiveOpsExp
+      with IfThenElseExpOpt with PrintExp with PrimitiveOpsExpOpt
       with CompileScala { self => 
     //override val verbosity = 1
     def infix_toDouble(x: Rep[Int]): Rep[Double] = int_double_value(x)

test-src/epfl/test11-shonan/TestStencil.scala

@@ -217,7 +217,7 @@ class TestStable extends FileDiffSuite {
     with EqualExpOpt with IfThenElseFatExp with LoopsFatExp with WhileExp
     with RangeOpsExp with PrintExp with FatExpressions with CompileScala
     with SeqOpsExp with StringOpsExp
-    with PrimitiveOpsExp with ArrayOpsExp with CastingOpsExp with StaticDataExp 
+    with PrimitiveOpsExpOpt with ArrayOpsExp with CastingOpsExp with StaticDataExp
     with StableVarsExp { self =>
     override val verbosity = 1
     dumpGeneratedCode = true

test-src/epfl/test13-dynamic-jit/TestStable.scala

@@ -104,7 +104,7 @@ class TestConditional extends FileDiffSuite {
 
       println("-- begin")
 
-      new ConditionalProg with PrimitiveOpsExpOpt with EqualExp with PrintExp
+      new ConditionalProg with PrimitiveOpsExp with EqualExp with PrintExp
       with IfThenElseExp with StringOpsExp with ArrayOpsExp with SeqOpsExp
       with CompileScala { self =>
         val codegen = new ScalaGenIfThenElse with ScalaGenPrimitiveOps 
@@ -117,7 +117,7 @@ class TestConditional extends FileDiffSuite {
       }
 
       new ConditionalProg with LiftPrimitives with IfThenElseExp 
-      with PrimitiveOpsExpOpt with StringOpsExp with ArrayOpsExp with SeqOpsExp
+      with PrimitiveOpsExp with StringOpsExp with ArrayOpsExp with SeqOpsExp
       with EqualExp
       with PrintExp { self =>
         val codegen = new JSGenIfThenElse with JSGenPrimitiveOps