Skip to content

Commit ff2e168

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 8aebceb commit ff2e168

File tree

4 files changed

+39
-17
lines changed

4 files changed

+39
-17
lines changed

llvm/docs/LangRef.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -11076,8 +11076,8 @@ If the ``load`` is marked as ``atomic``, it takes an extra :ref:`ordering
1107611076
<ordering>` and optional ``syncscope("<target-scope>")`` argument. The
1107711077
``release`` and ``acq_rel`` orderings are not valid on ``load`` instructions.
1107811078
Atomic loads produce :ref:`defined <memmodel>` results when they may see
11079-
multiple atomic stores. The type of the pointee must be an integer, pointer, or
11080-
floating-point type whose bit width is a power of two greater than or equal to
11079+
multiple atomic stores. The type of the pointee must be an integer, pointer,
11080+
floating-point, or vector type whose bit width is a power of two greater than or equal to
1108111081
eight and less than or equal to a target-specific size limit. ``align`` must be
1108211082
explicitly specified on atomic loads. Note: if the alignment is not greater or
1108311083
equal to the size of the `<value>` type, the atomic operation is likely to
@@ -11217,8 +11217,8 @@ If the ``store`` is marked as ``atomic``, it takes an extra :ref:`ordering
1121711217
<ordering>` and optional ``syncscope("<target-scope>")`` argument. The
1121811218
``acquire`` and ``acq_rel`` orderings aren't valid on ``store`` instructions.
1121911219
Atomic loads produce :ref:`defined <memmodel>` results when they may see
11220-
multiple atomic stores. The type of the pointee must be an integer, pointer, or
11221-
floating-point type whose bit width is a power of two greater than or equal to
11220+
multiple atomic stores. The type of the pointee must be an integer, pointer,
11221+
floating-point, or vector type whose bit width is a power of two greater than or equal to
1122211222
eight and less than or equal to a target-specific size limit. ``align`` must be
1122311223
explicitly specified on atomic stores. Note: if the alignment is not greater or
1122411224
equal to the size of the `<value>` type, the atomic operation is likely to

llvm/lib/IR/Verifier.cpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -4265,9 +4265,10 @@ void Verifier::visitLoadInst(LoadInst &LI) {
42654265
Check(LI.getOrdering() != AtomicOrdering::Release &&
42664266
LI.getOrdering() != AtomicOrdering::AcquireRelease,
42674267
"Load cannot have Release ordering", &LI);
4268-
Check(ElTy->isIntOrPtrTy() || ElTy->isFloatingPointTy(),
4269-
"atomic load operand must have integer, pointer, or floating point "
4270-
"type!",
4268+
Check(ElTy->getScalarType()->isIntOrPtrTy() ||
4269+
ElTy->getScalarType()->isFloatingPointTy(),
4270+
"atomic load operand must have integer, pointer, floating point, "
4271+
"or vector type!",
42714272
ElTy, &LI);
42724273
checkAtomicMemAccessSize(ElTy, &LI);
42734274
} else {
@@ -4291,9 +4292,10 @@ void Verifier::visitStoreInst(StoreInst &SI) {
42914292
Check(SI.getOrdering() != AtomicOrdering::Acquire &&
42924293
SI.getOrdering() != AtomicOrdering::AcquireRelease,
42934294
"Store cannot have Acquire ordering", &SI);
4294-
Check(ElTy->isIntOrPtrTy() || ElTy->isFloatingPointTy(),
4295-
"atomic store operand must have integer, pointer, or floating point "
4296-
"type!",
4295+
Check(ElTy->getScalarType()->isIntOrPtrTy() ||
4296+
ElTy->getScalarType()->isFloatingPointTy(),
4297+
"atomic store operand must have integer, pointer, floating point, "
4298+
"or vector type!",
42974299
ElTy, &SI);
42984300
checkAtomicMemAccessSize(ElTy, &SI);
42994301
} 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)