Skip to content

Handle arm64 Scalable Vector Extension (SVE) types on clang 10 #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 22, 2022
Merged

Handle arm64 Scalable Vector Extension (SVE) types on clang 10 #441

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa0dda8
c2rust-ast-exporter: work around missing API for SVE types in Clang 10
fw-immunant Jun 9, 2022
173fc70
Trying to get it to compile again. Fixed most things, but still a co…
kkysen Jun 10, 2022
a20fedc
`BTy->getKind()` is actually `kind`, so I fixed that error now.
kkysen Jun 10, 2022
5edd9a2
calculate ElemCount from ElemType for Clang 10
fw-immunant Jun 10, 2022
dbe85a1
Just cleaned up a couple things when I was looking for the bug that s…
kkysen Jun 10, 2022
6d23867
Removed a comment that's no longer needed.
kkysen Jun 10, 2022
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
140 changes: 82 additions & 58 deletions c2rust-ast-exporter/src/AstExporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "clang/Frontend/LangStandard.h"
#else
#include "clang/Basic/LangStandard.h"
#endif // CLANG_VERSION_MAJOR
#endif // CLANG_VERSION_MAJOR < 10
#include "clang/Tooling/Tooling.h"

#include "AstExporter.hpp"
Expand Down Expand Up @@ -319,73 +319,97 @@ class TypeEncoder final : public TypeVisitor<TypeEncoder> {
}

