WebAssembly: fix load/store syntax

Summary: The syntax has changed a bit recently.

Reviewers: binji

Subscribers: llvm-commits, jfb, sunfish, dschuff

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250535 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/WebAssembly/WebAssemblyInstrMemory.td b/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
index 1a67b0aef4a928732d5c1cfec9d272ab961a8f5e..cdc72b69122ff185113a750b33463fb6782560de 100644 (file)
--- a/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
@@ -23,66 +23,66 @@
 // types when loading, and truncate when storing.
 
 // Basic load.
-def LOAD_I32_ : I<(outs I32:$dst), (ins I32:$addr),
-                  [(set I32:$dst, (load I32:$addr))]>;
-def LOAD_I64_ : I<(outs I64:$dst), (ins I32:$addr),
-                  [(set I64:$dst, (load I32:$addr))]>;
-def LOAD_F32_ : I<(outs F32:$dst), (ins I32:$addr),
-                  [(set F32:$dst, (load I32:$addr))]>;
-def LOAD_F64_ : I<(outs F64:$dst), (ins I32:$addr),
-                  [(set F64:$dst, (load I32:$addr))]>;
+def LOAD_I32 : I<(outs I32:$dst), (ins I32:$addr),
+                 [(set I32:$dst, (load I32:$addr))]>;
+def LOAD_I64 : I<(outs I64:$dst), (ins I32:$addr),
+                 [(set I64:$dst, (load I32:$addr))]>;
+def LOAD_F32 : I<(outs F32:$dst), (ins I32:$addr),
+                 [(set F32:$dst, (load I32:$addr))]>;
+def LOAD_F64 : I<(outs F64:$dst), (ins I32:$addr),
+                 [(set F64:$dst, (load I32:$addr))]>;
 
 // Extending load.
-def LOAD_S_i8_I32_  : I<(outs I32:$dst), (ins I32:$addr),
-                        [(set I32:$dst, (sextloadi8 I32:$addr))]>;
-def LOAD_U_i8_I32_  : I<(outs I32:$dst), (ins I32:$addr),
-                        [(set I32:$dst, (zextloadi8 I32:$addr))]>;
-def LOAD_S_i16_I32_ : I<(outs I32:$dst), (ins I32:$addr),
-                        [(set I32:$dst, (sextloadi16 I32:$addr))]>;
-def LOAD_U_i16_I32_ : I<(outs I32:$dst), (ins I32:$addr),
-                        [(set I32:$dst, (zextloadi16 I32:$addr))]>;
-def LOAD_S_i8_I64_  : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (sextloadi8 I32:$addr))]>;
-def LOAD_U_i8_I64_  : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (zextloadi8 I32:$addr))]>;
-def LOAD_S_i16_I64_ : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (sextloadi16 I32:$addr))]>;
-def LOAD_U_i16_I64_ : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (zextloadi16 I32:$addr))]>;
-def LOAD_S_I32_I64_ : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (sextloadi32 I32:$addr))]>;
-def LOAD_U_I32_I64_ : I<(outs I64:$dst), (ins I32:$addr),
-                        [(set I64:$dst, (zextloadi32 I32:$addr))]>;
+def LOAD8_S_I32  : I<(outs I32:$dst), (ins I32:$addr),
+                     [(set I32:$dst, (sextloadi8 I32:$addr))]>;
+def LOAD8_U_I32  : I<(outs I32:$dst), (ins I32:$addr),
+                     [(set I32:$dst, (zextloadi8 I32:$addr))]>;
+def LOAD16_S_I32 : I<(outs I32:$dst), (ins I32:$addr),
+                     [(set I32:$dst, (sextloadi16 I32:$addr))]>;
+def LOAD16_U_I32 : I<(outs I32:$dst), (ins I32:$addr),
+                     [(set I32:$dst, (zextloadi16 I32:$addr))]>;
+def LOAD8_S_I64  : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (sextloadi8 I32:$addr))]>;
+def LOAD8_U_I64  : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (zextloadi8 I32:$addr))]>;
+def LOAD16_S_I64 : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (sextloadi16 I32:$addr))]>;
+def LOAD16_U_I64 : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (zextloadi16 I32:$addr))]>;
+def LOAD32_S_I64 : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (sextloadi32 I32:$addr))]>;
+def LOAD32_U_I64 : I<(outs I64:$dst), (ins I32:$addr),
+                     [(set I64:$dst, (zextloadi32 I32:$addr))]>;
 
 // "Don't care" extending load become zero-extending load.
