summary refs log tree commit diff
diff options
context:
space:
mode:
authorQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2016-02-11 20:02:31 -0500
committerQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2016-02-11 20:02:31 -0500
commitcfa285395e19460a2da9c63167185a08245f1d83 (patch)
treed8eb342221c4a40e4f5d32786edf9626f7b57ac9
parent21d637efc8e49fda0de659d8b78342adf6a30893 (diff)
downloadroux-cfa285395e19460a2da9c63167185a08245f1d83.tar.gz
update tests to new comparisons
-rw-r--r--lisc/test/collatz.ssa8
-rw-r--r--lisc/test/cprime.ssa10
-rw-r--r--lisc/test/cup.ssa2
-rw-r--r--lisc/test/echo.ssa4
-rw-r--r--lisc/test/fix3.ssa2
-rw-r--r--lisc/test/fix4.ssa4
-rw-r--r--lisc/test/max.ssa2
-rw-r--r--lisc/test/prime.ssa4
-rw-r--r--lisc/test/puts10.ssa2
-rw-r--r--lisc/test/spill2.ssa6
-rw-r--r--lisc/test/sum.ssa2
11 files changed, 23 insertions, 23 deletions
diff --git a/lisc/test/collatz.ssa b/lisc/test/collatz.ssa
index 0c79a05..3e9dc41 100644
--- a/lisc/test/collatz.ssa
+++ b/lisc/test/collatz.ssa
@@ -9,15 +9,15 @@ function $test() {
 @loop
 	%n =w phi @start 1, @newm %n9, @oldm %n9
 	%cmax =w phi @start 0, @newm %c, @oldm %cmax
-	%fin =w cslt %n, 1000
+	%fin =w csltw %n, 1000
 	jnz %fin, @cloop, @end
 @cloop
 	%n0 =w phi @loop %n, @odd %n2, @even %n3
 	%c0 =w phi @loop 0, @odd %c1, @even %c1
-	%no1 =w cne %n0, 1
+	%no1 =w cnew %n0, 1
 	jnz %no1, @iter0, @endcl
 @iter0
-	%ism =w cslt %n0, %n
+	%ism =w csltw %n0, %n
 	jnz %ism, @getmemo, @iter1
 @iter1
 	%c1 =w add %c0, 1
@@ -43,7 +43,7 @@ function $test() {
 	%loc1 =l add %idx1, %mem
 	storew %c, %loc1
 	%n9 =w add 1, %n
-	%big =w csle %cmax, %c
+	%big =w cslew %cmax, %c
 	jnz %big, @newm, @oldm
 @newm
 	jmp @loop
diff --git a/lisc/test/cprime.ssa b/lisc/test/cprime.ssa
index ed303ce..adc5e8a 100644
--- a/lisc/test/cprime.ssa
+++ b/lisc/test/cprime.ssa
@@ -14,13 +14,13 @@ function $test() {
 	storew 12, %v3
 @L0
 	%v5 =w loadw %v1
-	%v6 =w cne %v5, 10001
+	%v6 =w cnew %v5, 10001
 	jnz %v6, @L8, @L1
 @L8
 	storew 1, %v4
 	%v7 =w loadw %v3
 	%v8 =w rem %v7, 2
-	%v9 =w ceq %v8, 0
+	%v9 =w ceqw %v8, 0
 	jnz %v9, @L9, @L5
 @L9
 	storew 0, %v4
@@ -29,13 +29,13 @@ function $test() {
 @L2
 	%v10 =w loadw %v0
 	%v11 =w loadw %v3
-	%v12 =w cslt %v10, %v11
+	%v12 =w csltw %v10, %v11
 	jnz %v12, @L10, @L3
 @L10
 	%v13 =w loadw %v3
 	%v14 =w loadw %v0
 	%v15 =w rem %v13, %v14
-	%v16 =w ceq %v15, 0
+	%v16 =w ceqw %v15, 0
 	jnz %v16, @L11, @L4
 @L11
 	storew 0, %v4
@@ -61,7 +61,7 @@ function $test() {
 	jmp @L0
 @L1
 	%v25 =w loadw %v2
-	%v26 =w cne %v25, 104743
+	%v26 =w cnew %v25, 104743
 	jnz %v26, @L13, @L7
 @L13
 	storew 1, $a
diff --git a/lisc/test/cup.ssa b/lisc/test/cup.ssa
index 41886a5..3ffe198 100644
--- a/lisc/test/cup.ssa
+++ b/lisc/test/cup.ssa
@@ -5,7 +5,7 @@ function $test() {
 @loop
 	%n0  =l phi @start -1988, @loop %n1
 	%n1  =l add 1, %n0
-	%cmp =l csle 1991, %n1
+	%cmp =w cslel 1991, %n1
 	jnz %cmp, @end, @loop
 @end
 	ret
diff --git a/lisc/test/echo.ssa b/lisc/test/echo.ssa
index 238bab0..c67434f 100644
--- a/lisc/test/echo.ssa
+++ b/lisc/test/echo.ssa
@@ -7,10 +7,10 @@ function w $main(w %argc, l %argv) {
 @loop
 	%av =l phi @start %av0, @loop2 %av1
 	%ac =w phi @start %ac0, @loop2 %ac1
-	%c0 =w ceq %ac, 0
+	%c0 =w ceqw %ac, 0
 	jnz %c0, @end, @loop1
 @loop1
-	%c1 =w ceq %ac, 1
+	%c1 =w ceqw %ac, 1
 	jnz %c1, @last, @nolast
 @last
 	jmp @loop2
diff --git a/lisc/test/fix3.ssa b/lisc/test/fix3.ssa
index 1350dc5..283e5a1 100644
--- a/lisc/test/fix3.ssa
+++ b/lisc/test/fix3.ssa
@@ -3,7 +3,7 @@ function w $test() {
 	%x =w copy 100
 	%s =w copy 0
 @l
-	%c =w csle %x, 10
+	%c =w cslew %x, 10
 	jnz %c, @a, @b
 @a
 	%s =w add %s, %x
diff --git a/lisc/test/fix4.ssa b/lisc/test/fix4.ssa
index 0d3ccb6..181768d 100644
--- a/lisc/test/fix4.ssa
+++ b/lisc/test/fix4.ssa
@@ -3,14 +3,14 @@ function $test() {
 	%x =w copy 3
 	%n =w copy 2
 @loop
-	%c =w ceq %n, 10000
+	%c =w ceqw %n, 10000
 	jnz %c, @end, @next
 @next
 	%t =w copy 3
 	%x =w add %x, 2
 @tloop
 	%s =w mul %t, %t
-	%c =w csgt %s, %x
+	%c =w csgtw %s, %x
 	jnz %c, @prime, @test
 @test
 	%r =w rem %x, %t
diff --git a/lisc/test/max.ssa b/lisc/test/max.ssa
index 0a099fd..91d4358 100644
--- a/lisc/test/max.ssa
+++ b/lisc/test/max.ssa
@@ -15,7 +15,7 @@ function $test() {
 	%loc1 =l add 1, %loc
 	jnz %byt, @iter, @end
 @iter
-	%cmp =w csle %max, %byt
+	%cmp =w cslew %max, %byt
 	jnz %cmp, @new, @old
 @new
 	jmp @loop
diff --git a/lisc/test/prime.ssa b/lisc/test/prime.ssa
index 0963e28..03580eb 100644
--- a/lisc/test/prime.ssa
+++ b/lisc/test/prime.ssa
@@ -14,11 +14,11 @@ function $test() {
 @next
 	%t1 =w add 2, %t
 	%tsq =w mul %t1, %t1
-	%c0 =w csgt %tsq, %p
+	%c0 =w csgtw %tsq, %p
 	jnz %c0, @yes, @tloop
 @yes
 	%n1 =w add 1, %n
-	%c1 =w ceq 10001, %n1
+	%c1 =w ceqw 10001, %n1
 	jnz %c1, @end, @loop
 @end
 	storew %p, $a
diff --git a/lisc/test/puts10.ssa b/lisc/test/puts10.ssa
index e10916c..dad4f82 100644
--- a/lisc/test/puts10.ssa
+++ b/lisc/test/puts10.ssa
@@ -9,7 +9,7 @@ function $test() {
 	storeb %c, %y
 	%r =w call $puts(l %y)
 	%n1 =w add %n, 1
-	%cmp =w csle %n1, 9
+	%cmp =w cslew %n1, 9
 	jnz %cmp, @loop, @end
 @end
 	ret
diff --git a/lisc/test/spill2.ssa b/lisc/test/spill2.ssa
index 49ce2f2..cdfda2d 100644
--- a/lisc/test/spill2.ssa
+++ b/lisc/test/spill2.ssa
@@ -6,8 +6,8 @@
 
 function $test() {
 @start
-	%a =w copy 0
-	%b =w copy 0
+	%a =w loadw $a
+	%b =w loadw $a
 
 @loop
 	%c =w phi @start 0, @loop %f
@@ -16,7 +16,7 @@ function $test() {
 	%f =w add %c, %d
 	%g =w add %c, %e
 	%h =w add %e, %d
-	%x =w csle %a, %b
+	%x =w cslew %a, %b
 	jnz %x, @loop, @end
 
 @end
diff --git a/lisc/test/sum.ssa b/lisc/test/sum.ssa
index 575daf6..aa05da8 100644
--- a/lisc/test/sum.ssa
+++ b/lisc/test/sum.ssa
@@ -6,7 +6,7 @@ function w $sum(l %arr, w %num) {
 	%n1 =w phi @start %num, @loop1 %n2
 	%s0 =w phi @start 0, @loop1 %s1
 	%n2 =w sub %n1, 1
-	%c =w csle %n1, 0
+	%c =w cslew %n1, 0
 	jnz %c, @end, @loop1
 @loop1
 	%idx0 =l extsw %n2