diff options
Diffstat (limited to 'chapter10/src/test/java/com')
10 files changed, 107 insertions, 126 deletions
diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter02Test.java index 2deba460..75ee0b70 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter02Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter02Test.java @@ -14,8 +14,6 @@ public class Chapter02Test { Node._disablePeephole = true; // disable peephole so we can observe full graph StopNode ret = parser.parse(); assertEquals("return ((1+(2*3))+(-5));", ret.print()); - GraphVisualizer gv = new GraphVisualizer(); - System.out.println(gv.generateDotOutput(parser)); Node._disablePeephole = false; } @@ -59,8 +57,6 @@ public class Chapter02Test { Parser parser = new Parser("return 1+2*3+-5;"); StopNode ret = parser.parse(); assertEquals("return 2;", ret.print()); - GraphVisualizer gv = new GraphVisualizer(); - System.out.println(gv.generateDotOutput(parser)); } } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter03Test.java index 407fbe48..c76df903 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter03Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter03Test.java @@ -31,7 +31,7 @@ public class Chapter03Test { @Test public void testVarScopeNoPeephole() { - Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; #showGraph; } return c; #showGraph;"); + Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c; "); Node._disablePeephole = true; StopNode ret = parser.parse(); Node._disablePeephole = false; @@ -40,7 +40,7 @@ public class Chapter03Test { @Test public void testVarDist() { - Parser parser = new Parser("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1); #showGraph;"); + Parser parser = new Parser("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1); "); StopNode ret = parser.parse(); assertEquals("return 8;", ret.print()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter04Test.java index cde23324..e23a10b1 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter04Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter04Test.java @@ -10,7 +10,7 @@ public class Chapter04Test { @Test public void testPeephole() { - Parser parser = new Parser("return 1+arg+2; #showGraph;"); + Parser parser = new Parser("return 1+arg+2; "); StopNode ret = parser.parse(); assertEquals("return (arg+3);", ret.print()); } @@ -38,7 +38,7 @@ public class Chapter04Test { @Test public void testPeephole3() { - Parser parser = new Parser("return 1+arg+2+arg+3; #showGraph;"); + Parser parser = new Parser("return 1+arg+2+arg+3; "); StopNode ret = parser.parse(); assertEquals("return ((arg*2)+6);", ret.print()); } @@ -52,7 +52,7 @@ public class Chapter04Test { @Test public void testVarArg() { - Parser parser = new Parser("return arg; #showGraph;"); + Parser parser = new Parser("return arg; "); StopNode stop = parser.parse(); ReturnNode ret = stop.ret(); assertTrue(ret.in(0) instanceof ProjNode); @@ -61,49 +61,49 @@ public class Chapter04Test { @Test public void testConstantArg() { - Parser parser = new Parser("return arg; #showGraph;", TypeInteger.constant(2)); + Parser parser = new Parser("return arg; ", TypeInteger.constant(2)); StopNode ret = parser.parse(); assertEquals("return 2;", ret.print()); } @Test public void testCompEq() { - Parser parser = new Parser("return 3==3; #showGraph;"); + Parser parser = new Parser("return 3==3; "); StopNode ret = parser.parse(); assertEquals("return 1;", ret.print()); } @Test public void testCompEq2() { - Parser parser = new Parser("return 3==4; #showGraph;"); + Parser parser = new Parser("return 3==4; "); StopNode ret = parser.parse(); assertEquals("return 0;", ret.print()); } @Test public void testCompNEq() { - Parser parser = new Parser("return 3!=3; #showGraph;"); + Parser parser = new Parser("return 3!=3; "); StopNode ret = parser.parse(); assertEquals("return 0;", ret.print()); } @Test public void testCompNEq2() { - Parser parser = new Parser("return 3!=4; #showGraph;"); + Parser parser = new Parser("return 3!=4; "); StopNode ret = parser.parse(); assertEquals("return 1;", ret.print()); } @Test public void testBug1() { - Parser parser = new Parser("int a=arg+1; int b=a; b=1; return a+2; #showGraph;"); + Parser parser = new Parser("int a=arg+1; int b=a; b=1; return a+2; "); StopNode ret = parser.parse(); assertEquals("return (arg+3);", ret.print()); } @Test public void testBug2() { - Parser parser = new Parser("int a=arg+1; a=a; return a; #showGraph;"); + Parser parser = new Parser("int a=arg+1; a=a; return a; "); StopNode ret = parser.parse(); assertEquals("return (arg+1);", ret.print()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 44fff0c0..35e54fa9 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -17,11 +17,11 @@ if (arg == 1) a = arg+2; else { a = arg-3; - #showGraph; + } -#showGraph; + return a;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region18,(arg+2),(arg-3));", ret.toString()); } @@ -36,7 +36,7 @@ if (arg == 1) { c = 4; } return c;""", TypeInteger.BOT); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region16,4,3);", ret.toString()); } @@ -48,7 +48,7 @@ if( arg==1 ) return 3; else return 4; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse(); assertEquals("Stop[ return 3; return 4; ]", stop.toString()); } @@ -64,7 +64,7 @@ if( arg==1 ) else b=a+1; return a+b;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return ((arg*2)+Phi(Region21,2,3));", ret.toString()); } @@ -79,7 +79,7 @@ if( arg==1 ) else a=b+1; return a+b;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return ((Phi(Region32,(arg*2),arg)+arg)+Phi(Region,4,5));", ret.toString()); } @@ -98,7 +98,7 @@ else if( arg==3 ) else a=5; return a; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region36,Phi(Region22,2,3),Phi(Region34,4,5));", stop.toString()); } @@ -114,7 +114,7 @@ if( arg ) if( arg==0 ) b=2; return arg+a+b; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse(); assertEquals("return ((arg+Phi(Region13,1,0))+Phi(Region28,2,0));", stop.toString()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter06Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter06Test.java index d30bd43d..097c2617 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter06Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter06Test.java @@ -15,7 +15,7 @@ public class Chapter06Test { if( true ) return 2; return 1; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 2;", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -44,7 +44,7 @@ else a=3; return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 2;", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -64,7 +64,7 @@ if( a==2 ) else b=5; return b;""", TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region37,42,5);", stop.toString()); } @@ -83,7 +83,7 @@ if( arg==2 ) else b=5; return b;""", TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region30,2,5);", stop.toString()); } @@ -102,7 +102,7 @@ else if( arg==3 ) else a=5; return a; -#showGraph;""", TypeInteger.constant(2)); +""", TypeInteger.constant(2)); StopNode stop = parser.parse(); assertEquals("return 5;", stop.toString()); } @@ -123,7 +123,7 @@ else a=5; return a; """, TypeInteger.constant(1)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -143,7 +143,7 @@ else a=5; return a; """, TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region41,3,Phi(Region39,4,5));", stop.toString()); } @@ -163,7 +163,7 @@ else a=5; return a; """, TypeInteger.constant(1)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -183,7 +183,7 @@ else a=5; return a; """, TypeInteger.constant(3)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 4;", stop.toString()); } @@ -199,7 +199,7 @@ if( arg ) { } return a+b; """); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region24,4,1);", ret.toString()); } @@ -216,7 +216,7 @@ if( arg ) { } return a+b; """, TypeInteger.constant(1)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 4;", ret.toString()); } @@ -232,7 +232,7 @@ if( arg ) { } return a+b; """, TypeInteger.constant(0)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 1;", ret.toString()); } @@ -250,7 +250,7 @@ if( arg ) { } return a+b+c; """); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return (Phi(Region36,Phi(Region23,2,3),0)+Phi(Region,3,1));", ret.toString()); } @@ -269,7 +269,7 @@ if( arg ) { } return a+b+c; """, TypeInteger.constant(1)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 6;", ret.toString()); } @@ -287,7 +287,7 @@ if( arg ) { } return a+b+c; """, TypeInteger.constant(2)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 5;", ret.toString()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter07Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter07Test.java index a5cddb68..de9d16f2 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter07Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter07Test.java @@ -14,12 +14,11 @@ public class Chapter07Test { """ while(arg < 10) { arg = arg + 1; - #showGraph; } return arg; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -37,7 +36,7 @@ if(arg){}else{ } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region24,1,Phi(Loop13,1,(Phi_a+1)));", stop.toString()); } @@ -57,9 +56,8 @@ while(i < arg) { } return sum; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,0,Phi(Loop20,Phi_sum,(Phi_sum+Phi(Loop,0,(Phi_j+1)))));", stop.toString()); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -75,11 +73,10 @@ while(a < 10) { return b; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop8,2,Phi(Region27,Phi_b,4));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -96,10 +93,9 @@ while(a < 10) { } return b; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,2,(Phi(Region27,Phi_b,4)+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @@ -115,7 +111,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -132,7 +128,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -146,11 +142,10 @@ while(arg) a = 2; return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,2);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -164,7 +159,6 @@ return a; StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,2);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop, 99)); } @Test @@ -179,7 +173,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -196,7 +190,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -214,7 +208,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop8,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -232,7 +226,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter08Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter08Test.java index 6e8d218f..6688d598 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter08Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter08Test.java @@ -23,7 +23,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region36,Phi(Region25,Phi(Loop6,arg,(Phi_arg+1)),Add),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); Assert.assertEquals(5L, Evaluator.evaluate(stop, 1)); @@ -46,10 +46,9 @@ while(arg < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,Phi(Region42,Phi_a,(Phi_a+1)));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @@ -66,7 +65,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region34,Phi(Loop6,arg,(Phi_arg+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -82,7 +81,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region25,Phi(Loop6,arg,(Phi_arg+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -101,7 +100,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -118,7 +117,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -134,15 +133,14 @@ while( arg < 10 ) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return arg;", stop.toString()); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test public void testRegress2() { Parser parser = new Parser("if(1) return 0; else while(arg>--arg) arg=arg+1; return 0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } @@ -170,7 +168,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return arg;", stop.toString()); } @@ -187,7 +185,7 @@ while(arg < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region28,Phi(Loop7,1,(Phi_a+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -203,7 +201,7 @@ while(1) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return (Phi(Loop7,1,Add)+1);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode prj && prj._idx==1 ); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 8e651858..048a58c7 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -26,7 +26,7 @@ while(v0) { } return 0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); } @Test @@ -42,7 +42,7 @@ else { } return x; """); - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("Stop[ return (arg*2); return (Mul+1); ]", stop.toString()); Assert.assertEquals(2L, Evaluator.evaluate(stop, 1)); Assert.assertEquals(23L, Evaluator.evaluate(stop, 11)); @@ -54,7 +54,7 @@ return x; """ return arg*arg-arg*arg; """); - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return 0;", stop.toString()); Assert.assertEquals(0L, Evaluator.evaluate(stop, 1)); } @@ -69,7 +69,7 @@ while (arg < 10) { } return arg; """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,arg,(Phi_arg+2));", stop.toString()); Assert.assertEquals(11L, Evaluator.evaluate(stop, 1)); } @@ -86,7 +86,7 @@ while (arg < 10) { } return arg; """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,arg,(Phi_arg+4));", stop.toString()); Assert.assertEquals(13L, Evaluator.evaluate(stop, 1)); } @@ -115,7 +115,7 @@ while (arg) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop14,arg,(Phi_arg+1));", stop.toString()); } @@ -133,14 +133,14 @@ while(v1+arg) { v1=v2; } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @Test public void testWhile0() { Parser parser = new Parser("while(0) continue; if(0) arg=0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -152,7 +152,7 @@ if(0) while(0) { while(0) {} } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -160,14 +160,14 @@ if(0) while(0) { @Test public void testPrecedence() { Parser parser = new Parser("return 3-1+2;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 4;", stop.toString()); } @Test public void testSwap2() { Parser parser = new Parser("return 1+(1+1);"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -185,7 +185,7 @@ while(arg) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop9,0,(-(Phi_a+3)));", stop.toString()); } @@ -199,7 +199,7 @@ arg=0; int v0=0!=0<-0; return -0+0+0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -207,14 +207,14 @@ return -0+0+0; @Test public void testFuzz2() { Parser parser = new Parser("return 0+-0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } @Test public void testFuzz3() { Parser parser = new Parser("int v0=0; while(0==69) while(v0) return 0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -226,7 +226,7 @@ while(1) { if(1<0) while(arg==-0) arg=arg-arg; } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -248,7 +248,7 @@ while(1) { } return 0!=0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -259,7 +259,7 @@ int v0=0; while(0==1) while(v0) v0=1+v0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -275,14 +275,14 @@ while(1) v1=1; return v1+v0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @Test public void testFuzz8() { - Parser parser = new Parser("while(arg) arg = arg - 1; #showGraph; return arg;"); - StopNode stop = parser.parse().iterate(true); + Parser parser = new Parser("while(arg) arg = arg - 1; return arg;"); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg-1));", stop.toString()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter10Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter10Test.java index 2e1ae1aa..f2e7ca2c 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter10Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter10Test.java @@ -33,7 +33,7 @@ if( (arg/13)==0 ) { int r = g+h; return p-r; """); - StopNode stop = parser.parse(false).iterate(false); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } @@ -53,8 +53,7 @@ bar.a = 1; bar.a = 2; return bar.a; """); - StopNode stop = parser.parse(false).iterate(true); - System.out.println(IRPrinter.prettyPrint(stop, 99, true)); + StopNode stop = parser.parse().iterate(); assertEquals("return 2;", stop.toString()); } @@ -70,8 +69,7 @@ else v.y = 3; return v; """); - StopNode stop = parser.parse(true).iterate(true); - System.out.println(IRPrinter.prettyPrint(stop, 99, true)); + StopNode stop = parser.parse().iterate(); assertEquals("return new Vector2D;", stop.toString()); } @@ -84,7 +82,7 @@ struct s0 { s0? v1=null; int v3=v1.zAicm; """); - try { parser.parse(true); fail(); } + try { parser.parse(); fail(); } catch( Exception e ) { assertEquals("Accessing unknown field 'zAicm' from 'null'",e.getMessage()); } } @@ -94,7 +92,7 @@ int v3=v1.zAicm; struct s0 { int v0; } arg=0+new s0.0; """); - try { parser.parse(true); fail(); } + try { parser.parse(); fail(); } catch( Exception e ) { assertEquals("Expected an identifier, found 'null'",e.getMessage()); } } @@ -109,7 +107,7 @@ while (arg) { } return bar.a; """); - StopNode stop = parser.parse(false).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop10,0,(Phi_a+2));", stop.toString()); } @@ -122,7 +120,7 @@ if (arg) bar = null; bar.a = 1; return bar.a; """); - try { parser.parse(true).iterate(true); fail(); } + try { parser.parse().iterate(); fail(); } catch( Exception e ) { assertEquals("Type null is not of declared type *Bar",e.getMessage()); } } @@ -135,7 +133,7 @@ if (arg) bar = new Bar; bar.a = 1; return bar.a; """); - try { parser.parse(true).iterate(true); fail(); } + try { parser.parse().iterate(); fail(); } catch( Exception e ) { assertEquals("Might be null accessing 'a'",e.getMessage()); } } @@ -148,7 +146,7 @@ if (arg) bar = null; bar.a = 1; return bar.a; """); - try { parser.parse(true); fail(); } + try { parser.parse(); fail(); } catch( Exception e ) { assertEquals("Type null is not of declared type *Bar", e.getMessage()); } } @@ -161,7 +159,7 @@ if (arg) bar = null; if( bar ) bar.a = 1; return bar; """); - StopNode stop = parser.parse(false).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region15,null,new Bar);", stop.toString()); } @@ -177,7 +175,7 @@ if( !bar ) rez=4; else bar.a = 1; return rez; """); - StopNode stop = parser.parse(false).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region32,4,3);", stop.toString()); } @@ -194,7 +192,7 @@ while(arg) { } return ret; """); - try { parser.parse(true).iterate(true); fail(); } + try { parser.parse().iterate(); fail(); } catch( Exception e ) { assertEquals("Might be null accessing 'v0'", e.getMessage()); } } @@ -208,7 +206,7 @@ s0? v1=new s0; s0? v1; v1=new s0; """); - try { parser.parse(true); fail(); } + try { parser.parse(); fail(); } catch( Exception e ) { assertEquals("Redefining name 'v1'", e.getMessage()); } } @@ -230,7 +228,7 @@ while( i.x < i.len ) { } return sum; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop14,0,(Phi(Loop,0,(Phi_x+1))+Phi_sum));", stop.toString()); } @@ -247,12 +245,10 @@ while(arg) { v0.v0 = arg; arg = arg-1; if (arg==5) ret=v0; - #showGraph; } return ret; """); - StopNode stop = parser.parse(true).iterate(true); - System.out.println(IRPrinter.prettyPrint(stop, 99, true)); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop10,new s0,Phi(Region31,new s0,Phi_ret));", stop.toString()); } @@ -266,12 +262,10 @@ while(arg) { v0.v0 = arg; arg = arg-1; if (arg==5) ret=v0; - #showGraph; } return ret; """); - StopNode stop = parser.parse(true).iterate(true); - System.out.println(IRPrinter.prettyPrint(stop, 99, true)); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop13,new s0,Phi(Region32,new s0,Phi_ret));", stop.toString()); } @@ -288,8 +282,7 @@ while(arg < 10) { } return ret; """); - StopNode stop = parser.parse(true).iterate(true); - System.out.println(IRPrinter.prettyPrint(stop, 99, true)); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop10,new s0,Phi(Region30,new s0,Phi_ret));", stop.toString()); } @@ -303,7 +296,7 @@ if(0>=0) return new s0; return new s0; int v0=null.f0; """); - try { parser.parse(true); fail(); } + try { parser.parse(); fail(); } catch( Exception e ) { assertEquals("Accessing unknown field 'f0' from 'null'", e.getMessage()); } } @@ -319,7 +312,7 @@ if(0) { } } """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -333,7 +326,7 @@ if(0) return 0; else return new s0; if(new s0.f0) return 0; """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return new s0;", stop.toString()); } @@ -349,7 +342,7 @@ while(0<arg) { } return 0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); } @Test @@ -361,7 +354,7 @@ while(v0.f0) {} s0 v1 = v0; return v1; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return new s0;", stop.toString()); } @@ -393,7 +386,7 @@ while(0) {} } } } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -404,7 +397,7 @@ int v0=arg==0; while(v0) continue; return 0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } diff --git a/chapter10/src/test/java/com/seaofnodes/simple/SchedulerTest.java b/chapter10/src/test/java/com/seaofnodes/simple/SchedulerTest.java index e5961815..5def2782 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/SchedulerTest.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/SchedulerTest.java @@ -31,7 +31,7 @@ if (arg) v.f=1; return i; """); StopNode._disablePeephole = true; - StopNode stop = parser.parse(true);//.iterate(true); + StopNode stop = parser.parse(true);//.iterate(); var eval = new Evaluator(stop); assertEquals(2L, eval.evaluate(1, 10)); } @@ -46,7 +46,7 @@ S v0=new S; if(arg) v0.f=1; return v0; """); - StopNode stop = parser.parse(false).iterate(true); + StopNode stop = parser.parse().iterate(); var eval = new Evaluator(stop); assertObj(eval.evaluate(0, 10), "S", 0L); assertObj(eval.evaluate(1, 10), "S", 1L); @@ -65,7 +65,7 @@ i=v.f; if (arg) v.f=1; return i; """); - StopNode stop = parser.parse(false).iterate(true); + StopNode stop = parser.parse().iterate(); var eval = new Evaluator(stop); assertEquals(2L, eval.evaluate(0, 10)); assertEquals(2L, eval.evaluate(1, 10)); |