diff options
Diffstat (limited to 'chapter21/src/test')
3 files changed, 9 insertions, 9 deletions
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java index fc2f23b0..a2eb1172 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -82,9 +82,9 @@ return sqrt(arg) + sqrt(arg+2); @Test public void testAlloc2() { String src = "int[] !xs = new int[3]; xs[arg]=1; return xs[arg&1];"; - testCPU(src,"x86_64_v2", "SystemV",0,"return .[];"); - testCPU(src,"riscv" , "SystemV",6,"return .[];"); - testCPU(src,"arm" , "SystemV",4,"return .[];"); + testCPU(src,"x86_64_v2", "SystemV",-1,"return .[];"); + testCPU(src,"riscv" , "SystemV", 6,"return .[];"); + testCPU(src,"arm" , "SystemV", 4,"return .[];"); } diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java index 4bd46a81..0610d294 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java @@ -25,7 +25,8 @@ public class Chapter21Test { code.parse().opto().typeCheck().instSelect(cpu,os).GCM().localSched().regAlloc().encode(); int delta = spills>>3; if( delta==0 ) delta = 1; - assertEquals("Expect spills:",spills,code._regAlloc._spillScaled,delta); + if( spills != -1 ) + assertEquals("Expect spills:",spills,code._regAlloc._spillScaled,delta); if( stop != null ) assertEquals(stop, code._stop.toString()); } @@ -41,9 +42,9 @@ public class Chapter21Test { @Test public void testArray1() throws IOException { String src = Files.readString(Path.of("src/test/java/com/seaofnodes/simple/progs/array1.smp")); - testCPU(src,"x86_64_v2", "SystemV",4,"return .[];"); - testCPU(src,"riscv" , "SystemV",7,"return (add,.[],(mul,.[],1000));"); - testCPU(src,"arm" , "SystemV",5,"return (add,.[],(mul,.[],1000));"); + testCPU(src,"x86_64_v2", "SystemV",-1,"return .[];"); + testCPU(src,"riscv" , "SystemV", 7,"return (add,.[],(mul,.[],1000));"); + testCPU(src,"arm" , "SystemV", 5,"return (add,.[],(mul,.[],1000));"); } @Test diff --git a/chapter21/src/test/java/com/seaofnodes/simple/TestC.java b/chapter21/src/test/java/com/seaofnodes/simple/TestC.java index c4f980ed..2d908699 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/TestC.java +++ b/chapter21/src/test/java/com/seaofnodes/simple/TestC.java @@ -38,15 +38,14 @@ public abstract class TestC { // On X86, compile both win64 and sys5 variants if( CPU_PORT.equals("x86_64_v2") ) { - _run(src,"SystemV","sysv_abi",cfile,efile,"S",expected); _run(src,"Win64" ,"ms_abi" ,cfile,efile,"W",expected); + _run(src,"SystemV","sysv_abi",cfile,efile,"S",expected); } else { _run(src,CALL_CONVENTION,"",cfile,efile,"S",expected); } } static void _run( String src, String simple_conv, String c_conv, String cfile, String efile, String xtn, String expected ) throws IOException { - System.err.println("Compiling "+cfile+" on "+OS+" for "+c_conv); String bin = efile+xtn; String obj = bin+".o"; // Compile simple, emit ELF |