Skip to content

Commit 0c96c65

Browse files
authored
[clang][CodeGen] Fix crash on non-natural type in CheckAtomicAlignment (#141053)
In some specific scenarios, `Ptr.getElementType()` won't be a primitive type or a vector of primitive types, and thus `getScalarSizeInBits()` returns zero. Use the datalayout to get the proper size of the type instead of making an implicit assumption that the type is a simple primitive type. Solves SWDEV-534184
1 parent 1f0c178 commit 0c96c65

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,10 @@ Value *EmitFromInt(CodeGenFunction &CGF, llvm::Value *V,
274274
Address CheckAtomicAlignment(CodeGenFunction &CGF, const CallExpr *E) {
275275
ASTContext &Ctx = CGF.getContext();
276276
Address Ptr = CGF.EmitPointerWithAlignment(E->getArg(0));
277+
const llvm::DataLayout &DL = CGF.CGM.getDataLayout();
277278
unsigned Bytes = Ptr.getElementType()->isPointerTy()
278279
? Ctx.getTypeSizeInChars(Ctx.VoidPtrTy).getQuantity()
279-
: Ptr.getElementType()->getScalarSizeInBits() / 8;
280+
: DL.getTypeStoreSize(Ptr.getElementType());
280281
unsigned Align = Ptr.getAlignment().getQuantity();
281282
if (Align % Bytes != 0) {
282283
DiagnosticsEngine &Diags = CGF.CGM.getDiags();
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
2+
// RUN: %clang_cc1 -O0 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -target-cpu gfx942 \
3+
// RUN: %s -emit-llvm -o - -disable-llvm-passes | FileCheck %s
4+
5+
// REQUIRES: amdgpu-registered-target
6+
7+
// `Ptr.getElementType()` in `CheckAtomicAlignment` returns
8+
// %struct.__half2 = type { %union.anon }
9+
// Check we do not crash when handling that.
10+
11+
typedef half __attribute__((ext_vector_type(2))) half2;
12+
typedef short __attribute__((ext_vector_type(2))) short2;
13+
14+
struct __half2 {
15+
union {
16+
struct {
17+
half x;
18+
half y;
19+
};
20+
half2 data;
21+
};
22+
};
23+
24+
// CHECK-LABEL: define dso_local <2 x half> @test_flat_add_2f16(
25+
// CHECK-SAME: ptr noundef [[ADDR:%.*]], <2 x half> noundef [[VAL:%.*]]) #[[ATTR0:[0-9]+]] {
26+
// CHECK-NEXT: [[ENTRY:.*:]]
27+
// CHECK-NEXT: [[RETVAL:%.*]] = alloca <2 x half>, align 4, addrspace(5)
28+
// CHECK-NEXT: [[ADDR_ADDR:%.*]] = alloca ptr, align 8, addrspace(5)
29+
// CHECK-NEXT: [[VAL_ADDR:%.*]] = alloca <2 x half>, align 4, addrspace(5)
30+
// CHECK-NEXT: [[RETVAL_ASCAST:%.*]] = addrspacecast ptr addrspace(5) [[RETVAL]] to ptr
31+
// CHECK-NEXT: [[ADDR_ADDR_ASCAST:%.*]] = addrspacecast ptr addrspace(5) [[ADDR_ADDR]] to ptr
32+
// CHECK-NEXT: [[VAL_ADDR_ASCAST:%.*]] = addrspacecast ptr addrspace(5) [[VAL_ADDR]] to ptr
33+
// CHECK-NEXT: store ptr [[ADDR]], ptr [[ADDR_ADDR_ASCAST]], align 8
34+
// CHECK-NEXT: store <2 x half> [[VAL]], ptr [[VAL_ADDR_ASCAST]], align 4
35+
// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[ADDR_ADDR_ASCAST]], align 8
36+
// CHECK-NEXT: [[TMP1:%.*]] = load <2 x half>, ptr [[VAL_ADDR_ASCAST]], align 4
37+
// CHECK-NEXT: [[TMP2:%.*]] = atomicrmw fadd ptr [[TMP0]], <2 x half> [[TMP1]] syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory [[META4:![0-9]+]]
38+
// CHECK-NEXT: ret <2 x half> [[TMP2]]
39+
//
40+
half2 test_flat_add_2f16(short2 *addr, half2 val) {
41+
return __builtin_amdgcn_flat_atomic_fadd_v2f16((struct __half2*)addr, val);
42+
}
43+
//.
44+
// CHECK: [[META4]] = !{}
45+
//.

0 commit comments

Comments
 (0)