Skip to content

Commit 6a5ac3f

Browse files
committed
IR/Verifier: Allow vector type in atomic load and store
Vector types on atomics are assumed to be invalid by the verifier. However, this type can be valid if it is lowered by codegen. commit-id:72529270
1 parent cb4f24b commit 6a5ac3f

File tree

5 files changed

+40
-17
lines changed

5 files changed

+40
-17
lines changed

llvm/docs/LangRef.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -11096,8 +11096,8 @@ If the ``load`` is marked as ``atomic``, it takes an extra :ref:`ordering
1109611096
<ordering>` and optional ``syncscope("<target-scope>")`` argument. The
1109711097
``release`` and ``acq_rel`` orderings are not valid on ``load`` instructions.
1109811098
Atomic loads produce :ref:`defined <memmodel>` results when they may see
11099-
multiple atomic stores. The type of the pointee must be an integer, pointer, or
11100-
floating-point type whose bit width is a power of two greater than or equal to
11099+
multiple atomic stores. The type of the pointee must be an integer, pointer,
11100+
floating-point, or vector type whose bit width is a power of two greater than or equal to
1110111101
eight and less than or equal to a target-specific size limit. ``align`` must be
1110211102
explicitly specified on atomic loads. Note: if the alignment is not greater or
1110311103
equal to the size of the `<value>` type, the atomic operation is likely to
@@ -11237,8 +11237,8 @@ If the ``store`` is marked as ``atomic``, it takes an extra :ref:`ordering
1123711237
<ordering>` and optional ``syncscope("<target-scope>")`` argument. The
1123811238
``acquire`` and ``acq_rel`` orderings aren't valid on ``store`` instructions.
1123911239
Atomic loads produce :ref:`defined <memmodel>` results when they may see
11240-
multiple atomic stores. The type of the pointee must be an integer, pointer, or
11241-
floating-point type whose bit width is a power of two greater than or equal to
11240+
multiple atomic stores. The type of the pointee must be an integer, pointer,
11241+
floating-point, or vector type whose bit width is a power of two greater than or equal to
1124211242
eight and less than or equal to a target-specific size limit. ``align`` must be
1124311243
explicitly specified on atomic stores. Note: if the alignment is not greater or
1124411244
equal to the size of the `<value>` type, the atomic operation is likely to

llvm/docs/ReleaseNotes.md

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Changes to the LLVM IR
6161
removed:
6262

6363
* `mul`
64+
* A `load atomic` may now be used with vector types.
6465

6566
Changes to LLVM infrastructure
6667
------------------------------

llvm/lib/IR/Verifier.cpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -4289,9 +4289,10 @@ void Verifier::visitLoadInst(LoadInst &LI) {
42894289
Check(LI.getOrdering() != AtomicOrdering::Release &&
42904290
LI.getOrdering() != AtomicOrdering::AcquireRelease,
42914291
"Load cannot have Release ordering", &LI);
4292-
Check(ElTy->isIntOrPtrTy() || ElTy->isFloatingPointTy(),
4293-
"atomic load operand must have integer, pointer, or floating point "
4294-
"type!",
4292+
Check(ElTy->getScalarType()->isIntOrPtrTy() ||
4293+
ElTy->getScalarType()->isFloatingPointTy(),
4294+
"atomic load operand must have integer, pointer, floating point, "
4295+
"or vector type!",
42954296
ElTy, &LI);
42964297
checkAtomicMemAccessSize(ElTy, &LI);
42974298
} else {
@@ -4315,9 +4316,10 @@ void Verifier::visitStoreInst(StoreInst &SI) {
43154316
Check(SI.getOrdering() != AtomicOrdering::Acquire &&
43164317
SI.getOrdering() != AtomicOrdering::AcquireRelease,
43174318
"Store cannot have Acquire ordering", &SI);
4318-
Check(ElTy->isIntOrPtrTy() || ElTy->isFloatingPointTy(),
4319-
"atomic store operand must have integer, pointer, or floating point "
4320-
"type!",
4319+
Check(ElTy->getScalarType()->isIntOrPtrTy() ||
4320+
ElTy->getScalarType()->isFloatingPointTy(),
4321+
"atomic store operand must have integer, pointer, floating point, "
4322+
"or vector type!",
43214323
ElTy, &SI);
43224324
checkAtomicMemAccessSize(ElTy, &SI);
43234325
} else {

llvm/test/Assembler/atomic.ll

+19
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,25 @@ define void @f(ptr %x) {
5252
; CHECK: atomicrmw volatile usub_sat ptr %x, i32 10 syncscope("agent") monotonic
5353
atomicrmw volatile usub_sat ptr %x, i32 10 syncscope("agent") monotonic
5454

55+
; CHECK : load atomic <1 x i32>, ptr %x unordered, align 4
56+
load atomic <1 x i32>, ptr %x unordered, align 4
57+
; CHECK : store atomic <1 x i32> splat (i32 3), ptr %x release, align 4
58+
store atomic <1 x i32> <i32 3>, ptr %x release, align 4
59+
; CHECK : load atomic <2 x i32>, ptr %x unordered, align 4
60+
load atomic <2 x i32>, ptr %x unordered, align 4
61+
; CHECK : store atomic <2 x i32> <i32 3, i32 4>, ptr %x release, align 4
62+
store atomic <2 x i32> <i32 3, i32 4>, ptr %x release, align 4
63+
64+
; CHECK : load atomic <2 x ptr>, ptr %x unordered, align 4
65+
load atomic <2 x ptr>, ptr %x unordered, align 4
66+
; CHECK : store atomic <2 x ptr> zeroinitializer, ptr %x release, align 4
67+
store atomic <2 x ptr> zeroinitializer, ptr %x release, align 4
68+
69+
; CHECK : load atomic <2 x float>, ptr %x unordered, align 4
70+
load atomic <2 x float>, ptr %x unordered, align 4
71+
; CHECK : store atomic <2 x float> <float 3.0, float 4.0>, ptr %x release, align 4
72+
store atomic <2 x float> <float 3.0, float 4.0>, ptr %x release, align 4
73+
5574
; CHECK: fence syncscope("singlethread") release
5675
fence syncscope("singlethread") release
5776
; CHECK: fence seq_cst

llvm/test/Verifier/atomics.ll

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
; RUN: not opt -passes=verify < %s 2>&1 | FileCheck %s
2+
; CHECK: atomic store operand must have integer, pointer, floating point, or vector type!
3+
; CHECK: atomic load operand must have integer, pointer, floating point, or vector type!
24

3-
; CHECK: atomic store operand must have integer, pointer, or floating point type!
4-
; CHECK: atomic load operand must have integer, pointer, or floating point type!
5+
%ty = type { i32 };
56

6-
define void @foo(ptr %P, <1 x i64> %v) {
7-
store atomic <1 x i64> %v, ptr %P unordered, align 8
7+
define void @foo(ptr %P, %ty %v) {
8+
store atomic %ty %v, ptr %P unordered, align 8
89
ret void
910
}
1011

11-
define <1 x i64> @bar(ptr %P) {
12-
%v = load atomic <1 x i64>, ptr %P unordered, align 8
13-
ret <1 x i64> %v
12+
define %ty @bar(ptr %P) {
13+
%v = load atomic %ty, ptr %P unordered, align 8
14+
ret %ty %v
1415
}

0 commit comments

Comments
 (0)