[WebAssembly] Fix p2align in assembler.

Summary:
- Match the syntax output by InstPrinter.
- Fix it always emitting 0 for align. Had to work around fact that
  opcode is not available for GetDefaultP2Align while parsing.
- Updated tests that were erroneously happy with a p2align=0

Fixes https://bugs.llvm.org/show_bug.cgi?id=40752

Reviewers: aheejin, sbc100

Subscribers: jgravelle-google, sunfish, jfb, llvm-commits, dschuff

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D63633

llvm-svn: 364570

4 files changed, 56 insertions, 54 deletions

diff --git a/llvm/test/MC/WebAssembly/atomics-encodings.s b/llvm/test/MC/WebAssembly/atomics-encodings.s
index fff21462076..1bf52c9595e 100644
--- a/llvm/test/MC/WebAssembly/atomics-encodings.s
+++ b/llvm/test/MC/WebAssembly/atomics-encodings.s
@@ -4,146 +4,146 @@ main:
   .functype main () -> ()
 
   # FIXME This doesn't work because of PR40728. Enable this once it's fixed.
-  # C HECK:  atomic.notify 0:p2align=0 # encoding: [0xfe,0x00,0x00,0x00]
+  # C HECK:  atomic.notify 0 # encoding: [0xfe,0x00,0x00,0x00]
   # atomic.notify 0
-  # CHECK:  i32.atomic.wait 0:p2align=0 # encoding: [0xfe,0x01,0x00,0x00]
+  # CHECK:  i32.atomic.wait 0 # encoding: [0xfe,0x01,0x02,0x00]
   i32.atomic.wait 0
-  # CHECK:  i64.atomic.wait 0:p2align=0 # encoding: [0xfe,0x02,0x00,0x00]
+  # CHECK:  i64.atomic.wait 0 # encoding: [0xfe,0x02,0x03,0x00]
   i64.atomic.wait 0
 
-  # CHECK: i32.atomic.load 0:p2align=0 # encoding: [0xfe,0x10,0x00,0x00]
+  # CHECK: i32.atomic.load 0 # encoding: [0xfe,0x10,0x02,0x00]
   i32.atomic.load 0
-  # CHECK: i64.atomic.load 4:p2align=0 # encoding: [0xfe,0x11,0x00,0x04]
+  # CHECK: i64.atomic.load 4 # encoding: [0xfe,0x11,0x03,0x04]
   i64.atomic.load 4
   # CHECK:  i32.atomic.load8_u 48 # encoding: [0xfe,0x12,0x00,0x30]
   i32.atomic.load8_u 48
-  # CHECK:  i32.atomic.load16_u 0:p2align=0 # encoding: [0xfe,0x13,0x00,0x00]
+  # CHECK:  i32.atomic.load16_u 0 # encoding: [0xfe,0x13,0x01,0x00]
   i32.atomic.load16_u 0
   # CHECK:  i64.atomic.load8_u 0 # encoding: [0xfe,0x14,0x00,0x00]
   i64.atomic.load8_u 0
-  # CHECK:  i64.atomic.load16_u 0:p2align=0 # encoding: [0xfe,0x15,0x00,0x00]
+  # CHECK:  i64.atomic.load16_u 0 # encoding: [0xfe,0x15,0x01,0x00]
   i64.atomic.load16_u 0
-  # CHECK:  i64.atomic.load32_u 0:p2align=0 # encoding: [0xfe,0x16,0x00,0x00]
+  # CHECK:  i64.atomic.load32_u 0 # encoding: [0xfe,0x16,0x02,0x00]
   i64.atomic.load32_u 0
 
-  # CHECK:  i32.atomic.store 0:p2align=0 # encoding: [0xfe,0x17,0x00,0x00]
+  # CHECK:  i32.atomic.store 0 # encoding: [0xfe,0x17,0x02,0x00]
   i32.atomic.store 0
-  # CHECK:  i64.atomic.store 8:p2align=0 # encoding: [0xfe,0x18,0x00,0x08]
+  # CHECK:  i64.atomic.store 8 # encoding: [0xfe,0x18,0x03,0x08]
   i64.atomic.store 8
   # CHECK:  i32.atomic.store8 0 # encoding: [0xfe,0x19,0x00,0x00]
   i32.atomic.store8 0