void VisitBuiltinType(const BuiltinType *T) {
TypeTag tag;
auto kind = T->getKind();

#if CLANG_VERSION_MAJOR >= 11
#if CLANG_VERSION_MAJOR >= 10
// Handle built-in vector types as if they're normal vector types
if (kind >= BuiltinType::SveInt8 && kind <= BuiltinType::SveBool) {
// Declare ElemType and ElemCount as needed by various Clang versions
#if CLANG_VERSION_MAJOR >= 11
auto Info = Context->getBuiltinVectorTypeInfo(T);
auto t = Info.ElementType;
auto qt = encodeQualType(t);
auto ElemType = Info.ElementType;

#if CLANG_VERSION_MAJOR >= 12
auto ElemCount = Info.EC.getKnownMinValue();
#else
#if CLANG_VERSION_MAJOR >= 12
auto ElemCount = Info.EC.getKnownMinValue() * Info.NumVectors;
#else // CLANG_VERSION_MAJOR >= 12
// getKnownMinValue was added in Clang 12.
auto ElemCount = Info.EC.Min;
#endif

encodeType(T, TagVectorType, [T, qt, Info, ElemCount](CborEncoder *local) {
cbor_encode_uint(local, qt);
cbor_encode_uint(local, ElemCount * Info.NumVectors);
});

VisitQualType(t);
auto ElemCount = Info.EC.Min * Info.NumVectors;
#endif // CLANG_VERSION_MAJOR >= 12
#else // CLANG_VERSION_MAJOR >= 11
auto &Ctx = *Context;
// Copy-pasted from Type::getSveEltType introduced after Clang 10:
auto ElemType = [&] {
switch (kind) {
default: llvm_unreachable("Unknown builtin SVE type!");
case BuiltinType::SveInt8: return Ctx.SignedCharTy;
case BuiltinType::SveUint8: return Ctx.UnsignedCharTy;
case BuiltinType::SveBool: return Ctx.UnsignedCharTy;
case BuiltinType::SveInt16: return Ctx.ShortTy;
case BuiltinType::SveUint16: return Ctx.UnsignedShortTy;
case BuiltinType::SveInt32: return Ctx.IntTy;
case BuiltinType::SveUint32: return Ctx.UnsignedIntTy;
case BuiltinType::SveInt64: return Ctx.LongTy;
case BuiltinType::SveUint64: return Ctx.UnsignedLongTy;
case BuiltinType::SveFloat16: return Ctx.Float16Ty;
case BuiltinType::SveFloat32: return Ctx.FloatTy;
case BuiltinType::SveFloat64: return Ctx.DoubleTy;
}
}();
// All the SVE types present in Clang 10 are 128-bit vectors
// (see `AArch64SVEACLETypes.def`), so we can divide 128
// by their element size to get element count.
auto ElemCount = 128 / Context->getTypeSize(ElemType);
#endif // CLANG_VERSION_MAJOR >= 11
auto ElemTypeTag = encodeQualType(ElemType);
encodeType(T, TagVectorType,
[&](CborEncoder *local) {
cbor_encode_uint(local, ElemTypeTag);
cbor_encode_uint(local, ElemCount);
});

VisitQualType(ElemType);
return;
}
#endif

// clang-format off
switch (kind) {
default: {
auto pol = clang::PrintingPolicy(Context->getLangOpts());
auto warning = std::string("Encountered unsupported BuiltinType kind ") +
std::to_string((int)kind) + " for type " +
T->getName(pol).str();
printWarning(warning, clang::FullSourceLoc());
tag = TagTypeUnknown;
break;
}
#endif // CLANG_VERSION_MAJOR >= 10

case BuiltinType::BuiltinFn: tag = TagBuiltinFn; break;
case BuiltinType::UInt128: tag = TagUInt128; break;
case BuiltinType::Int128: tag = TagInt128; break;
case BuiltinType::Short: tag = TagShort; break;
case BuiltinType::Int: tag = TagInt; break;
case BuiltinType::Long: tag = TagLong; break;
case BuiltinType::LongLong: tag = TagLongLong; break;
case BuiltinType::UShort: tag = TagUShort; break;
case BuiltinType::UInt: tag = TagUInt; break;
case BuiltinType::ULong: tag = TagULong; break;
case BuiltinType::ULongLong: tag = TagULongLong; break;
case BuiltinType::Half: tag = TagHalf; break;
#if CLANG_VERSION_MAJOR >= 11
case BuiltinType::BFloat16: tag = TagBFloat16; break;
#endif
case BuiltinType::Float: tag = TagFloat; break;
case BuiltinType::Double: tag = TagDouble; break;
case BuiltinType::LongDouble: tag = TagLongDouble; break;
case BuiltinType::SChar: tag = TagSChar; break;
case BuiltinType::UChar: tag = TagUChar; break;
case BuiltinType::Char_U: tag = TagChar; break;
case BuiltinType::Char_S: tag = TagChar; break;
case BuiltinType::Void: tag = TagVoid; break;
case BuiltinType::Bool: tag = TagBool; break;
case BuiltinType::WChar_S: tag = TagSWChar; break;
case BuiltinType::WChar_U: tag = TagUWChar; break;
}
// clang-format on
const TypeTag tag = [&] {
switch (kind) {
default: {
auto pol = clang::PrintingPolicy(Context->getLangOpts());
auto warning = std::string("Encountered unsupported BuiltinType kind ") +
std::to_string((int)kind) + " for type " +
T->getName(pol).str();
printWarning(warning, clang::FullSourceLoc());
return TagTypeUnknown;
}
case BuiltinType::BuiltinFn: return TagBuiltinFn;
case BuiltinType::UInt128: return TagUInt128;
case BuiltinType::Int128: return TagInt128;
case BuiltinType::Short: return TagShort;
case BuiltinType::Int: return TagInt;
case BuiltinType::Long: return TagLong;
case BuiltinType::LongLong: return TagLongLong;
case BuiltinType::UShort: return TagUShort;
case BuiltinType::UInt: return TagUInt;
case BuiltinType::ULong: return TagULong;
case BuiltinType::ULongLong: return TagULongLong;
case BuiltinType::Half: return TagHalf;
#if CLANG_VERSION_MAJOR >= 11
case BuiltinType::BFloat16: return TagBFloat16;
#endif
case BuiltinType::Float: return TagFloat;
case BuiltinType::Double: return TagDouble;
case BuiltinType::LongDouble: return TagLongDouble;
case BuiltinType::SChar: return TagSChar;
case BuiltinType::UChar: return TagUChar;
case BuiltinType::Char_U: return TagChar;
case BuiltinType::Char_S: return TagChar;
case BuiltinType::Void: return TagVoid;
case BuiltinType::Bool: return TagBool;
case BuiltinType::WChar_S: return TagSWChar;
case BuiltinType::WChar_U: return TagUWChar;
}
}();

encodeType(T, tag);
}
Expand Down