[WebAssembly] Enable register coloring and register stackifying.
This also takes the push/pop syntax another step forward, introducing stack
slot numbers to make it easier to see how expressions are connected. For
example, the value pushed in $push7 is popped in $pop7.
And, this begins an experiment with making get_local and set_local implicit
when an operation directly uses or defines a register. This greatly reduces
clutter. If this experiment succeeds, it may make sense to do this for
const instructions as well.
And, this introduces more special code for ARGUMENTS; hopefully this code
will soon be obviated by proper support for live-in virtual registers.
llvm-svn: 253465
diff --git a/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll b/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
index 87297d3..80fbd0c 100644
--- a/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
+++ b/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
@@ -10,14 +10,10 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: .local f32, f32, i32, i32, i32{{$}}
-; CHECK-NEXT: f32.eq $push, (get_local 1), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
-; CHECK-NEXT: f32.eq $push, (get_local 0), (get_local 0){{$}}
-; CHECK-NEXT: set_local 3, $pop{{$}}
-; CHECK-NEXT: i32.and $push, (get_local 3), (get_local 2){{$}}
-; CHECK-NEXT: set_local 4, $pop{{$}}
-; CHECK-NEXT: return (get_local 4){{$}}
+; CHECK-NEXT: f32.eq $push[[NUM0:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.eq $push[[NUM1:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.and $push[[NUM2:[0-9]+]], $pop[[NUM0]], $pop[[NUM1]]{{$}}
+; CHECK-NEXT: return $pop[[NUM2]]{{$}}
define i32 @ord_f32(float %x, float %y) {
%a = fcmp ord float %x, %y
%b = zext i1 %a to i32
@@ -28,14 +24,10 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: .local f32, f32, i32, i32, i32{{$}}
-; CHECK-NEXT: f32.ne $push, (get_local 1), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
-; CHECK-NEXT: f32.ne $push, (get_local 0), (get_local 0){{$}}
-; CHECK-NEXT: set_local 3, $pop{{$}}
-; CHECK-NEXT: i32.or $push, (get_local 3), (get_local 2){{$}}
-; CHECK-NEXT: set_local 4, $pop{{$}}
-; CHECK-NEXT: return (get_local 4){{$}}
+; CHECK-NEXT: f32.ne $push[[NUM0:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM2:[0-9]+]], $pop[[NUM0]], $pop[[NUM1]]{{$}}
+; CHECK-NEXT: return $pop[[NUM2]]{{$}}
define i32 @uno_f32(float %x, float %y) {
%a = fcmp uno float %x, %y
%b = zext i1 %a to i32
@@ -46,10 +38,8 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: .local f32, f32, i32{{$}}
-; CHECK-NEXT: f32.eq $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
-; CHECK-NEXT: return (get_local 2){{$}}
+; CHECK-NEXT: f32.eq $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @oeq_f32(float %x, float %y) {
%a = fcmp oeq float %x, %y
%b = zext i1 %a to i32
@@ -57,8 +47,8 @@
}
; CHECK-LABEL: une_f32:
-; CHECK: f32.ne $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK: f32.ne $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @une_f32(float %x, float %y) {
%a = fcmp une float %x, %y
%b = zext i1 %a to i32
@@ -66,8 +56,8 @@
}
; CHECK-LABEL: olt_f32:
-; CHECK: f32.lt $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK: f32.lt $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @olt_f32(float %x, float %y) {
%a = fcmp olt float %x, %y
%b = zext i1 %a to i32
@@ -75,8 +65,8 @@
}
; CHECK-LABEL: ole_f32:
-; CHECK: f32.le $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK: f32.le $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @ole_f32(float %x, float %y) {
%a = fcmp ole float %x, %y
%b = zext i1 %a to i32
@@ -84,8 +74,8 @@
}
; CHECK-LABEL: ogt_f32:
-; CHECK: f32.gt $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK: f32.gt $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @ogt_f32(float %x, float %y) {
%a = fcmp ogt float %x, %y
%b = zext i1 %a to i32
@@ -93,8 +83,8 @@
}
; CHECK-LABEL: oge_f32:
-; CHECK: f32.ge $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK: f32.ge $push[[NUM:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: return $pop[[NUM]]{{$}}
define i32 @oge_f32(float %x, float %y) {
%a = fcmp oge float %x, %y
%b = zext i1 %a to i32
@@ -107,18 +97,12 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: .local f32, f32, i32, i32, i32, i32, i32{{$}}
-; CHECK-NEXT: f32.eq $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
-; CHECK-NEXT: f32.ne $push, (get_local 1), (get_local 1){{$}}
-; CHECK-NEXT: set_local 3, $pop{{$}}
-; CHECK-NEXT: f32.ne $push, (get_local 0), (get_local 0){{$}}
-; CHECK-NEXT: set_local 4, $pop{{$}}
-; CHECK-NEXT: i32.or $push, (get_local 4), (get_local 3){{$}}
-; CHECK-NEXT: set_local 5, $pop{{$}}
-; CHECK-NEXT: i32.or $push, (get_local 2), (get_local 5){{$}}
-; CHECK-NEXT: set_local 6, $pop{{$}}
-; CHECK-NEXT: return (get_local 6){{$}}
+; CHECK-NEXT: f32.eq $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.or $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]{{$}}
define i32 @ueq_f32(float %x, float %y) {
%a = fcmp ueq float %x, %y
%b = zext i1 %a to i32
@@ -126,8 +110,15 @@
}
; CHECK-LABEL: one_f32:
-; CHECK: f32.ne $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK-NEXT: .param f32
+; CHECK-NEXT: .param f32
+; CHECK-NEXT: .result i32
+; CHECK-NEXT: f32.ne $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.eq $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.eq $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.and $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.and $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]
define i32 @one_f32(float %x, float %y) {
%a = fcmp one float %x, %y
%b = zext i1 %a to i32
@@ -135,8 +126,15 @@
}
; CHECK-LABEL: ult_f32:
-; CHECK: f32.lt $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .result i32{{$}}
+; CHECK-NEXT: f32.lt $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.or $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]{{$}}
define i32 @ult_f32(float %x, float %y) {
%a = fcmp ult float %x, %y
%b = zext i1 %a to i32
@@ -144,8 +142,15 @@
}
; CHECK-LABEL: ule_f32:
-; CHECK: f32.le $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .result i32{{$}}
+; CHECK-NEXT: f32.le $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.or $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]{{$}}
define i32 @ule_f32(float %x, float %y) {
%a = fcmp ule float %x, %y
%b = zext i1 %a to i32
@@ -153,8 +158,15 @@
}
; CHECK-LABEL: ugt_f32:
-; CHECK: f32.gt $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .result i32{{$}}
+; CHECK-NEXT: f32.gt $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.or $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]{{$}}
define i32 @ugt_f32(float %x, float %y) {
%a = fcmp ugt float %x, %y
%b = zext i1 %a to i32
@@ -162,8 +174,15 @@
}
; CHECK-LABEL: uge_f32:
-; CHECK: f32.ge $push, (get_local 0), (get_local 1){{$}}
-; CHECK-NEXT: set_local 2, $pop{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .param f32{{$}}
+; CHECK-NEXT: .result i32{{$}}
+; CHECK-NEXT: f32.ge $push[[NUM0:[0-9]+]], $0, $1{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM1:[0-9]+]], $0, $0{{$}}
+; CHECK-NEXT: f32.ne $push[[NUM2:[0-9]+]], $1, $1{{$}}
+; CHECK-NEXT: i32.or $push[[NUM3:[0-9]+]], $pop[[NUM1]], $pop[[NUM2]]{{$}}
+; CHECK-NEXT: i32.or $push[[NUM4:[0-9]+]], $pop[[NUM0]], $pop[[NUM3]]{{$}}
+; CHECK-NEXT: return $pop[[NUM4]]{{$}}
define i32 @uge_f32(float %x, float %y) {
%a = fcmp uge float %x, %y
%b = zext i1 %a to i32