-  # CHECK:  i32.atomic.store16 0:p2align=0 # encoding: [0xfe,0x1a,0x00,0x00]
+  # CHECK:  i32.atomic.store16 0 # encoding: [0xfe,0x1a,0x01,0x00]
   i32.atomic.store16 0
   # CHECK:  i64.atomic.store8 16 # encoding: [0xfe,0x1b,0x00,0x10]
   i64.atomic.store8 16
-  # CHECK:  i64.atomic.store16 0:p2align=0 # encoding: [0xfe,0x1c,0x00,0x00]
+  # CHECK:  i64.atomic.store16 0 # encoding: [0xfe,0x1c,0x01,0x00]
   i64.atomic.store16 0
-  # CHECK:  i64.atomic.store32 0:p2align=0 # encoding: [0xfe,0x1d,0x00,0x00]
+  # CHECK:  i64.atomic.store32 0 # encoding: [0xfe,0x1d,0x02,0x00]
   i64.atomic.store32 0
 
-  # CHECK:  i32.atomic.rmw.add 0:p2align=0 # encoding: [0xfe,0x1e,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.add 0 # encoding: [0xfe,0x1e,0x02,0x00]
   i32.atomic.rmw.add 0
-  # CHECK:  i64.atomic.rmw.add 0:p2align=0 # encoding: [0xfe,0x1f,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.add 0 # encoding: [0xfe,0x1f,0x03,0x00]
   i64.atomic.rmw.add 0
   # CHECK:  i32.atomic.rmw8.add_u 0 # encoding: [0xfe,0x20,0x00,0x00]
   i32.atomic.rmw8.add_u 0
-  # CHECK:  i32.atomic.rmw16.add_u 0:p2align=0 # encoding: [0xfe,0x21,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.add_u 0 # encoding: [0xfe,0x21,0x01,0x00]
   i32.atomic.rmw16.add_u 0
   # CHECK:  i64.atomic.rmw8.add_u 0 # encoding: [0xfe,0x22,0x00,0x00]
   i64.atomic.rmw8.add_u 0
-  # CHECK:  i64.atomic.rmw16.add_u 0:p2align=0 # encoding: [0xfe,0x23,0x00,0x00]
+  # CHECK:  i64.atomic.rmw16.add_u 0 # encoding: [0xfe,0x23,0x01,0x00]
   i64.atomic.rmw16.add_u 0
-  # CHECK:  i64.atomic.rmw32.add_u 16:p2align=0 # encoding: [0xfe,0x24,0x00,0x10]
+  # CHECK:  i64.atomic.rmw32.add_u 16 # encoding: [0xfe,0x24,0x02,0x10]
   i64.atomic.rmw32.add_u 16
 
-  # CHECK:  i32.atomic.rmw.sub 0:p2align=0 # encoding: [0xfe,0x25,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.sub 0 # encoding: [0xfe,0x25,0x02,0x00]
   i32.atomic.rmw.sub 0
-  # CHECK:  i64.atomic.rmw.sub 0:p2align=0 # encoding: [0xfe,0x26,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.sub 0 # encoding: [0xfe,0x26,0x03,0x00]
   i64.atomic.rmw.sub 0
   # CHECK:  i32.atomic.rmw8.sub_u 0 # encoding: [0xfe,0x27,0x00,0x00]
   i32.atomic.rmw8.sub_u 0
-  # CHECK:  i32.atomic.rmw16.sub_u 0:p2align=0 # encoding: [0xfe,0x28,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.sub_u 0 # encoding: [0xfe,0x28,0x01,0x00]
   i32.atomic.rmw16.sub_u 0
   # CHECK:  i64.atomic.rmw8.sub_u 8 # encoding: [0xfe,0x29,0x00,0x08]
   i64.atomic.rmw8.sub_u 8
-  # CHECK:  i64.atomic.rmw16.sub_u 0:p2align=0 # encoding: [0xfe,0x2a,0x00,0x00]
+  # CHECK:  i64.atomic.rmw16.sub_u 0 # encoding: [0xfe,0x2a,0x01,0x00]
   i64.atomic.rmw16.sub_u 0
