Skip to content

Commit 854644e

Browse files
committed
Clean up atomic alignment CI tests.
Revert unrelated formatting and regenerate DeAlign lit expectations. Signed-off-by: Gaurav Chaudhary <chaudharygaurav2004@gmail.com>
1 parent 444b063 commit 854644e

2 files changed

Lines changed: 27 additions & 25 deletions

File tree

‎src/wasm/wasm-stack.cpp‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -608,22 +608,14 @@ void BinaryInstWriter::visitAtomicWait(AtomicWait* curr) {
608608
switch (curr->expectedType.getBasic()) {
609609
case Type::i32: {
610610
o << static_cast<int8_t>(BinaryConsts::I32AtomicWait);
611-
emitMemoryAccess(4,
612-
4,
613-
curr->offset,
614-
curr->memory,
615-
MemoryOrder::SeqCst,
616-
/*isRMW=*/false);
611+
emitMemoryAccess(
612+
4, 4, curr->offset, curr->memory, MemoryOrder::SeqCst, /*isRMW=*/false);
617613
break;
618614
}
619615
case Type::i64: {
620616
o << static_cast<int8_t>(BinaryConsts::I64AtomicWait);
621-
emitMemoryAccess(8,
622-
8,
623-
curr->offset,
624-
curr->memory,
625-
MemoryOrder::SeqCst,
626-
/*isRMW=*/false);
617+
emitMemoryAccess(
618+
8, 8, curr->offset, curr->memory, MemoryOrder::SeqCst, /*isRMW=*/false);
627619
break;
628620
}
629621
default:
@@ -634,12 +626,8 @@ void BinaryInstWriter::visitAtomicWait(AtomicWait* curr) {
634626
void BinaryInstWriter::visitAtomicNotify(AtomicNotify* curr) {
635627
o << static_cast<int8_t>(BinaryConsts::AtomicPrefix)
636628
<< static_cast<int8_t>(BinaryConsts::AtomicNotify);
637-
emitMemoryAccess(4,
638-
4,
639-
curr->offset,
640-
curr->memory,
641-
MemoryOrder::SeqCst,
642-
/*isRMW=*/false);
629+
emitMemoryAccess(
630+
4, 4, curr->offset, curr->memory, MemoryOrder::SeqCst, /*isRMW=*/false);
643631
}
644632

645633
void BinaryInstWriter::visitAtomicFence(AtomicFence* curr) {

‎test/lit/passes/dealign-atomics.wast‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
1+
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
12
;; RUN: wasm-opt %s --enable-threads --dealign -S -o - | filecheck %s
23

34
(module
45
(memory 1 1 shared)
56

7+
;; CHECK: (func $test
8+
;; CHECK-NEXT: (drop
9+
;; CHECK-NEXT: (i32.load align=1
10+
;; CHECK-NEXT: (i32.const 0)
11+
;; CHECK-NEXT: )
12+
;; CHECK-NEXT: )
13+
;; CHECK-NEXT: (drop
14+
;; CHECK-NEXT: (i32.atomic.load
15+
;; CHECK-NEXT: (i32.const 4)
16+
;; CHECK-NEXT: )
17+
;; CHECK-NEXT: )
18+
;; CHECK-NEXT: (i32.store align=1
19+
;; CHECK-NEXT: (i32.const 8)
20+
;; CHECK-NEXT: (i32.const 0)
21+
;; CHECK-NEXT: )
22+
;; CHECK-NEXT: (i32.atomic.store
23+
;; CHECK-NEXT: (i32.const 12)
24+
;; CHECK-NEXT: (i32.const 0)
25+
;; CHECK-NEXT: )
26+
;; CHECK-NEXT: )
627
(func $test
728
(drop (i32.load align=4 (i32.const 0)))
829
(drop (i32.atomic.load (i32.const 4)))
930
(i32.store align=4 (i32.const 8) (i32.const 0))
1031
(i32.atomic.store (i32.const 12) (i32.const 0))
1132
)
1233
)
13-
14-
;; CHECK: (i32.load align=1
15-
;; CHECK: (i32.atomic.load
16-
;; CHECK-NOT: i32.atomic.load align=1
17-
;; CHECK: (i32.store align=1
18-
;; CHECK: (i32.atomic.store
19-
;; CHECK-NOT: i32.atomic.store align=1

0 commit comments

Comments
 (0)