WebAssembly: update syntax

Summary:
Follow the same syntax as for the spec repo. Both have evolved slightly
independently and need to converge again.

This, along with wasmate changes, allows me to do the following:

  echo "int add(int a, int b) { return a + b; }" > add.c
  ./out/bin/clang -O2 -S --target=wasm32-unknown-unknown add.c -o add.wack
  ./experimental/prototype-wasmate/wasmate.py add.wack > add.wast
  ./sexpr-wasm-prototype/out/sexpr-wasm add.wast -o add.wasm
  ./sexpr-wasm-prototype/third_party/v8-native-prototype/v8/v8/out/Release/d8 -e "print(WASM.instantiateModule(readbuffer('add.wasm'), {print:print}).add(42, 1337));"

As you'd expect, the d8 shell prints out the right value.

Reviewers: sunfish

Subscribers: jfb, llvm-commits, dschuff

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

llvm-svn: 250480

1 files changed, 126 insertions, 105 deletions

diff --git a/llvm/test/CodeGen/WebAssembly/conv.ll b/llvm/test/CodeGen/WebAssembly/conv.ll
index 0742c55bb7a..db00e1b15fa 100644
--- a/llvm/test/CodeGen/WebAssembly/conv.ll
+++ b/llvm/test/CodeGen/WebAssembly/conv.ll
@@ -8,11 +8,12 @@ target triple = "wasm32-unknown-unknown"
 ; CHECK-LABEL: i32_wrap_i64:
 ; CHECK-NEXT: .param i64{{$}}
 ; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i32_wrap @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i64, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i32_wrap (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @i32_wrap_i64(i64 %x) {
   %a = trunc i64 %x to i32
   ret i32 %a
@@ -21,11 +22,12 @@ define i32 @i32_wrap_i64(i64 %x) {
 ; CHECK-LABEL: i64_extend_s_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_extend_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_extend_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_extend_s_i32(i32 %x) {
   %a = sext i32 %x to i64
   ret i64 %a
@@ -34,11 +36,12 @@ define i64 @i64_extend_s_i32(i32 %x) {
 ; CHECK-LABEL: i64_extend_u_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_extend_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_extend_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_extend_u_i32(i32 %x) {
   %a = zext i32 %x to i64
   ret i64 %a
@@ -47,11 +50,12 @@ define i64 @i64_extend_u_i32(i32 %x) {
 ; CHECK-LABEL: i32_trunc_s_f32:
 ; CHECK-NEXT: .param f32
 ; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i32_trunc_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f32, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i32_trunc_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @i32_trunc_s_f32(float %x) {
   %a = fptosi float %x to i32
   ret i32 %a
@@ -60,11 +64,12 @@ define i32 @i32_trunc_s_f32(float %x) {
 ; CHECK-LABEL: i32_trunc_u_f32:
 ; CHECK-NEXT: .param f32
 ; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i32_trunc_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f32, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i32_trunc_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @i32_trunc_u_f32(float %x) {
   %a = fptoui float %x to i32
   ret i32 %a
@@ -73,11 +78,12 @@ define i32 @i32_trunc_u_f32(float %x) {
 ; CHECK-LABEL: i32_trunc_s_f64:
 ; CHECK-NEXT: .param f64
 ; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i32_trunc_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f64, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i32_trunc_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @i32_trunc_s_f64(double %x) {
   %a = fptosi double %x to i32
   ret i32 %a
@@ -86,11 +92,12 @@ define i32 @i32_trunc_s_f64(double %x) {
 ; CHECK-LABEL: i32_trunc_u_f64:
 ; CHECK-NEXT: .param f64
 ; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i32_trunc_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f64, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i32_trunc_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @i32_trunc_u_f64(double %x) {
   %a = fptoui double %x to i32
   ret i32 %a
@@ -99,11 +106,12 @@ define i32 @i32_trunc_u_f64(double %x) {
 ; CHECK-LABEL: i64_trunc_s_f32:
 ; CHECK-NEXT: .param f32
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_trunc_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f32, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_trunc_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_trunc_s_f32(float %x) {
   %a = fptosi float %x to i64
   ret i64 %a
@@ -112,11 +120,12 @@ define i64 @i64_trunc_s_f32(float %x) {
 ; CHECK-LABEL: i64_trunc_u_f32:
 ; CHECK-NEXT: .param f32
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_trunc_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f32, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_trunc_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_trunc_u_f32(float %x) {
   %a = fptoui float %x to i64
   ret i64 %a
@@ -125,11 +134,12 @@ define i64 @i64_trunc_u_f32(float %x) {
 ; CHECK-LABEL: i64_trunc_s_f64:
 ; CHECK-NEXT: .param f64
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_trunc_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f64, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_trunc_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_trunc_s_f64(double %x) {
   %a = fptosi double %x to i64
   ret i64 %a
@@ -138,11 +148,12 @@ define i64 @i64_trunc_s_f64(double %x) {
 ; CHECK-LABEL: i64_trunc_u_f64:
 ; CHECK-NEXT: .param f64
 ; CHECK-NEXT: .result i64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: i64_trunc_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f64, i64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: i64_trunc_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @i64_trunc_u_f64(double %x) {
   %a = fptoui double %x to i64
   ret i64 %a
@@ -151,11 +162,12 @@ define i64 @i64_trunc_u_f64(double %x) {
 ; CHECK-LABEL: f32_convert_s_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result f32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f32_convert_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, f32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f32_convert_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define float @f32_convert_s_i32(i32 %x) {
   %a = sitofp i32 %x to float
   ret float %a
@@ -164,11 +176,12 @@ define float @f32_convert_s_i32(i32 %x) {
 ; CHECK-LABEL: f32_convert_u_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result f32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f32_convert_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, f32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f32_convert_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define float @f32_convert_u_i32(i32 %x) {
   %a = uitofp i32 %x to float
   ret float %a
@@ -177,11 +190,12 @@ define float @f32_convert_u_i32(i32 %x) {
 ; CHECK-LABEL: f64_convert_s_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result f64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f64_convert_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, f64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f64_convert_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define double @f64_convert_s_i32(i32 %x) {
   %a = sitofp i32 %x to double
   ret double %a
@@ -190,11 +204,12 @@ define double @f64_convert_s_i32(i32 %x) {
 ; CHECK-LABEL: f64_convert_u_i32:
 ; CHECK-NEXT: .param i32
 ; CHECK-NEXT: .result f64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f64_convert_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i32, f64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f64_convert_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define double @f64_convert_u_i32(i32 %x) {
   %a = uitofp i32 %x to double
   ret double %a
@@ -203,11 +218,12 @@ define double @f64_convert_u_i32(i32 %x) {
 ; CHECK-LABEL: f32_convert_s_i64:
 ; CHECK-NEXT: .param i64
 ; CHECK-NEXT: .result f32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f32_convert_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i64, f32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f32_convert_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define float @f32_convert_s_i64(i64 %x) {
   %a = sitofp i64 %x to float
   ret float %a
@@ -216,11 +232,12 @@ define float @f32_convert_s_i64(i64 %x) {
 ; CHECK-LABEL: f32_convert_u_i64:
 ; CHECK-NEXT: .param i64
 ; CHECK-NEXT: .result f32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f32_convert_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i64, f32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f32_convert_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define float @f32_convert_u_i64(i64 %x) {
   %a = uitofp i64 %x to float
   ret float %a
@@ -229,11 +246,12 @@ define float @f32_convert_u_i64(i64 %x) {
 ; CHECK-LABEL: f64_convert_s_i64:
 ; CHECK-NEXT: .param i64
 ; CHECK-NEXT: .result f64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f64_convert_s @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i64, f64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f64_convert_s (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define double @f64_convert_s_i64(i64 %x) {
   %a = sitofp i64 %x to double
   ret double %a
@@ -242,11 +260,12 @@ define double @f64_convert_s_i64(i64 %x) {
 ; CHECK-LABEL: f64_convert_u_i64:
 ; CHECK-NEXT: .param i64
 ; CHECK-NEXT: .result f64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f64_convert_u @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local i64, f64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f64_convert_u (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define double @f64_convert_u_i64(i64 %x) {
   %a = uitofp i64 %x to double
   ret double %a
@@ -255,11 +274,12 @@ define double @f64_convert_u_i64(i64 %x) {
 ; CHECK-LABEL: f64_promote_f32:
 ; CHECK-NEXT: .param f32
 ; CHECK-NEXT: .result f64
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f64_promote @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f32, f64{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f64_promote (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define double @f64_promote_f32(float %x) {
   %a = fpext float %x to double
   ret double %a
@@ -268,11 +288,12 @@ define double @f64_promote_f32(float %x) {
 ; CHECK-LABEL: f32_demote_f64:
 ; CHECK-NEXT: .param f64
 ; CHECK-NEXT: .result f32
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @1, pop{{$}}
-; CHECK-NEXT: f32_demote @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: return @2{{$}}
+; CHECK-NEXT: .local f64, f32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 1, pop{{$}}
+; CHECK-NEXT: f32_demote (get_local 1){{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: return (get_local 2){{$}}
 define float @f32_demote_f64(double %x) {
   %a = fptrunc double %x to float
   ret float %a