-  # CHECK:  i64.atomic.rmw32.sub_u 0:p2align=0 # encoding: [0xfe,0x2b,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.sub_u 0 # encoding: [0xfe,0x2b,0x02,0x00]
   i64.atomic.rmw32.sub_u 0
 
-  # CHECK:  i32.atomic.rmw.and 0:p2align=0 # encoding: [0xfe,0x2c,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.and 0 # encoding: [0xfe,0x2c,0x02,0x00]
   i32.atomic.rmw.and 0
-  # CHECK:  i64.atomic.rmw.and 0:p2align=0 # encoding: [0xfe,0x2d,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.and 0 # encoding: [0xfe,0x2d,0x03,0x00]
   i64.atomic.rmw.and 0
   # CHECK:  i32.atomic.rmw8.and_u 0 # encoding: [0xfe,0x2e,0x00,0x00]
   i32.atomic.rmw8.and_u 0
-  # CHECK:  i32.atomic.rmw16.and_u 0:p2align=0 # encoding: [0xfe,0x2f,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.and_u 0 # encoding: [0xfe,0x2f,0x01,0x00]
   i32.atomic.rmw16.and_u 0
   # CHECK:  i64.atomic.rmw8.and_u 96 # encoding: [0xfe,0x30,0x00,0x60]
   i64.atomic.rmw8.and_u 96
-  # CHECK:  i64.atomic.rmw16.and_u 0:p2align=0 # encoding: [0xfe,0x31,0x00,0x00]
+  # CHECK:  i64.atomic.rmw16.and_u 0 # encoding: [0xfe,0x31,0x01,0x00]
   i64.atomic.rmw16.and_u 0
-  # CHECK:  i64.atomic.rmw32.and_u 0:p2align=0 # encoding: [0xfe,0x32,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.and_u 0 # encoding: [0xfe,0x32,0x02,0x00]
   i64.atomic.rmw32.and_u 0
 
-  # CHECK:  i32.atomic.rmw.or 0:p2align=0 # encoding: [0xfe,0x33,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.or 0 # encoding: [0xfe,0x33,0x02,0x00]
   i32.atomic.rmw.or 0
-  # CHECK:  i64.atomic.rmw.or 0:p2align=0 # encoding: [0xfe,0x34,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.or 0 # encoding: [0xfe,0x34,0x03,0x00]
   i64.atomic.rmw.or 0
   # CHECK:  i32.atomic.rmw8.or_u 0 # encoding: [0xfe,0x35,0x00,0x00]
   i32.atomic.rmw8.or_u 0
-  # CHECK:  i32.atomic.rmw16.or_u 0:p2align=0 # encoding: [0xfe,0x36,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.or_u 0 # encoding: [0xfe,0x36,0x01,0x00]
   i32.atomic.rmw16.or_u 0
   # CHECK:  i64.atomic.rmw8.or_u 0 # encoding: [0xfe,0x37,0x00,0x00]
   i64.atomic.rmw8.or_u 0
-  # CHECK:  i64.atomic.rmw16.or_u 48:p2align=0 # encoding: [0xfe,0x38,0x00,0x30]
+  # CHECK:  i64.atomic.rmw16.or_u 48 # encoding: [0xfe,0x38,0x01,0x30]
   i64.atomic.rmw16.or_u 48
-  # CHECK:  i64.atomic.rmw32.or_u 0:p2align=0 # encoding: [0xfe,0x39,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.or_u 0 # encoding: [0xfe,0x39,0x02,0x00]
   i64.atomic.rmw32.or_u 0
 
-  # CHECK:  i32.atomic.rmw.xor 0:p2align=0 # encoding: [0xfe,0x3a,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.xor 0 # encoding: [0xfe,0x3a,0x02,0x00]
   i32.atomic.rmw.xor 0
-  # CHECK:  i64.atomic.rmw.xor 0:p2align=0 # encoding: [0xfe,0x3b,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.xor 0 # encoding: [0xfe,0x3b,0x03,0x00]
   i64.atomic.rmw.xor 0
   # CHECK:  i32.atomic.rmw8.xor_u 4 # encoding: [0xfe,0x3c,0x00,0x04]
   i32.atomic.rmw8.xor_u 4