-def : Pat<(i32 (extloadi8 I32:$addr)),  (LOAD_U_i8_I32_ $addr)>;
-def : Pat<(i32 (extloadi16 I32:$addr)), (LOAD_U_i16_I32_ $addr)>;
-def : Pat<(i64 (extloadi8 I32:$addr)),  (LOAD_U_i8_I64_ $addr)>;
-def : Pat<(i64 (extloadi16 I32:$addr)), (LOAD_U_i16_I64_ $addr)>;
-def : Pat<(i64 (extloadi32 I32:$addr)), (LOAD_U_I32_I64_ $addr)>;
+def : Pat<(i32 (extloadi8 I32:$addr)),  (LOAD8_U_I32 $addr)>;
+def : Pat<(i32 (extloadi16 I32:$addr)), (LOAD16_U_I32 $addr)>;
+def : Pat<(i64 (extloadi8 I32:$addr)),  (LOAD8_U_I64 $addr)>;
+def : Pat<(i64 (extloadi16 I32:$addr)), (LOAD16_U_I64 $addr)>;
+def : Pat<(i64 (extloadi32 I32:$addr)), (LOAD32_U_I64 $addr)>;
 
 // Basic store.
 // Note: WebAssembly inverts SelectionDAG's usual operand order.
-def STORE_I32_  : I<(outs), (ins I32:$addr, I32:$val),
-                    [(store i32:$val, I32:$addr)]>;
-def STORE_I64_  : I<(outs), (ins I32:$addr, I64:$val),
-                    [(store i64:$val, I32:$addr)]>;
-def STORE_F32_  : I<(outs), (ins I32:$addr, F32:$val),
-                    [(store f32:$val, I32:$addr)]>;
-def STORE_F64_  : I<(outs), (ins I32:$addr, F64:$val),
-                    [(store f64:$val, I32:$addr)]>;
+def STORE_I32  : I<(outs), (ins I32:$addr, I32:$val),
+                   [(store i32:$val, I32:$addr)]>;
+def STORE_I64  : I<(outs), (ins I32:$addr, I64:$val),
+                   [(store i64:$val, I32:$addr)]>;
+def STORE_F32  : I<(outs), (ins I32:$addr, F32:$val),
+                   [(store f32:$val, I32:$addr)]>;
+def STORE_F64  : I<(outs), (ins I32:$addr, F64:$val),
+                   [(store f64:$val, I32:$addr)]>;
 
 // Truncating store.
-def STORE_i8_I32  : I<(outs), (ins I32:$addr, I32:$val),
-                      [(truncstorei8 I32:$val, I32:$addr)]>;
-def STORE_i16_I32 : I<(outs), (ins I32:$addr, I32:$val),
-                      [(truncstorei16 I32:$val, I32:$addr)]>;
-def STORE_i8_I64  : I<(outs), (ins I32:$addr, I64:$val),
-                      [(truncstorei8 I64:$val, I32:$addr)]>;
-def STORE_i16_I64 : I<(outs), (ins I32:$addr, I64:$val),
-                      [(truncstorei16 I64:$val, I32:$addr)]>;
-def STORE_I32_I64 : I<(outs), (ins I32:$addr, I64:$val),
-                      [(truncstorei32 I64:$val, I32:$addr)]>;
+def STORE8_I32  : I<(outs), (ins I32:$addr, I32:$val),
+                    [(truncstorei8 I32:$val, I32:$addr)]>;
+def STORE16_I32 : I<(outs), (ins I32:$addr, I32:$val),
+                    [(truncstorei16 I32:$val, I32:$addr)]>;
+def STORE8_I64  : I<(outs), (ins I32:$addr, I64:$val),
+                    [(truncstorei8 I64:$val, I32:$addr)]>;
+def STORE16_I64 : I<(outs), (ins I32:$addr, I64:$val),
+                    [(truncstorei16 I64:$val, I32:$addr)]>;
+def STORE32_I64 : I<(outs), (ins I32:$addr, I64:$val),
+                    [(truncstorei32 I64:$val, I32:$addr)]>;
 
 // Page size.
 def page_size_I32 : I<(outs I32:$dst), (ins),

