================
@@ -47,6 +50,98 @@ ArgInfo TargetInfo::getNaturalAlignIndirect(const Type *Ty, 
unsigned AddrSpace,
   return ArgInfo::getIndirect(Ty->getAlignment(), ByVal, AddrSpace);
 }
 
+const Type *TargetInfo::getI8Array(uint64_t NumBytes) const {
+  assert(NumBytes != 0 && "empty padding");
+  const Type *I8 = TB.getIntegerType(8, llvm::Align(1), /*Signed=*/false);
+  return TB.getArrayType(I8, NumBytes, NumBytes * 8);
+}
+
+const Type *TargetInfo::getStructOfTypes(llvm::ArrayRef<const Type *> Elems,
+                                         bool Packed) const {
+  assert(!Elems.empty() && "empty coerce sequence");
+  llvm::SmallVector<FieldInfo, 8> Fields;
+  Fields.reserve(Elems.size());
+  for (const Type *Elt : Elems)
+    Fields.emplace_back(Elt, /*OffsetInBits=*/0);
+
+  StructPacking Pack = Packed ? StructPacking::Packed : StructPacking::Default;
+  return TB.getRecordType(Fields, llvm::TypeSize::getFixed(0), llvm::Align(1),
+                          /*UnadjustedAlign=*/llvm::Align(1), Pack);
+}
+
+const Type *TargetInfo::convertTypeForMem(const Type *Ty) const {
+  if (const auto *AT = dyn_cast<ArrayType>(Ty)) {
+    if (AT->isMatrixType())
+      return Ty;
+    const Type *Elt = convertTypeForMem(AT->getElementType());
+    if (Elt == AT->getElementType())
+      return Ty;
+    assert(AT->getSizeInBits().isFixed() &&
+           "converted array element changes a scalable size");
+    return TB.getArrayType(Elt, AT->getNumElements(),
+                           AT->getSizeInBits().getFixedValue());
+  }
+
+  const auto *RT = dyn_cast<RecordType>(Ty);
+  if (!RT || RT->isUnion())
+    return Ty;
+
+  // Current callers can't get here with virtual bases. If we need to handle
+  // virtual bases in the future, we'll need explicit handling for that below.
+  assert(RT->getNumVirtualBaseClasses() == 0 && "record has a virtual base");
+
+  llvm::SmallVector<FieldInfo, 8> Members;
+  for (const FieldInfo &Base : RT->getBaseClasses()) {
+    if (!Base.FieldType->isEmptyRecord())
+      Members.push_back(FieldInfo(Base.FieldType, Base.OffsetInBits));
+  }
+  for (const FieldInfo &Field : RT->getFields()) {
+    if (!Field.isEmpty())
+      Members.push_back(FieldInfo(Field.FieldType, Field.OffsetInBits));
+  }
+  llvm::stable_sort(Members, [](const FieldInfo &A, const FieldInfo &B) {
+    return A.OffsetInBits < B.OffsetInBits;
+  });
+
+  llvm::SmallVector<FieldInfo, 8> Fields;
+  uint64_t Current = 0;
+  for (const FieldInfo &Member : Members) {
+    assert(!Member.FieldType->getSizeInBits().isScalable() &&
+           "scalable member has no fixed offset");
+    if (Member.OffsetInBits > Current) {
+      uint64_t AlignBits = Member.FieldType->getAlignment().value() * 8;
+      uint64_t Natural = llvm::alignTo(Current, AlignBits);
+      if (Member.OffsetInBits != Natural) {
+        uint64_t PadBits = Member.OffsetInBits - Current;
+        assert(PadBits % 8 == 0 && "padding is not a whole number of bytes");
+        Fields.emplace_back(getI8Array(PadBits / 8), Current);
+      }
----------------
madhur13490 wrote:

This padding check uses the ABI type's alignment (FieldType->getAlignment()), 
but Clang's CGRecordLowering uses the DataLayout alignment of the IR type. They 
agree at 128 bits and diverge above that, because <8 x i32> has no DataLayout 
entry and falls back to 32-byte alignment while fixed_int32_t is 16-byte 
aligned. I built the PR and this aborts a debug clang:

```
typedef __SVBool_t  fixed_bool_t  __attribute__((arm_sve_vector_bits(256)));
typedef __SVInt32_t fixed_int32_t __attribute__((arm_sve_vector_bits(256)));
typedef struct { fixed_bool_t p; fixed_int32_t v; } T;
void arg(T s) {}
```
```
CoerceToType mismatch (expected: { <4 x i8>, [12 x i8], <8 x i32> },
                       given: { <4 x i8>, <8 x i32> })
```
Same at 512 bits. Could we add -mvscale-min=2 and =4 RUN lines to 
abi-classify-pure-scalable.c? The existing ones only use vscale=1, which is why 
this isn't caught. I think the fix needs the DataLayout alignment of the 
lowered IR type, or an equivalent, to be available here.

https://github.com/llvm/llvm-project/pull/227504
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to