-  # CHECK:  i32.atomic.rmw16.xor_u 0:p2align=0 # encoding: [0xfe,0x3d,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.xor_u 0 # encoding: [0xfe,0x3d,0x01,0x00]
   i32.atomic.rmw16.xor_u 0
   # CHECK:  i64.atomic.rmw8.xor_u 0 # encoding: [0xfe,0x3e,0x00,0x00]
   i64.atomic.rmw8.xor_u 0
-  # CHECK:  i64.atomic.rmw16.xor_u 0:p2align=0 # encoding: [0xfe,0x3f,0x00,0x00]
+  # CHECK:  i64.atomic.rmw16.xor_u 0 # encoding: [0xfe,0x3f,0x01,0x00]
   i64.atomic.rmw16.xor_u 0
-  # CHECK:  i64.atomic.rmw32.xor_u 0:p2align=0 # encoding: [0xfe,0x40,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.xor_u 0 # encoding: [0xfe,0x40,0x02,0x00]
   i64.atomic.rmw32.xor_u 0
 
-  # CHECK:  i32.atomic.rmw.xchg 0:p2align=0 # encoding: [0xfe,0x41,0x00,0x00]
+  # CHECK:  i32.atomic.rmw.xchg 0 # encoding: [0xfe,0x41,0x02,0x00]
   i32.atomic.rmw.xchg 0
-  # CHECK:  i64.atomic.rmw.xchg 0:p2align=0 # encoding: [0xfe,0x42,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.xchg 0 # encoding: [0xfe,0x42,0x03,0x00]
   i64.atomic.rmw.xchg 0
   # CHECK:  i32.atomic.rmw8.xchg_u 0 # encoding: [0xfe,0x43,0x00,0x00]
   i32.atomic.rmw8.xchg_u 0
-  # CHECK:  i32.atomic.rmw16.xchg_u 0:p2align=0 # encoding: [0xfe,0x44,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.xchg_u 0 # encoding: [0xfe,0x44,0x01,0x00]
   i32.atomic.rmw16.xchg_u 0
   # CHECK:  i64.atomic.rmw8.xchg_u 0 # encoding: [0xfe,0x45,0x00,0x00]
   i64.atomic.rmw8.xchg_u 0
-  # CHECK:  i64.atomic.rmw16.xchg_u 8:p2align=0 # encoding: [0xfe,0x46,0x00,0x08]
+  # CHECK:  i64.atomic.rmw16.xchg_u 8 # encoding: [0xfe,0x46,0x01,0x08]
   i64.atomic.rmw16.xchg_u 8
-  # CHECK:  i64.atomic.rmw32.xchg_u 0:p2align=0 # encoding: [0xfe,0x47,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.xchg_u 0 # encoding: [0xfe,0x47,0x02,0x00]
   i64.atomic.rmw32.xchg_u 0
 
-  # CHECK:  i32.atomic.rmw.cmpxchg 32:p2align=0 # encoding: [0xfe,0x48,0x00,0x20]
+  # CHECK:  i32.atomic.rmw.cmpxchg 32 # encoding: [0xfe,0x48,0x02,0x20]
   i32.atomic.rmw.cmpxchg 32
-  # CHECK:  i64.atomic.rmw.cmpxchg 0:p2align=0 # encoding: [0xfe,0x49,0x00,0x00]
+  # CHECK:  i64.atomic.rmw.cmpxchg 0 # encoding: [0xfe,0x49,0x03,0x00]
   i64.atomic.rmw.cmpxchg 0
   # CHECK:  i32.atomic.rmw8.cmpxchg_u 0 # encoding: [0xfe,0x4a,0x00,0x00]
   i32.atomic.rmw8.cmpxchg_u 0
-  # CHECK:  i32.atomic.rmw16.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4b,0x00,0x00]
+  # CHECK:  i32.atomic.rmw16.cmpxchg_u 0 # encoding: [0xfe,0x4b,0x01,0x00]
   i32.atomic.rmw16.cmpxchg_u 0
   # CHECK:  i64.atomic.rmw8.cmpxchg_u 16 # encoding: [0xfe,0x4c,0x00,0x10]
   i64.atomic.rmw8.cmpxchg_u 16
