Skip to content

Commit 3477bd1

Browse files
aheejinaheejin
committedFeb 20, 2019
[WebAssembly] Fix load/store name detection for atomic instructions
Summary: Fixed a bug in the routine in AsmParser that determines whether the current instruction is a load or a store. Atomic instructions' prefixes are not `atomic_` but `atomic.`, and all atomic instructions are also memory instructions. Also fixed the printing format of atomic instructions to match other memory instructions and added encoding tests for atomic instructions. Reviewers: aardappel, tlively Subscribers: dschuff, sbc100, jgravelle-google, sunfish, jfb, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D58337 llvm-svn: 354419
1 parent dfe7bbc commit 3477bd1

File tree

3 files changed

+155
-7
lines changed

3 files changed

+155
-7
lines changed
 

Diff for: ‎llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ class WebAssemblyAsmParser final : public MCTargetAsmParser {
348348
// FIXME: there is probably a cleaner way to do this.
349349
auto IsLoadStore = InstName.startswith("load") ||
350350
InstName.startswith("store") ||
351-
InstName.startswith("atomic_load") ||
352-
InstName.startswith("atomic_store");
351+
InstName.startswith("atomic");
353352
if (IsLoadStore) {
354353
// Parse load/store operands of the form: offset align
355354
auto &Offset = Lexer.getTok();

Diff for: ‎llvm/lib/Target/WebAssembly/WebAssemblyInstrAtomics.td

+5-5
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ multiclass WebAssemblyBinRMW<WebAssemblyRegClass rc, string Name, int Opcode> {
337337
(ins P2Align:$p2align, offset32_op:$off, I32:$addr, rc:$val),
338338
(outs), (ins P2Align:$p2align, offset32_op:$off), [],
339339
!strconcat(Name, "\t$dst, ${off}(${addr})${p2align}, $val"),
340-
!strconcat(Name, "\t${off}, ${p2align}"), Opcode>;
340+
!strconcat(Name, "\t${off}${p2align}"), Opcode>;
341341
}
342342

343343
defm ATOMIC_RMW_ADD_I32 : WebAssemblyBinRMW<I32, "i32.atomic.rmw.add", 0xfe1e>;
@@ -668,7 +668,7 @@ multiclass WebAssemblyTerRMW<WebAssemblyRegClass rc, string Name, int Opcode> {
668668
rc:$new),
669669
(outs), (ins P2Align:$p2align, offset32_op:$off), [],
670670
!strconcat(Name, "\t$dst, ${off}(${addr})${p2align}, $exp, $new"),
671-
!strconcat(Name, "\t${off}, ${p2align}"), Opcode>;
671+
!strconcat(Name, "\t${off}${p2align}"), Opcode>;
672672
}
673673

674674
defm ATOMIC_RMW_CMPXCHG_I32 :
@@ -901,20 +901,20 @@ defm ATOMIC_NOTIFY :
901901
(ins P2Align:$p2align, offset32_op:$off, I32:$addr, I32:$count),
902902
(outs), (ins P2Align:$p2align, offset32_op:$off), [],
903903
"atomic.notify \t$dst, ${off}(${addr})${p2align}, $count",
904-
"atomic.notify \t${off}, ${p2align}", 0xfe00>;
904+
"atomic.notify \t${off}${p2align}", 0xfe00>;
905905
let mayLoad = 1 in {
906906
defm ATOMIC_WAIT_I32 :
907907
I<(outs I32:$dst),
908908
(ins P2Align:$p2align, offset32_op:$off, I32:$addr, I32:$exp, I64:$timeout),
909909
(outs), (ins P2Align:$p2align, offset32_op:$off), [],
910910
"i32.atomic.wait \t$dst, ${off}(${addr})${p2align}, $exp, $timeout",
911-
"i32.atomic.wait \t${off}, ${p2align}", 0xfe01>;
911+
"i32.atomic.wait \t${off}${p2align}", 0xfe01>;
912912
defm ATOMIC_WAIT_I64 :
913913
I<(outs I32:$dst),
914914
(ins P2Align:$p2align, offset32_op:$off, I32:$addr, I64:$exp, I64:$timeout),
915915
(outs), (ins P2Align:$p2align, offset32_op:$off), [],
916916
"i64.atomic.wait \t$dst, ${off}(${addr})${p2align}, $exp, $timeout",
917-
"i64.atomic.wait \t${off}, ${p2align}", 0xfe02>;
917+
"i64.atomic.wait \t${off}${p2align}", 0xfe02>;
918918
} // mayLoad = 1
919919
} // hasSideEffects = 1
920920

