svenvh created this revision.
svenvh added a reviewer: azabaznov.
svenvh added a project: clang.
Herald added subscribers: ldrumm, yaxunl.
svenvh requested review of this revision.
Herald added a subscriber: cfe-commits.
Instead of using a MinVersion and MaxVersion field, encode the version
of a builtin using a mask that aligns better with version handling in
OpenCLOptions.h. In addition, this saves a field in the BuiltinTable.
This change allows a finer-grained control over the OpenCL versions in
which a builtin is available: instead of a range, we can now toggle
each version individually.
The fine-grained version control is not yet exposed on the TableGen
definitions side, as changes for OpenCL 3 feature optionality still
need to be defined and will affect how we want to expose these.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D100492
Files:
clang/lib/Sema/SemaLookup.cpp
clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
Index: clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
===================================================================
--- clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
+++ clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
@@ -339,10 +339,8 @@
const bool IsConv : 1;
// OpenCL extension(s) required for this overload.
const unsigned short Extension;
- // First OpenCL version in which this overload was introduced (e.g. CL20).
- const unsigned short MinVersion;
- // First OpenCL version in which this overload was removed (e.g. CL20).
- const unsigned short MaxVersion;
+ // OpenCL versions in which this overload is available.
+ const unsigned short Versions;
};
)";
@@ -490,6 +488,29 @@
OS << "};\n\n";
}
+// Encode a range MinVersion..MaxVersion into a single bit mask that can be
+// checked against LangOpts using isOpenCLVersionContainedInMask().
+// This must be kept in sync with OpenCLVersionID in OpenCLOptions.h.
+// (Including OpenCLOptions.h here would be a layering violation.)
+static unsigned short EncodeVersions(unsigned int MinVersion,
+ unsigned int MaxVersion) {
+ unsigned short Encoded = 0;
+
+ // A maximum version of 0 means available in all later versions.
+ if (MaxVersion == 0) {
+ MaxVersion = UINT_MAX;
+ }
+
+ unsigned VersionIDs[] = {100, 110, 120, 200, 300};
+ for (unsigned I = 0; I < sizeof(VersionIDs) / sizeof(VersionIDs[0]); I++) {
+ if (VersionIDs[I] >= MinVersion && VersionIDs[I] < MaxVersion) {
+ Encoded |= 1 << I;
+ }
+ }
+
+ return Encoded;
+}
+
void BuiltinNameEmitter::EmitBuiltinTable() {
unsigned Index = 0;
@@ -510,9 +531,10 @@
<< (Overload.first->getValueAsBit("IsConst")) << ", "
<< (Overload.first->getValueAsBit("IsConv")) << ", "
<< FunctionExtensionIndex[ExtName] << ", "
- << Overload.first->getValueAsDef("MinVersion")->getValueAsInt("ID")
- << ", "
- << Overload.first->getValueAsDef("MaxVersion")->getValueAsInt("ID")
+ << EncodeVersions(Overload.first->getValueAsDef("MinVersion")
+ ->getValueAsInt("ID"),
+ Overload.first->getValueAsDef("MaxVersion")
+ ->getValueAsInt("ID"))
<< " },\n";
Index++;
}
Index: clang/lib/Sema/SemaLookup.cpp
===================================================================
--- clang/lib/Sema/SemaLookup.cpp
+++ clang/lib/Sema/SemaLookup.cpp
@@ -798,19 +798,16 @@
// as argument. Only meaningful for generic types, otherwise equals 1.
unsigned GenTypeMaxCnt;
+ ASTContext &Context = S.Context;
+
for (unsigned SignatureIndex = 0; SignatureIndex < Len; SignatureIndex++) {
const OpenCLBuiltinStruct &OpenCLBuiltin =
BuiltinTable[FctIndex + SignatureIndex];
- ASTContext &Context = S.Context;
- // Ignore this BIF if its version does not match the language options.
- unsigned OpenCLVersion = Context.getLangOpts().OpenCLVersion;
- if (Context.getLangOpts().OpenCLCPlusPlus)
- OpenCLVersion = 200;
- if (OpenCLVersion < OpenCLBuiltin.MinVersion)
- continue;
- if ((OpenCLBuiltin.MaxVersion != 0) &&
- (OpenCLVersion >= OpenCLBuiltin.MaxVersion))
+ // Ignore this builtin function if it is not available in the currently
+ // selected language version.
+ if (!isOpenCLVersionContainedInMask(Context.getLangOpts(),
+ OpenCLBuiltin.Versions))
continue;
// Ignore this builtin function if it carries an extension macro that is
Index: clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
===================================================================
--- clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
+++ clang/utils/TableGen/ClangOpenCLBuiltinEmitter.cpp
@@ -339,10 +339,8 @@
const bool IsConv : 1;
// OpenCL extension(s) required for this overload.
const unsigned short Extension;
- // First OpenCL version in which this overload was introduced (e.g. CL20).
- const unsigned short MinVersion;
- // First OpenCL version in which this overload was removed (e.g. CL20).
- const unsigned short MaxVersion;
+ // OpenCL versions in which this overload is available.
+ const unsigned short Versions;
};
)";
@@ -490,6 +488,29 @@
OS << "};\n\n";
}
+// Encode a range MinVersion..MaxVersion into a single bit mask that can be
+// checked against LangOpts using isOpenCLVersionContainedInMask().
+// This must be kept in sync with OpenCLVersionID in OpenCLOptions.h.
+// (Including OpenCLOptions.h here would be a layering violation.)
+static unsigned short EncodeVersions(unsigned int MinVersion,
+ unsigned int MaxVersion) {
+ unsigned short Encoded = 0;
+
+ // A maximum version of 0 means available in all later versions.
+ if (MaxVersion == 0) {
+ MaxVersion = UINT_MAX;
+ }
+
+ unsigned VersionIDs[] = {100, 110, 120, 200, 300};
+ for (unsigned I = 0; I < sizeof(VersionIDs) / sizeof(VersionIDs[0]); I++) {
+ if (VersionIDs[I] >= MinVersion && VersionIDs[I] < MaxVersion) {
+ Encoded |= 1 << I;
+ }
+ }
+
+ return Encoded;
+}
+
void BuiltinNameEmitter::EmitBuiltinTable() {
unsigned Index = 0;
@@ -510,9 +531,10 @@
<< (Overload.first->getValueAsBit("IsConst")) << ", "
<< (Overload.first->getValueAsBit("IsConv")) << ", "
<< FunctionExtensionIndex[ExtName] << ", "
- << Overload.first->getValueAsDef("MinVersion")->getValueAsInt("ID")
- << ", "
- << Overload.first->getValueAsDef("MaxVersion")->getValueAsInt("ID")
+ << EncodeVersions(Overload.first->getValueAsDef("MinVersion")
+ ->getValueAsInt("ID"),
+ Overload.first->getValueAsDef("MaxVersion")
+ ->getValueAsInt("ID"))
<< " },\n";
Index++;
}
Index: clang/lib/Sema/SemaLookup.cpp
===================================================================
--- clang/lib/Sema/SemaLookup.cpp
+++ clang/lib/Sema/SemaLookup.cpp
@@ -798,19 +798,16 @@
// as argument. Only meaningful for generic types, otherwise equals 1.
unsigned GenTypeMaxCnt;
+ ASTContext &Context = S.Context;
+
for (unsigned SignatureIndex = 0; SignatureIndex < Len; SignatureIndex++) {
const OpenCLBuiltinStruct &OpenCLBuiltin =
BuiltinTable[FctIndex + SignatureIndex];
- ASTContext &Context = S.Context;
- // Ignore this BIF if its version does not match the language options.
- unsigned OpenCLVersion = Context.getLangOpts().OpenCLVersion;
- if (Context.getLangOpts().OpenCLCPlusPlus)
- OpenCLVersion = 200;
- if (OpenCLVersion < OpenCLBuiltin.MinVersion)
- continue;
- if ((OpenCLBuiltin.MaxVersion != 0) &&
- (OpenCLVersion >= OpenCLBuiltin.MaxVersion))
+ // Ignore this builtin function if it is not available in the currently
+ // selected language version.
+ if (!isOpenCLVersionContainedInMask(Context.getLangOpts(),
+ OpenCLBuiltin.Versions))
continue;
// Ignore this builtin function if it carries an extension macro that is
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
