Add rsForEachInternal
Bug: 23535985
Added a compiler intrinsic rsParallelFor to the runtime API, which
is translated into an internal API (rsForEachInternal) by slang.
Added a test to RsTest (for native) and RSTest_CompatLib
(for support).
Enhanced the auto api generator to handle ellipsis argument,
intrinsics, internal-only APIs, and special level for API under
development.
Change-Id: I6e2cf3db868f426aa8e0b9a77732b66c1e6b9f03
diff --git a/api/GenerateStubsWhiteList.cpp b/api/GenerateStubsWhiteList.cpp
index 9b4297d..69afdbf 100644
--- a/api/GenerateStubsWhiteList.cpp
+++ b/api/GenerateStubsWhiteList.cpp
@@ -15,6 +15,7 @@
*/
#include <algorithm>
+#include <climits>
#include <iostream>
#include <iterator>
#include <sstream>
@@ -25,8 +26,8 @@
using namespace std;
-const int kMinimumApiLevelForTests = 11;
-const int kApiLevelWithFirst64Bit = 21;
+const unsigned int kMinimumApiLevelForTests = 11;
+const unsigned int kApiLevelWithFirst64Bit = 21;
// Used to map the built-in types to their mangled representations
struct BuiltInMangling {
@@ -58,7 +59,7 @@
* substitution for the provided type name, as would be done (mostly) by a
* preprocessor. Returns empty string if there's no substitution.
*/
-static string findSubstitute(const string& typeName, int apiLevel, int intSize) {
+static string findSubstitute(const string& typeName, unsigned int apiLevel, int intSize) {
const auto& types = systemSpecification.getTypes();
const auto type = types.find(typeName);
if (type != types.end()) {
@@ -92,7 +93,7 @@
* the resulting list. 'apiLevel' and 'intSize' specifies the API level and bitness
* we are currently processing.
*/
-list<string> expandTypedefs(const string type, int apiLevel, int intSize) {
+list<string> expandTypedefs(const string type, unsigned int apiLevel, int intSize) {
// Split the string in tokens.
istringstream stream(type);
list<string> tokens{istream_iterator<string>{stream}, istream_iterator<string>{}};
@@ -268,7 +269,7 @@
// Write to the stream the mangled representation of each parameter.
static bool writeParameters(ostringstream* stream, const std::vector<ParameterDefinition*>& params,
- int apiLevel, int intSize) {
+ unsigned int apiLevel, int intSize) {
if (params.empty()) {
*stream << "v";
return true;
@@ -298,7 +299,7 @@
*/
static bool addFunctionManglingToSet(const Function& function,
const FunctionPermutation& permutation, bool overloadable,
- int apiLevel, int intSize, set<string>* allManglings) {
+ unsigned int apiLevel, int intSize, set<string>* allManglings) {
const string& functionName = permutation.getName();
string mangling;
if (overloadable) {
@@ -322,22 +323,25 @@
* of API levels covered.
*/
static bool addManglingsForSpecification(const Function& function,
- const FunctionSpecification& spec, int lastApiLevel,
+ const FunctionSpecification& spec, unsigned int lastApiLevel,
set<string>* allManglings) {
// If the function is inlined, we won't generate an unresolved external for that.
if (spec.hasInline()) {
return true;
}
const VersionInfo info = spec.getVersionInfo();
- const int minApiLevel = info.minVersion ? info.minVersion : kMinimumApiLevelForTests;
- const int maxApiLevel = info.maxVersion ? info.maxVersion : lastApiLevel;
+ unsigned int minApiLevel, maxApiLevel;
+ minApiLevel = info.minVersion ? info.minVersion : kMinimumApiLevelForTests;
+ maxApiLevel = info.maxVersion ? info.maxVersion : lastApiLevel;
const bool overloadable = spec.isOverloadable();
/* We track success rather than aborting early in case of failure so that we
* generate all the error messages.
*/
bool success = true;
- for (int apiLevel = minApiLevel; apiLevel <= maxApiLevel; ++apiLevel) {
+ // Use 64-bit integer here for the loop count to avoid overflow
+ // (minApiLevel == maxApiLevel == UINT_MAX for unreleased API)
+ for (int64_t apiLevel = minApiLevel; apiLevel <= maxApiLevel; ++apiLevel) {
for (auto permutation : spec.getPermutations()) {
if (info.intSize == 0 || info.intSize == 32) {
if (!addFunctionManglingToSet(function, *permutation, overloadable, apiLevel, 32,
@@ -360,13 +364,17 @@
* to validate unresolved external references. 'lastApiLevel' is the largest api level found in
* all spec files.
*/
-static bool generateWhiteListFile(int lastApiLevel) {
+static bool generateWhiteListFile(unsigned int lastApiLevel) {
bool success = true;
// We generate all the manglings in a set to remove duplicates and to order them.
set<string> allManglings;
for (auto f : systemSpecification.getFunctions()) {
const Function* function = f.second;
for (auto spec : function->getSpecifications()) {
+ // Compiler intrinsics are not runtime APIs. Do not include them in the whitelist.
+ if (spec->isIntrinsic()) {
+ continue;
+ }
if (!addManglingsForSpecification(*function, *spec, lastApiLevel, &allManglings)) {
success = false; // We continue so we can generate all errors.
}
@@ -444,7 +452,7 @@
* This file can be used to verify the white list that's also generated in this file. To do so,
* run "llvm-nm -undefined-only -just-symbol-name" on the resulting bit code.
*/
-static bool generateApiTesterFile(const string& slangTestDirectory, int apiLevel) {
+static bool generateApiTesterFile(const string& slangTestDirectory, unsigned int apiLevel) {
GeneratedFile file;
if (!file.start(slangTestDirectory, "all" + to_string(apiLevel) + ".rs")) {
return false;
@@ -470,6 +478,10 @@
for (auto f : systemSpecification.getFunctions()) {
const Function* function = f.second;
for (auto spec : function->getSpecifications()) {
+ // Do not include internal APIs in the API tests.
+ if (spec->isInternal()) {
+ continue;
+ }
VersionInfo info = spec->getVersionInfo();
if (!info.includesVersion(apiLevel)) {
continue;
@@ -503,13 +515,13 @@
return true;
}
-bool generateStubsWhiteList(const string& slangTestDirectory, int maxApiLevel) {
- int lastApiLevel = min(systemSpecification.getMaximumApiLevel(), maxApiLevel);
+bool generateStubsWhiteList(const string& slangTestDirectory, unsigned int maxApiLevel) {
+ unsigned int lastApiLevel = min(systemSpecification.getMaximumApiLevel(), maxApiLevel);
if (!generateWhiteListFile(lastApiLevel)) {
return false;
}
// Generate a test file for each apiLevel.
- for (int i = kMinimumApiLevelForTests; i <= lastApiLevel; ++i) {
+ for (unsigned int i = kMinimumApiLevelForTests; i <= lastApiLevel; ++i) {
if (!generateApiTesterFile(slangTestDirectory, i)) {
return false;
}
