maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[openmp] Use switch in isAllowedClauseForDirective instead of multiple if 

Summary:
Change the test in isAllowedClauseForDirective from if with multiple conditions
to a main switch on directive and then switches on clause for each directive. Version
check is still done with a condition in the return statment.

Reviewers: jdoerfert, jdenny

Reviewed By: jdenny

Subscribers: yaxunl, guansong, sstefan1, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D83363
This commit is contained in:
Valentin Clement 2020-07-08 19:54:34 -04:00 committed by clementval
parent 5a98581d19
commit 23084878e9
3 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/test/TableGen/directive1.td
View File

@ -106,9 +106,17 @@ def TDL_DirA : Directive<"dira"> {
// IMPL-NEXT: bool llvm::tdl::isAllowedClauseForDirective(Directive D, Clause C, unsigned Version) {
// IMPL-NEXT: assert(unsigned(D) <= llvm::tdl::Directive_enumSize);
// IMPL-NEXT: assert(unsigned(C) <= llvm::tdl::Clause_enumSize);
// IMPL-NEXT: if (D == TDLD_dira && C == TDLC_clausea && 1 <= Version && 2147483647 >= Version)
// IMPL-NEXT: return true;
// IMPL-NEXT: if (D == TDLD_dira && C == TDLC_clauseb && 1 <= Version && 2147483647 >= Version)
// IMPL-NEXT: return true;
// IMPL-NEXT: return false;
// IMPL-NEXT: switch (D) {
// IMPL-NEXT: case TDLD_dira:
// IMPL-NEXT: switch (C) {
// IMPL-NEXT: case TDLC_clausea:
// IMPL-NEXT: return 1 <= Version && 2147483647 >= Version;
// IMPL-NEXT: case TDLC_clauseb:
// IMPL-NEXT: return 1 <= Version && 2147483647 >= Version;
// IMPL-NEXT: default:
// IMPL-NEXT: return false;
// IMPL-NEXT: }
// IMPL-NEXT: break;
// IMPL-NEXT: }
// IMPL-NEXT: llvm_unreachable("Invalid Tdl Directive kind");
// IMPL-NEXT: }

19
llvm/test/TableGen/directive2.td
View File

@ -97,10 +97,17 @@ def TDL_DirA : Directive<"dira"> {
// IMPL-NEXT: bool llvm::tdl::isAllowedClauseForDirective(Directive D, Clause C, unsigned Version) {
// IMPL-NEXT: assert(unsigned(D) <= llvm::tdl::Directive_enumSize);
// IMPL-NEXT: assert(unsigned(C) <= llvm::tdl::Clause_enumSize);
// IMPL-NEXT: if (D == TDLD_dira && C == TDLC_clausea && 2 <= Version && 4 >= Version)
// IMPL-NEXT: return true;
// IMPL-NEXT: if (D == TDLD_dira && C == TDLC_clauseb && 2 <= Version && 2147483647 >= Version)
// IMPL-NEXT: return true;
// IMPL-NEXT: return false;
// IMPL-NEXT: switch (D) {
// IMPL-NEXT: case TDLD_dira:
// IMPL-NEXT: switch (C) {
// IMPL-NEXT: case TDLC_clausea:
// IMPL-NEXT: return 2 <= Version && 4 >= Version;
// IMPL-NEXT: case TDLC_clauseb:
// IMPL-NEXT: return 2 <= Version && 2147483647 >= Version;
// IMPL-NEXT: default:
// IMPL-NEXT: return false;
// IMPL-NEXT: }
// IMPL-NEXT: break;
// IMPL-NEXT: }
// IMPL-NEXT: llvm_unreachable("Invalid Tdl Directive kind");
// IMPL-NEXT: }

59
llvm/utils/TableGen/DirectiveEmitter.cpp
View File

@ -202,29 +202,27 @@ void GenerateGetKind(const std::vector<Record *> &Records, raw_ostream &OS,
OS << "}\n";
}
void GenerateTestForAllowedClauses(const std::vector<Record *> &Clauses,
raw_ostream &OS, StringRef DirectiveName,
StringRef DirectivePrefix,
StringRef ClausePrefix) {
const auto FormattedDirectiveName = getFormattedName(DirectiveName);
void GenerateCaseForVersionedClauses(const std::vector<Record *> &Clauses,
raw_ostream &OS, StringRef DirectiveName,
StringRef DirectivePrefix,
StringRef ClausePrefix) {
for (const auto &C : Clauses) {
const auto MinVersion = C->getValueAsInt("minVersion");
const auto MaxVersion = C->getValueAsInt("maxVersion");
const auto SpecificClause = C->getValueAsDef("clause");
const auto ClauseName = SpecificClause->getValueAsString("name");
OS << " if (D == " << DirectivePrefix << FormattedDirectiveName
<< " && C == " << ClausePrefix << getFormattedName(ClauseName) << " && "
<< MinVersion << " <= Version && " << MaxVersion << " >= Version)\n";
OS << " return true;\n";
OS << " case " << ClausePrefix << getFormattedName(ClauseName)
<< ":\n";
OS << " return " << MinVersion << " <= Version && " << MaxVersion
<< " >= Version;\n";
}
}
// Generate the isAllowedClauseForDirective function implementation.
void GenerateIsAllowedClause(const std::vector<Record *> &Directives,
raw_ostream &OS, StringRef DirectivePrefix,
StringRef ClausePrefix, StringRef CppNamespace) {
raw_ostream &OS, StringRef LanguageName,
StringRef DirectivePrefix, StringRef ClausePrefix,
StringRef CppNamespace) {
OS << "\n";
OS << "bool llvm::" << CppNamespace << "::isAllowedClauseForDirective("
<< "Directive D, Clause C, unsigned Version) {\n";
@ -233,24 +231,39 @@ void GenerateIsAllowedClause(const std::vector<Record *> &Directives,
OS << " assert(unsigned(C) <= llvm::" << CppNamespace
<< "::Clause_enumSize);\n";
OS << " switch (D) {\n";
for (const auto &D : Directives) {
const auto DirectiveName = D->getValueAsString("name");
OS << " case " << DirectivePrefix << getFormattedName(DirectiveName)
<< ":\n";
OS << " switch (C) {\n";
const auto &AllowedClauses = D->getValueAsListOfDefs("allowedClauses");
GenerateTestForAllowedClauses(AllowedClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
GenerateCaseForVersionedClauses(AllowedClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
const auto &AllowedOnceClauses =
D->getValueAsListOfDefs("allowedOnceClauses");
GenerateTestForAllowedClauses(AllowedOnceClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
GenerateCaseForVersionedClauses(AllowedOnceClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
const auto &RequiredClauses = D->getValueAsListOfDefs("requiredClauses");
GenerateTestForAllowedClauses(RequiredClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
GenerateCaseForVersionedClauses(RequiredClauses, OS, DirectiveName,
DirectivePrefix, ClausePrefix);
OS << " default:\n";
OS << " return false;\n";
OS << " }\n"; // End of clauses switch
OS << " break;\n";
}
OS << " return false;\n";
OS << "}\n";
OS << " }\n"; // End of directives switch
OS << " llvm_unreachable(\"Invalid " << LanguageName
<< " Directive kind\");\n";
OS << "}\n"; // End of function isAllowedClauseForDirective
}
// Generate the implemenation section for the enumeration in the directive
@ -291,8 +304,8 @@ void EmitDirectivesImpl(RecordKeeper &Records, raw_ostream &OS) {
GenerateGetName(Clauses, OS, "Clause", ClausePrefix, LanguageName,
CppNamespace);
GenerateIsAllowedClause(Directives, OS, DirectivePrefix, ClausePrefix,
CppNamespace);
GenerateIsAllowedClause(Directives, OS, LanguageName, DirectivePrefix,
ClausePrefix, CppNamespace);
}
} // namespace llvm