Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ir/effects.h
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,10 @@ class EffectAnalyzer {
// so we set these to true.
parent.readsSharedMemory = true;
parent.writesSharedMemory = true;
parent.readsSharedMutableStruct = true;
parent.writesSharedStruct = true;
parent.readsSharedMutableArray = true;
parent.writesSharedArray = true;
parent.readOrder = parent.writeOrder = MemoryOrder::SeqCst;
}
void visitPause(Pause* curr) {
Expand Down
103 changes: 103 additions & 0 deletions test/lit/passes/simplify-locals-atomic-effects.wast
Original file line number Diff line number Diff line change
Expand Up @@ -795,4 +795,107 @@
)
(local.get $x)
)

;; CHECK: (func $read-struct-fence (type $3) (param $shared (ref null $shared-struct)) (result i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (struct.get $shared-struct 0
;; CHECK-NEXT: (local.get $shared)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (atomic.fence)
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $read-struct-fence (param $shared (ref null $shared-struct)) (result i32)
(local $x i32)
;; A shared struct read cannot be moved past an atomic.fence.
(local.set $x
(struct.get $shared-struct 0 (local.get $shared))
)
(atomic.fence)
(local.get $x)
)

;; CHECK: (func $read-array-fence (type $2) (param $shared (ref null $shared-struct)) (param $shared-array (ref null $shared-array)) (result i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (array.get $shared-array
;; CHECK-NEXT: (local.get $shared-array)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (atomic.fence)
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $read-array-fence (param $shared (ref null $shared-struct)) (param $shared-array (ref null $shared-array)) (result i32)
(local $x i32)
;; A shared array read cannot be moved past an atomic.fence.
(local.set $x
(array.get $shared-array (local.get $shared-array) (i32.const 0))
)
(atomic.fence)
(local.get $x)
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can also test writes here.


;; CHECK: (func $write-struct-fence (type $3) (param $shared (ref null $shared-struct)) (result i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (struct.set $shared-struct 0
;; CHECK-NEXT: (local.get $shared)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (atomic.fence)
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $write-struct-fence (param $shared (ref null $shared-struct)) (result i32)
(local $x i32)
;; A shared struct read cannot be moved past an atomic.fence.
(local.set $x
(block (result i32)
(struct.set $shared-struct 0
(local.get $shared)
(i32.const 0)
)
(i32.const 1)
)
)
(atomic.fence)
(local.get $x)
)

;; CHECK: (func $write-array-fence (type $6) (param $shared (ref null $shared-array)) (result i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (array.set $shared-array
;; CHECK-NEXT: (local.get $shared)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (atomic.fence)
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $write-array-fence (param $shared (ref null $shared-array)) (result i32)
(local $x i32)
;; A shared struct read cannot be moved past an atomic.fence.
(local.set $x
(block (result i32)
(array.set $shared-array
(local.get $shared)
(i32.const 0)
(i32.const 0)
)
(i32.const 1)
)
)
(atomic.fence)
(local.get $x)
)
)
Loading