Skip to content
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

Jump to bottom

[Clang][LLVM] Change OpenCL Emitter to use const Record * #110590

Merged
merged 1 commit into from
Oct 1, 2024
Merged

[Clang][LLVM] Change OpenCL Emitter to use const Record * #110590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 26 additions & 23 deletions clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class BuiltinNameEmitter {
// <<float>, 5>,
// ...
// <<double, double>, 35>.
std::vector<std::pair<std::vector<Record *>, unsigned>> SignaturesList;
std::vector<std::pair<std::vector<const Record *>, unsigned>> SignaturesList;

// Map the name of a builtin function to its prototypes (instances of the
// TableGen "Builtin" class).
Expand Down Expand Up @@ -261,8 +261,8 @@ class OpenCLBuiltinFileEmitterBase {
// Return the type(s) and vector size(s) for the given type. For
// non-GenericTypes, the resulting vectors will contain 1 element. For
// GenericTypes, the resulting vectors typically contain multiple elements.
void getTypeLists(Record *Type, TypeFlags &Flags,
std::vector<Record *> &TypeList,
void getTypeLists(const Record *Type, TypeFlags &Flags,
std::vector<const Record *> &TypeList,
std::vector<int64_t> &VectorList) const;

// Expand the TableGen Records representing a builtin function signature into
Expand All @@ -278,7 +278,7 @@ class OpenCLBuiltinFileEmitterBase {
// [char, float3, float3]
// ...
void
expandTypesInSignature(const std::vector<Record *> &Signature,
expandTypesInSignature(ArrayRef<const Record *> Signature,
SmallVectorImpl<SmallVector<std::string, 2>> &Types);

// Emit extension enabling pragmas.
Expand Down Expand Up @@ -458,7 +458,7 @@ struct OpenCLBuiltinStruct {
// the same number of actual scalar or vector types.
//
// Exit with a fatal error if an unsupported construct is encountered.
static void VerifySignature(const std::vector<Record *> &Signature,
static void VerifySignature(ArrayRef<const Record *> Signature,
const Record *BuiltinRec) {
unsigned GenTypeVecSizes = 1;
unsigned GenTypeTypes = 1;
Expand All @@ -480,8 +480,9 @@ static void VerifySignature(const std::vector<Record *> &Signature,
}

// Check number of data types.
unsigned NTypes =
T->getValueAsDef("TypeList")->getValueAsListOfDefs("List").size();
unsigned NTypes = T->getValueAsDef("TypeList")
->getValueAsListOfConstDefs("List")
.size();
if (NTypes != GenTypeTypes && NTypes != 1) {
if (GenTypeTypes > 1) {
// We already saw a gentype with a different number of types.
Expand Down Expand Up @@ -511,12 +512,13 @@ void BuiltinNameEmitter::GetOverloads() {
StringRef BName = B->getValueAsString("Name");
FctOverloadMap.try_emplace(BName);

auto Signature = B->getValueAsListOfDefs("Signature");
auto Signature = B->getValueAsListOfConstDefs("Signature");
// Reuse signatures to avoid unnecessary duplicates.
auto it = find_if(SignaturesList,
[&](const std::pair<std::vector<Record *>, unsigned> &a) {
return a.first == Signature;
});
auto it =
find_if(SignaturesList,
[&](const std::pair<std::vector<const Record *>, unsigned> &a) {
return a.first == Signature;
});
unsigned SignIndex;
if (it == SignaturesList.end()) {
VerifySignature(Signature, B);
Expand Down Expand Up @@ -634,8 +636,8 @@ void BuiltinNameEmitter::EmitBuiltinTable() {
Overload.first->getValueAsDef("MaxVersion")->getValueAsInt("ID");

OS << " { " << Overload.second << ", "
<< Overload.first->getValueAsListOfDefs("Signature").size() << ", "
<< (Overload.first->getValueAsBit("IsPure")) << ", "
<< Overload.first->getValueAsListOfConstDefs("Signature").size()
<< ", " << (Overload.first->getValueAsBit("IsPure")) << ", "
<< (Overload.first->getValueAsBit("IsConst")) << ", "
<< (Overload.first->getValueAsBit("IsConv")) << ", "
<< FunctionExtensionIndex[ExtName] << ", "
Expand Down Expand Up @@ -849,8 +851,8 @@ static void OCL2Qual(Sema &S, const OpenCLTypeStruct &Ty,
// Build the Cartesian product of (vector sizes) x (types). Only insert
// the plain scalar types for now; other type information such as vector
// size and type qualifiers will be added after the switch statement.
std::vector<Record *> BaseTypes =
GenType->getValueAsDef("TypeList")->getValueAsListOfDefs("List");
std::vector<const Record *> BaseTypes =
GenType->getValueAsDef("TypeList")->getValueAsListOfConstDefs("List");

// Collect all QualTypes for a single vector size into TypeList.
OS << " SmallVector<QualType, " << BaseTypes.size() << "> TypeList;\n";
Expand Down Expand Up @@ -1022,11 +1024,12 @@ std::string OpenCLBuiltinFileEmitterBase::getTypeString(const Record *Type,
}

void OpenCLBuiltinFileEmitterBase::getTypeLists(
Record *Type, TypeFlags &Flags, std::vector<Record *> &TypeList,
const Record *Type, TypeFlags &Flags, std::vector<const Record *> &TypeList,
std::vector<int64_t> &VectorList) const {
bool isGenType = Type->isSubClassOf("GenericType");
if (isGenType) {
TypeList = Type->getValueAsDef("TypeList")->getValueAsListOfDefs("List");
TypeList =
Type->getValueAsDef("TypeList")->getValueAsListOfConstDefs("List");
VectorList =
Type->getValueAsDef("VectorList")->getValueAsListOfInts("List");
return;
Expand All @@ -1035,7 +1038,7 @@ void OpenCLBuiltinFileEmitterBase::getTypeLists(
if (Type->isSubClassOf("PointerType") || Type->isSubClassOf("ConstType") ||
Type->isSubClassOf("VolatileType")) {
StringRef SubTypeName = Type->getValueAsString("Name");
Record *PossibleGenType = Records.getDef(SubTypeName);
const Record *PossibleGenType = Records.getDef(SubTypeName);
if (PossibleGenType && PossibleGenType->isSubClassOf("GenericType")) {
// When PointerType, ConstType, or VolatileType is applied to a
// GenericType, the flags need to be taken from the subtype, not from the
Expand All @@ -1055,15 +1058,15 @@ void OpenCLBuiltinFileEmitterBase::getTypeLists(
}

void OpenCLBuiltinFileEmitterBase::expandTypesInSignature(
const std::vector<Record *> &Signature,
ArrayRef<const Record *> Signature,
SmallVectorImpl<SmallVector<std::string, 2>> &Types) {
// Find out if there are any GenTypes in this signature, and if so, calculate
// into how many signatures they will expand.
unsigned NumSignatures = 1;
SmallVector<SmallVector<std::string, 4>, 4> ExpandedGenTypes;
for (const auto &Arg : Signature) {
SmallVector<std::string, 4> ExpandedArg;
std::vector<Record *> TypeList;
std::vector<const Record *> TypeList;
std::vector<int64_t> VectorList;
TypeFlags Flags;

Expand Down Expand Up @@ -1212,7 +1215,7 @@ void OpenCLBuiltinTestEmitter::emit() {
StringRef Name = B->getValueAsString("Name");

SmallVector<SmallVector<std::string, 2>, 4> FTypes;
expandTypesInSignature(B->getValueAsListOfDefs("Signature"), FTypes);
expandTypesInSignature(B->getValueAsListOfConstDefs("Signature"), FTypes);

OS << "// Test " << Name << "\n";

Expand Down Expand Up @@ -1281,7 +1284,7 @@ void OpenCLBuiltinHeaderEmitter::emit() {
std::string OptionalVersionEndif = emitVersionGuard(B);

SmallVector<SmallVector<std::string, 2>, 4> FTypes;
expandTypesInSignature(B->getValueAsListOfDefs("Signature"), FTypes);
expandTypesInSignature(B->getValueAsListOfConstDefs("Signature"), FTypes);

for (const auto &Signature : FTypes) {
StringRef OptionalTypeExtEndif = emitTypeExtensionGuards(Signature);
Expand Down
Loading