diff --git a/test/CodeGen/WebAssembly/cfg-stackify.ll b/test/CodeGen/WebAssembly/cfg-stackify.ll
index 900adfdf5fb21c4d4b3fd6d5b4fb3028ffdeceba..e74f2b8cf13531934f4c2241aa296988f0eb264b 100644 (file)
--- a/test/CodeGen/WebAssembly/cfg-stackify.ll
+++ b/test/CodeGen/WebAssembly/cfg-stackify.ll
@@ -186,7 +186,7 @@ entry:
 ; CHECK-LABEL: minimal_loop:
 ; CHECK-NOT: br
 ; CHECK: BB7_1:
-; CHECK: store_i32 (get_local 1), (get_local 3){{$}}
+; CHECK: i32.store (get_local 1), (get_local 3){{$}}
 ; CHECK: br $BB7_1{{$}}
 define i32 @minimal_loop(i32* %p) {
 entry:

diff --git a/test/CodeGen/WebAssembly/load-ext.ll b/test/CodeGen/WebAssembly/load-ext.ll
index 369cd51ab3902ad09af7b482ffba6e32911c9dbf..deff7e44491b6e678a759b11ce5c5711087021ca 100644 (file)
--- a/test/CodeGen/WebAssembly/load-ext.ll
+++ b/test/CodeGen/WebAssembly/load-ext.ll
@@ -6,7 +6,7 @@ target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: sext_i8_i32:
-; CHECK: load_s_i8_i32 (get_local 1){{$}}
+; CHECK: i32.load8_s (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i32 @sext_i8_i32(i8 *%p) {
   %v = load i8, i8* %p
@@ -15,7 +15,7 @@ define i32 @sext_i8_i32(i8 *%p) {
 }
 
 ; CHECK-LABEL: zext_i8_i32:
-; CHECK: load_u_i8_i32 (get_local 1){{$}}
+; CHECK: i32.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i32 @zext_i8_i32(i8 *%p) {
   %v = load i8, i8* %p
@@ -24,7 +24,7 @@ define i32 @zext_i8_i32(i8 *%p) {
 }
 
 ; CHECK-LABEL: sext_i16_i32:
-; CHECK: load_s_i16_i32 (get_local 1){{$}}
+; CHECK: i32.load16_s (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i32 @sext_i16_i32(i16 *%p) {
   %v = load i16, i16* %p
@@ -33,7 +33,7 @@ define i32 @sext_i16_i32(i16 *%p) {
 }
 
 ; CHECK-LABEL: zext_i16_i32:
-; CHECK: load_u_i16_i32 (get_local 1){{$}}
+; CHECK: i32.load16_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i32 @zext_i16_i32(i16 *%p) {
   %v = load i16, i16* %p
@@ -42,7 +42,7 @@ define i32 @zext_i16_i32(i16 *%p) {
 }
 
 ; CHECK-LABEL: sext_i8_i64:
-; CHECK: load_s_i8_i64 (get_local 1){{$}}
+; CHECK: i64.load8_s (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i64 @sext_i8_i64(i8 *%p) {
   %v = load i8, i8* %p
@@ -51,7 +51,7 @@ define i64 @sext_i8_i64(i8 *%p) {
 }
 
 ; CHECK-LABEL: zext_i8_i64:
-; CHECK: load_u_i8_i64 (get_local 1){{$}}
+; CHECK: i64.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i64 @zext_i8_i64(i8 *%p) {
   %v = load i8, i8* %p
@@ -60,7 +60,7 @@ define i64 @zext_i8_i64(i8 *%p) {
 }
 
 ; CHECK-LABEL: sext_i16_i64:
-; CHECK: load_s_i16_i64 (get_local 1){{$}}
+; CHECK: i64.load16_s (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i64 @sext_i16_i64(i16 *%p) {
   %v = load i16, i16* %p
@@ -69,7 +69,7 @@ define i64 @sext_i16_i64(i16 *%p) {
 }
 
 ; CHECK-LABEL: zext_i16_i64:
-; CHECK: load_u_i16_i64 (get_local 1){{$}}
+; CHECK: i64.load16_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i64 @zext_i16_i64(i16 *%p) {
   %v = load i16, i16* %p
@@ -78,7 +78,7 @@ define i64 @zext_i16_i64(i16 *%p) {
 }
 
 ; CHECK-LABEL: sext_i32_i64:
-; CHECK: load_s_i32_i64 (get_local 1){{$}}
+; CHECK: i64.load32_s (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 define i64 @sext_i32_i64(i32 *%p) {
   %v = load i32, i32* %p
@@ -87,7 +87,7 @@ define i64 @sext_i32_i64(i32 *%p) {
 }
 
 ; CHECK-LABEL: zext_i32_i64:
-; CHECK: load_u_i32_i64 (get_local 1){{$}}
+; CHECK: i64.load32_u (get_local 1){{$}}
 ; CHECK: set_local 2, pop{{$}}
 define i64 @zext_i32_i64(i32 *%p) {
   %v = load i32, i32* %p

diff --git a/test/CodeGen/WebAssembly/load-store-i1.ll b/test/CodeGen/WebAssembly/load-store-i1.ll
index af1a82206aeae9433081dc95e260f608216b6b0b..8436af82f2e33973d4a83dbf0d0575a27a110b30 100644 (file)
--- a/test/CodeGen/WebAssembly/load-store-i1.ll
+++ b/test/CodeGen/WebAssembly/load-store-i1.ll
@@ -6,7 +6,7 @@ target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: load_u_i1_i32:
-; CHECK:      load_u_i8_i32 (get_local 1){{$}}
+; CHECK:      i32.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @load_u_i1_i32(i1* %p) {
@@ -16,7 +16,7 @@ define i32 @load_u_i1_i32(i1* %p) {
 }
 
 ; CHECK-LABEL: load_s_i1_i32:
-; CHECK:      load_u_i8_i32 (get_local 1){{$}}
+; CHECK:      i32.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: i32.const 31{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
@@ -32,7 +32,7 @@ define i32 @load_s_i1_i32(i1* %p) {
 }
 
 ; CHECK-LABEL: load_u_i1_i64:
-; CHECK:      load_u_i8_i64 (get_local 1){{$}}
+; CHECK:      i64.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @load_u_i1_i64(i1* %p) {
@@ -42,7 +42,7 @@ define i64 @load_u_i1_i64(i1* %p) {
 }
 
 ; CHECK-LABEL: load_s_i1_i64:
-; CHECK:      load_u_i8_i64 (get_local 1){{$}}
+; CHECK:      i64.load8_u (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: i64.const 63{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
@@ -62,7 +62,7 @@ define i64 @load_s_i1_i64(i1* %p) {
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: and (get_local 3), (get_local 4){{$}}
 ; CHECK-NEXT: set_local 5, pop{{$}}
-; CHECK-NEXT: store_i8 (get_local 2), (get_local 5){{$}}
+; CHECK-NEXT: i32.store8 (get_local 2), (get_local 5){{$}}
 define void @store_i32_i1(i1* %p, i32 %v) {
   %t = trunc i32 %v to i1
   store i1 %t, i1* %p
@@ -74,7 +74,7 @@ define void @store_i32_i1(i1* %p, i32 %v) {
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: and (get_local 3), (get_local 4){{$}}
 ; CHECK-NEXT: set_local 5, pop{{$}}
-; CHECK-NEXT: store_i8 (get_local 2), (get_local 5){{$}}
+; CHECK-NEXT: i64.store8 (get_local 2), (get_local 5){{$}}
 define void @store_i64_i1(i1* %p, i64 %v) {
   %t = trunc i64 %v to i1
   store i1 %t, i1* %p

diff --git a/test/CodeGen/WebAssembly/load.ll b/test/CodeGen/WebAssembly/load.ll
index 3d17bd2dc0ac9d2f76336a0b0f4f51da4d5d9287..e1eb67fffce5983005c5ea915c9dd76bb6960397 100644 (file)
--- a/test/CodeGen/WebAssembly/load.ll
+++ b/test/CodeGen/WebAssembly/load.ll
@@ -11,7 +11,7 @@ target triple = "wasm32-unknown-unknown"
 ; CHECK-NEXT: .local i32, i32{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 1, pop{{$}}
-; CHECK-NEXT: load_i32 (get_local 1){{$}}
+; CHECK-NEXT: i32.load (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define i32 @ldi32(i32 *%p) {
@@ -25,7 +25,7 @@ define i32 @ldi32(i32 *%p) {
 ; CHECK-NEXT: .local i32, i64{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 1, pop{{$}}
-; CHECK-NEXT: load_i64 (get_local 1){{$}}
+; CHECK-NEXT: i64.load (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define i64 @ldi64(i64 *%p) {
@@ -39,7 +39,7 @@ define i64 @ldi64(i64 *%p) {
 ; CHECK-NEXT: .local i32, f32{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 1, pop{{$}}
-; CHECK-NEXT: load_f32 (get_local 1){{$}}
+; CHECK-NEXT: f32.load (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define float @ldf32(float *%p) {
@@ -53,7 +53,7 @@ define float @ldf32(float *%p) {
 ; CHECK-NEXT: .local i32, f64{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 1, pop{{$}}
-; CHECK-NEXT: load_f64 (get_local 1){{$}}
+; CHECK-NEXT: f64.load (get_local 1){{$}}
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: return (get_local 2){{$}}
 define double @ldf64(double *%p) {

diff --git a/test/CodeGen/WebAssembly/store-trunc.ll b/test/CodeGen/WebAssembly/store-trunc.ll
index 349cffaea2f5914bf01d50e73513951831d37f0e..81214dbbadb23587596106c7ca28bbd1b93807f1 100644 (file)
--- a/test/CodeGen/WebAssembly/store-trunc.ll
+++ b/test/CodeGen/WebAssembly/store-trunc.ll
@@ -6,7 +6,7 @@ target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: trunc_i8_i32:
-; CHECK: store_i8 (get_local 3), (get_local 2){{$}}
+; CHECK: i32.store8 (get_local 3), (get_local 2){{$}}
 define void @trunc_i8_i32(i8 *%p, i32 %v) {
   %t = trunc i32 %v to i8
   store i8 %t, i8* %p
@@ -14,7 +14,7 @@ define void @trunc_i8_i32(i8 *%p, i32 %v) {
 }
 
 ; CHECK-LABEL: trunc_i16_i32:
-; CHECK: store_i16 (get_local 3), (get_local 2){{$}}
+; CHECK: i32.store16 (get_local 3), (get_local 2){{$}}
 define void @trunc_i16_i32(i16 *%p, i32 %v) {
   %t = trunc i32 %v to i16
   store i16 %t, i16* %p
@@ -22,7 +22,7 @@ define void @trunc_i16_i32(i16 *%p, i32 %v) {
 }
 
 ; CHECK-LABEL: trunc_i8_i64:
-; CHECK: store_i8 (get_local 3), (get_local 2){{$}}
+; CHECK: i64.store8 (get_local 3), (get_local 2){{$}}
 define void @trunc_i8_i64(i8 *%p, i64 %v) {
   %t = trunc i64 %v to i8
   store i8 %t, i8* %p
@@ -30,7 +30,7 @@ define void @trunc_i8_i64(i8 *%p, i64 %v) {
 }
 
 ; CHECK-LABEL: trunc_i16_i64:
-; CHECK: store_i16 (get_local 3), (get_local 2){{$}}
+; CHECK: i64.store16 (get_local 3), (get_local 2){{$}}
 define void @trunc_i16_i64(i16 *%p, i64 %v) {
   %t = trunc i64 %v to i16
   store i16 %t, i16* %p
@@ -38,7 +38,7 @@ define void @trunc_i16_i64(i16 *%p, i64 %v) {
 }
 
 ; CHECK-LABEL: trunc_i32_i64:
-; CHECK: store_i32 (get_local 3), (get_local 2){{$}}
+; CHECK: i64.store32 (get_local 3), (get_local 2){{$}}
 define void @trunc_i32_i64(i32 *%p, i64 %v) {
   %t = trunc i64 %v to i32
   store i32 %t, i32* %p

diff --git a/test/CodeGen/WebAssembly/store.ll b/test/CodeGen/WebAssembly/store.ll
index 0db9120cbe0d6472c53160e0f80ee25faad11509..88909a49db8350f117dadf7e3ba0425cf7ae80fc 100644 (file)
--- a/test/CodeGen/WebAssembly/store.ll
+++ b/test/CodeGen/WebAssembly/store.ll
@@ -13,7 +13,7 @@ target triple = "wasm32-unknown-unknown"
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: store_i32 (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: i32.store (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: return{{$}}
 define void @sti32(i32 *%p, i32 %v) {
   store i32 %v, i32* %p
@@ -28,7 +28,7 @@ define void @sti32(i32 *%p, i32 %v) {
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: store_i64 (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: i64.store (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: return{{$}}
 define void @sti64(i64 *%p, i64 %v) {
   store i64 %v, i64* %p
@@ -43,7 +43,7 @@ define void @sti64(i64 *%p, i64 %v) {
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: store_f32 (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: f32.store (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: return{{$}}
 define void @stf32(float *%p, float %v) {
   store float %v, float* %p
@@ -58,7 +58,7 @@ define void @stf32(float *%p, float %v) {
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: store_f64 (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: f64.store (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: return{{$}}
 define void @stf64(double *%p, double %v) {
   store double %v, double* %p