WebAssembly: emit `(func (param t) (result t))` s-expressions

Summary: Match spec format: https://github.com/WebAssembly/spec/blob/master/ml-proto/test/fac.wasm

Reviewers: sunfish

Subscribers: llvm-commits, jfb

Differential Revision: http://reviews.llvm.org/D12307

llvm-svn: 245986

1 files changed, 36 insertions, 18 deletions

diff --git a/llvm/test/CodeGen/WebAssembly/integer32.ll b/llvm/test/CodeGen/WebAssembly/integer32.ll
index ab2d0b9497c..5051d0db30e 100644
--- a/llvm/test/CodeGen/WebAssembly/integer32.ll
+++ b/llvm/test/CodeGen/WebAssembly/integer32.ll
@@ -9,7 +9,8 @@ declare i32 @llvm.ctlz.i32(i32, i1)
 declare i32 @llvm.cttz.i32(i32, i1)
 declare i32 @llvm.ctpop.i32(i32)
 
-; CHECK-LABEL: add32:
+; CHECK-LABEL: (func $add32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (add @1 @0))
@@ -19,7 +20,8 @@ define i32 @add32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: sub32:
+; CHECK-LABEL: (func $sub32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (sub @1 @0))
@@ -29,7 +31,8 @@ define i32 @sub32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: mul32:
+; CHECK-LABEL: (func $mul32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (mul @1 @0))
@@ -39,7 +42,8 @@ define i32 @mul32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: sdiv32:
+; CHECK-LABEL: (func $sdiv32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (sdiv @1 @0))
@@ -49,7 +53,8 @@ define i32 @sdiv32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: udiv32:
+; CHECK-LABEL: (func $udiv32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (udiv @1 @0))
@@ -59,7 +64,8 @@ define i32 @udiv32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: srem32:
+; CHECK-LABEL: (func $srem32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (srem @1 @0))
@@ -69,7 +75,8 @@ define i32 @srem32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: urem32:
+; CHECK-LABEL: (func $urem32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (urem @1 @0))
@@ -79,7 +86,8 @@ define i32 @urem32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: and32:
+; CHECK-LABEL: (func $and32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (and @1 @0))
@@ -89,7 +97,8 @@ define i32 @and32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: ior32:
+; CHECK-LABEL: (func $ior32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (ior @1 @0))
@@ -99,7 +108,8 @@ define i32 @ior32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: xor32:
+; CHECK-LABEL: (func $xor32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (xor @1 @0))
@@ -109,7 +119,8 @@ define i32 @xor32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: shl32:
+; CHECK-LABEL: (func $shl32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (shl @1 @0))
@@ -119,7 +130,8 @@ define i32 @shl32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: shr32:
+; CHECK-LABEL: (func $shr32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (shr @1 @0))
@@ -129,7 +141,8 @@ define i32 @shr32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: sar32:
+; CHECK-LABEL: (func $sar32
+; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (setlocal @2 (sar @1 @0))
@@ -139,7 +152,8 @@ define i32 @sar32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: clz32:
+; CHECK-LABEL: (func $clz32
+; CHECK-NEXT: (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 0))
 ; CHECK-NEXT: (setlocal @1 (clz @0))
 ; CHECK-NEXT: (return @1)
@@ -148,7 +162,8 @@ define i32 @clz32(i32 %x) {
   ret i32 %a
 }
 
-; CHECK-LABEL: clz32_zero_undef:
+; CHECK-LABEL: (func $clz32_zero_undef
+; CHECK-NEXT: (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 0))
 ; CHECK-NEXT: (setlocal @1 (clz @0))
 ; CHECK-NEXT: (return @1)
@@ -157,7 +172,8 @@ define i32 @clz32_zero_undef(i32 %x) {
   ret i32 %a
 }
 
-; CHECK-LABEL: ctz32:
+; CHECK-LABEL: (func $ctz32
+; CHECK-NEXT: (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 0))
 ; CHECK-NEXT: (setlocal @1 (ctz @0))
 ; CHECK-NEXT: (return @1)
@@ -166,7 +182,8 @@ define i32 @ctz32(i32 %x) {
   ret i32 %a
 }
 
-; CHECK-LABEL: ctz32_zero_undef:
+; CHECK-LABEL: (func $ctz32_zero_undef
+; CHECK-NEXT: (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 0))
 ; CHECK-NEXT: (setlocal @1 (ctz @0))
 ; CHECK-NEXT: (return @1)
@@ -175,7 +192,8 @@ define i32 @ctz32_zero_undef(i32 %x) {
   ret i32 %a
 }
 
-; CHECK-LABEL: popcnt32:
+; CHECK-LABEL: (func $popcnt32
+; CHECK-NEXT: (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 0))
 ; CHECK-NEXT: (setlocal @1 (popcnt @0))
 ; CHECK-NEXT: (return @1)