-  # CHECK:  i64.atomic.rmw16.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4d,0x00,0x00]
+  # CHECK:  i64.atomic.rmw16.cmpxchg_u 0 # encoding: [0xfe,0x4d,0x01,0x00]
   i64.atomic.rmw16.cmpxchg_u 0
-  # CHECK:  i64.atomic.rmw32.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4e,0x00,0x00]
+  # CHECK:  i64.atomic.rmw32.cmpxchg_u 0 # encoding: [0xfe,0x4e,0x02,0x00]
   i64.atomic.rmw32.cmpxchg_u 0
 
   end_function
diff --git a/llvm/test/MC/WebAssembly/basic-assembly.s b/llvm/test/MC/WebAssembly/basic-assembly.s
index ec88cf6bbdc..87648f09206 100644
--- a/llvm/test/MC/WebAssembly/basic-assembly.s
+++ b/llvm/test/MC/WebAssembly/basic-assembly.s
@@ -17,7 +17,8 @@ test0:
     v128.const  0, 1, 2, 3, 4, 5, 6, 7
     # Indirect addressing:
     local.get   0
-    f64.store   0
+    f64.store   1234:p2align=4
+    f64.store   1234     # Natural alignment (3)
     # Loops, conditionals, binary ops, calls etc:
     block       i32
     i32.const   1
@@ -104,7 +105,8 @@ test0:
 # CHECK-NEXT:      v128.const  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
 # CHECK-NEXT:      v128.const  0, 1, 2, 3, 4, 5, 6, 7
 # CHECK-NEXT:      local.get   0
-# CHECK-NEXT:      f64.store   0:p2align=0
+# CHECK-NEXT:      f64.store   1234:p2align=4
+# CHECK-NEXT:      f64.store   1234
 # CHECK-NEXT:      block       i32
 # CHECK-NEXT:      i32.const   1
 # CHECK-NEXT:      local.get   0
diff --git a/llvm/test/MC/WebAssembly/reloc-pic.s b/llvm/test/MC/WebAssembly/reloc-pic.s
index 5a185541673..2b7ef54a3a5 100644
--- a/llvm/test/MC/WebAssembly/reloc-pic.s
+++ b/llvm/test/MC/WebAssembly/reloc-pic.s
@@ -109,10 +109,10 @@ hidden_func:
 # CHECK-NEXT:     Functions:
 # CHECK-NEXT:       - Index:           1
 # CHECK-NEXT:         Locals:          []
-# CHECK-NEXT:         Body:            2380808080002800000B
+# CHECK-NEXT:         Body:            2380808080002802000B
 # CHECK-NEXT:       - Index:           2
 # CHECK-NEXT:         Locals:          []
-# CHECK-NEXT:         Body:            2381808080002800000B
+# CHECK-NEXT:         Body:            2381808080002802000B
 # CHECK-NEXT:       - Index:           3
 # CHECK-NEXT:         Locals:          []
 # CHECK-NEXT:         Body:            2380808080004180808080006A0B
diff --git a/llvm/test/MC/WebAssembly/simd-encodings.s b/llvm/test/MC/WebAssembly/simd-encodings.s
index 0752f34e1d2..b2a39e7cce9 100644
--- a/llvm/test/MC/WebAssembly/simd-encodings.s
+++ b/llvm/test/MC/WebAssembly/simd-encodings.s
@@ -3,10 +3,10 @@
 main:
     .functype main () -> ()
 
-    # CHECK: v128.load 48:p2align=0 # encoding: [0xfd,0x00,0x00,0x30]
+    # CHECK: v128.load 48 # encoding: [0xfd,0x00,0x04,0x30]
     v128.load 48
 
-    # CHECK: v128.store 48:p2align=0 # encoding: [0xfd,0x01,0x00,0x30]
+    # CHECK: v128.store 48 # encoding: [0xfd,0x01,0x04,0x30]
     v128.store 48
 
     # CHECK: v128.const 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15