Diff for: ‎llvm/test/MC/WebAssembly/atomics-encodings.s

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
# RUN: llvm-mc -show-encoding -triple=wasm32-unkown-unknown -mattr=+atomics < %s | FileCheck %s
2+
3+
main:
4+
.functype main () -> ()
5+
6+
# FIXME This doesn't work because of PR40728. Enable this once it's fixed.
7+
# C HECK: atomic.notify 0:p2align=0 # encoding: [0xfe,0x00,0x00,0x00]
8+
# atomic.notify 0
9+
# CHECK: i32.atomic.wait 0:p2align=0 # encoding: [0xfe,0x01,0x00,0x00]
10+
i32.atomic.wait 0
11+
# CHECK: i64.atomic.wait 0:p2align=0 # encoding: [0xfe,0x02,0x00,0x00]
12+
i64.atomic.wait 0
13+
14+
# CHECK: i32.atomic.load 0:p2align=0 # encoding: [0xfe,0x10,0x00,0x00]
15+
i32.atomic.load 0
16+
# CHECK: i64.atomic.load 4:p2align=0 # encoding: [0xfe,0x11,0x00,0x04]
17+
i64.atomic.load 4
18+
# CHECK: i32.atomic.load8_u 48 # encoding: [0xfe,0x12,0x00,0x30]
19+
i32.atomic.load8_u 48
20+
# CHECK: i32.atomic.load16_u 0:p2align=0 # encoding: [0xfe,0x13,0x00,0x00]
21+
i32.atomic.load16_u 0
22+
# CHECK: i64.atomic.load8_u 0 # encoding: [0xfe,0x14,0x00,0x00]
23+
i64.atomic.load8_u 0
24+
# CHECK: i64.atomic.load16_u 0:p2align=0 # encoding: [0xfe,0x15,0x00,0x00]
25+
i64.atomic.load16_u 0
26+
# CHECK: i64.atomic.load32_u 0:p2align=0 # encoding: [0xfe,0x16,0x00,0x00]
27+
i64.atomic.load32_u 0
28+
29+
# CHECK: i32.atomic.store 0:p2align=0 # encoding: [0xfe,0x17,0x00,0x00]
30+
i32.atomic.store 0
31+
# CHECK: i64.atomic.store 8:p2align=0 # encoding: [0xfe,0x18,0x00,0x08]
32+
i64.atomic.store 8
33+
# CHECK: i32.atomic.store8 0 # encoding: [0xfe,0x19,0x00,0x00]
34+
i32.atomic.store8 0
35+
# CHECK: i32.atomic.store16 0:p2align=0 # encoding: [0xfe,0x1a,0x00,0x00]
36+
i32.atomic.store16 0
37+
# CHECK: i64.atomic.store8 16 # encoding: [0xfe,0x1b,0x00,0x10]
38+
i64.atomic.store8 16
39+
# CHECK: i64.atomic.store16 0:p2align=0 # encoding: [0xfe,0x1c,0x00,0x00]
40+
i64.atomic.store16 0
41+
# CHECK: i64.atomic.store32 0:p2align=0 # encoding: [0xfe,0x1d,0x00,0x00]
42+
i64.atomic.store32 0
43+
44+
# CHECK: i32.atomic.rmw.add 0:p2align=0 # encoding: [0xfe,0x1e,0x00,0x00]
45+
i32.atomic.rmw.add 0
46+
# CHECK: i64.atomic.rmw.add 0:p2align=0 # encoding: [0xfe,0x1f,0x00,0x00]
47+
i64.atomic.rmw.add 0
48+
# CHECK: i32.atomic.rmw8.add_u 0 # encoding: [0xfe,0x20,0x00,0x00]
49+
i32.atomic.rmw8.add_u 0
50+
# CHECK: i32.atomic.rmw16.add_u 0:p2align=0 # encoding: [0xfe,0x21,0x00,0x00]
51+
i32.atomic.rmw16.add_u 0
52+
# CHECK: i64.atomic.rmw8.add_u 0 # encoding: [0xfe,0x22,0x00,0x00]
53+
i64.atomic.rmw8.add_u 0
54+
# CHECK: i64.atomic.rmw16.add_u 0:p2align=0 # encoding: [0xfe,0x23,0x00,0x00]
55+
i64.atomic.rmw16.add_u 0
56+
# CHECK: i64.atomic.rmw32.add_u 16:p2align=0 # encoding: [0xfe,0x24,0x00,0x10]
57+
i64.atomic.rmw32.add_u 16
58+
59+
# CHECK: i32.atomic.rmw.sub 0:p2align=0 # encoding: [0xfe,0x25,0x00,0x00]
60+
i32.atomic.rmw.sub 0
61+
# CHECK: i64.atomic.rmw.sub 0:p2align=0 # encoding: [0xfe,0x26,0x00,0x00]
62+
i64.atomic.rmw.sub 0
63+
# CHECK: i32.atomic.rmw8.sub_u 0 # encoding: [0xfe,0x27,0x00,0x00]
64+
i32.atomic.rmw8.sub_u 0
65+
# CHECK: i32.atomic.rmw16.sub_u 0:p2align=0 # encoding: [0xfe,0x28,0x00,0x00]
66+
i32.atomic.rmw16.sub_u 0
67+
# CHECK: i64.atomic.rmw8.sub_u 8 # encoding: [0xfe,0x29,0x00,0x08]
68+
i64.atomic.rmw8.sub_u 8
69+
# CHECK: i64.atomic.rmw16.sub_u 0:p2align=0 # encoding: [0xfe,0x2a,0x00,0x00]
70+
i64.atomic.rmw16.sub_u 0
71+
# CHECK: i64.atomic.rmw32.sub_u 0:p2align=0 # encoding: [0xfe,0x2b,0x00,0x00]
72+
i64.atomic.rmw32.sub_u 0
73+
74+
# CHECK: i32.atomic.rmw.and 0:p2align=0 # encoding: [0xfe,0x2c,0x00,0x00]
75+
i32.atomic.rmw.and 0
76+
# CHECK: i64.atomic.rmw.and 0:p2align=0 # encoding: [0xfe,0x2d,0x00,0x00]
77+
i64.atomic.rmw.and 0
78+
# CHECK: i32.atomic.rmw8.and_u 0 # encoding: [0xfe,0x2e,0x00,0x00]
79+
i32.atomic.rmw8.and_u 0
80+
# CHECK: i32.atomic.rmw16.and_u 0:p2align=0 # encoding: [0xfe,0x2f,0x00,0x00]
81+
i32.atomic.rmw16.and_u 0
82+
# CHECK: i64.atomic.rmw8.and_u 96 # encoding: [0xfe,0x30,0x00,0x60]
83+
i64.atomic.rmw8.and_u 96
84+
# CHECK: i64.atomic.rmw16.and_u 0:p2align=0 # encoding: [0xfe,0x31,0x00,0x00]
85+
i64.atomic.rmw16.and_u 0
86+
# CHECK: i64.atomic.rmw32.and_u 0:p2align=0 # encoding: [0xfe,0x32,0x00,0x00]
87+
i64.atomic.rmw32.and_u 0
88+
89+
# CHECK: i32.atomic.rmw.or 0:p2align=0 # encoding: [0xfe,0x33,0x00,0x00]
90+
i32.atomic.rmw.or 0
91+
# CHECK: i64.atomic.rmw.or 0:p2align=0 # encoding: [0xfe,0x34,0x00,0x00]
92+
i64.atomic.rmw.or 0
93+
# CHECK: i32.atomic.rmw8.or_u 0 # encoding: [0xfe,0x35,0x00,0x00]
94+
i32.atomic.rmw8.or_u 0
95+
# CHECK: i32.atomic.rmw16.or_u 0:p2align=0 # encoding: [0xfe,0x36,0x00,0x00]
96+
i32.atomic.rmw16.or_u 0
97+
# CHECK: i64.atomic.rmw8.or_u 0 # encoding: [0xfe,0x37,0x00,0x00]
98+
i64.atomic.rmw8.or_u 0
99+
# CHECK: i64.atomic.rmw16.or_u 48:p2align=0 # encoding: [0xfe,0x38,0x00,0x30]
100+
i64.atomic.rmw16.or_u 48
101+
# CHECK: i64.atomic.rmw32.or_u 0:p2align=0 # encoding: [0xfe,0x39,0x00,0x00]
102+
i64.atomic.rmw32.or_u 0
103+
104+
# CHECK: i32.atomic.rmw.xor 0:p2align=0 # encoding: [0xfe,0x3a,0x00,0x00]
105+
i32.atomic.rmw.xor 0
106+
# CHECK: i64.atomic.rmw.xor 0:p2align=0 # encoding: [0xfe,0x3b,0x00,0x00]
107+
i64.atomic.rmw.xor 0
108+
# CHECK: i32.atomic.rmw8.xor_u 4 # encoding: [0xfe,0x3c,0x00,0x04]
109+
i32.atomic.rmw8.xor_u 4
110+
# CHECK: i32.atomic.rmw16.xor_u 0:p2align=0 # encoding: [0xfe,0x3d,0x00,0x00]
111+
i32.atomic.rmw16.xor_u 0
112+
# CHECK: i64.atomic.rmw8.xor_u 0 # encoding: [0xfe,0x3e,0x00,0x00]
113+
i64.atomic.rmw8.xor_u 0
114+
# CHECK: i64.atomic.rmw16.xor_u 0:p2align=0 # encoding: [0xfe,0x3f,0x00,0x00]
115+
i64.atomic.rmw16.xor_u 0
116+
# CHECK: i64.atomic.rmw32.xor_u 0:p2align=0 # encoding: [0xfe,0x40,0x00,0x00]
117+
i64.atomic.rmw32.xor_u 0
118+
119+
# CHECK: i32.atomic.rmw.xchg 0:p2align=0 # encoding: [0xfe,0x41,0x00,0x00]
120+
i32.atomic.rmw.xchg 0
121+
# CHECK: i64.atomic.rmw.xchg 0:p2align=0 # encoding: [0xfe,0x42,0x00,0x00]
122+
i64.atomic.rmw.xchg 0
123+
# CHECK: i32.atomic.rmw8.xchg_u 0 # encoding: [0xfe,0x43,0x00,0x00]
124+
i32.atomic.rmw8.xchg_u 0
125+
# CHECK: i32.atomic.rmw16.xchg_u 0:p2align=0 # encoding: [0xfe,0x44,0x00,0x00]
126+
i32.atomic.rmw16.xchg_u 0
127+
# CHECK: i64.atomic.rmw8.xchg_u 0 # encoding: [0xfe,0x45,0x00,0x00]
128+
i64.atomic.rmw8.xchg_u 0
129+
# CHECK: i64.atomic.rmw16.xchg_u 8:p2align=0 # encoding: [0xfe,0x46,0x00,0x08]
130+
i64.atomic.rmw16.xchg_u 8
131+
# CHECK: i64.atomic.rmw32.xchg_u 0:p2align=0 # encoding: [0xfe,0x47,0x00,0x00]
132+
i64.atomic.rmw32.xchg_u 0
133+
134+
# CHECK: i32.atomic.rmw.cmpxchg 32:p2align=0 # encoding: [0xfe,0x48,0x00,0x20]
135+
i32.atomic.rmw.cmpxchg 32
136+
# CHECK: i64.atomic.rmw.cmpxchg 0:p2align=0 # encoding: [0xfe,0x49,0x00,0x00]
137+
i64.atomic.rmw.cmpxchg 0
138+
# CHECK: i32.atomic.rmw8.cmpxchg_u 0 # encoding: [0xfe,0x4a,0x00,0x00]
139+
i32.atomic.rmw8.cmpxchg_u 0
140+
# CHECK: i32.atomic.rmw16.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4b,0x00,0x00]
141+
i32.atomic.rmw16.cmpxchg_u 0
142+
# CHECK: i64.atomic.rmw8.cmpxchg_u 16 # encoding: [0xfe,0x4c,0x00,0x10]
143+
i64.atomic.rmw8.cmpxchg_u 16
144+
# CHECK: i64.atomic.rmw16.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4d,0x00,0x00]
145+
i64.atomic.rmw16.cmpxchg_u 0
146+
# CHECK: i64.atomic.rmw32.cmpxchg_u 0:p2align=0 # encoding: [0xfe,0x4e,0x00,0x00]
147+
i64.atomic.rmw32.cmpxchg_u 0
148+
149+
end_function

0 commit comments

Comments
 (0)
Please sign in to comment.