[openacc][openmp] Reduce number of generated file and prefer inclusion of .inc

[clementval]

Summary

Follow up from D92955 and D83636. This patch makes the base cpp files
OMP.cpp and ACC.cpp normal files and they now include the XXX.inc file
generated by tablegen. This reduces the number of file generated by the
DirectiveEmitter backend and makes it closer to the proposal in D83636.

[clementval]

Ping

[clementval]

Ping

[clementval]

@thakis If it still makes sense to make the directive TableGen backend closer to your initial proposal (D83636) please have a look. Otherwise I'll abandon this revision.
@jdoerfert

[Meinersbur]

Not generating a translation unit directly but including the generated part is great.

However, emitting everything into a single file and selecting using preprocessor directives doesn't seem what other tablegen targets are doing. E.g. for intrinsics there is IntrinsicImpl.inc, IntrinsicEnums.inc. Clang has Attrs.inc, AttrImpl.inc, AttrVisitor.inc, etc.

[clementval]

In D93560#2627056, @Meinersbur wrote:

However, emitting everything into a single file and selecting using preprocessor directives doesn't seem what other tablegen targets are doing. E.g. for intrinsics there is IntrinsicImpl.inc, IntrinsicEnums.inc. Clang has Attrs.inc, AttrImpl.inc, AttrVisitor.inc, etc.

This is what MLIR is doing with all its TableGen related code generation. Since we are generating lots of different code block, the number of files would probably explode.

[Meinersbur]

The reason why MLIR does not split declaration and implementation-generation might be that nobody yet wanted to invest the work to split them. While I would not request splitting tablegen-generated files into separate files, fusing feels like a step backwards. If only implementation details change, with a merged output everything that includes OMP.h must be recompiled as well. I don't see how a separation into declaration and implementation causes the number of files to explode.

[clementval]

In D93560#2629662, @Meinersbur wrote:

The reason why MLIR does not split declaration and implementation-generation might be that nobody yet wanted to invest the work to split them. While I would not request splitting tablegen-generated files into separate files, fusing feels like a step backwards. If only implementation details change, with a merged output everything that includes OMP.h must be recompiled as well. I don't see how a separation into declaration and implementation causes the number of files to explode.

We are not fusing header and implementation. We had initially 3 files and after comments from a previous patch it was recommended to reduce that to two files. So after this patch you will have one header file and the implementation with the different code block.

[Meinersbur]

OK, I found the header include is generated in CMakeLists.txt in include/llvm/Frontend. This patch removes the "-gen-directive-impl" target and integrates it into "-gen-directive-gen". IMHO "-gen-directive-impl" is the better name for for the implementation file, following the scheme set by "AttrImpl.inc" and "IntrinsicImpl.inc".

Sorry for me not noticing that there have been 3 tablegen targets per td.

[Meinersbur]

I'd prefer using the name "impl" for the implementation, but my LGTM does not depend on it.

llvm/utils/TableGen/TableGen.cpp

141

What does "part" refer to?

[clementval]

In D93560#2630347, @Meinersbur wrote:

I'd prefer using the name "impl" for the implementation, but my LGTM does not depend on it.

Thanks for the review.

I'm fine with changing the current name to impl. @kiranchandramohan What do you think about it?

llvm/utils/TableGen/TableGen.cpp

141

It refers to various code "part" needed in clang and flang and libFrontend. Not sure if we can be more precise here.

[Meinersbur]

llvm/utils/TableGen/TableGen.cpp

141

"part" seems to refer to -gen-directive-impl, as in "the other part of the implementation". Again, I suggest to keep the gen-directive-impl flag instead.

[clementval]

Rebase and address review comment

[thakis]

Great change, thanks for doing it!

Can we fold the .h.inc files into the .inc files too? I haven't seen .h.inc files elsewhere in the build.

[clementval]

In D93560#2644765, @thakis wrote:

Great change, thanks for doing it!

Can we fold the .h.inc files into the .inc files too? I haven't seen .h.inc files elsewhere in the build.

We can do it as well if necessary. MLIR has a lot of .h.inc.

llvm/include/llvm/Frontend/OpenACC/ACC.td

 
 def OpenACC : DirectiveLanguage {
   let name = "OpenACC";
   let cppNamespace = "acc"; // final namespace will be llvm::acc
   let directivePrefix = "ACCD_";
   let clausePrefix = "ACCC_";
   let makeEnumAvailableInNamespace = true;
   let enableBitmaskEnumInNamespace = true;
-  let includeHeader = "llvm/Frontend/OpenACC/ACC.h.inc";
   let clauseEnumSetClass = "AccClauseSet";
   let flangClauseBaseClass = "AccClause";
 }
 
 //===----------------------------------------------------------------------===//
 // Definition of OpenACC clauses
 //===----------------------------------------------------------------------===//
 

llvm/include/llvm/Frontend/OpenACC/CMakeLists.txt

 set(LLVM_TARGET_DEFINITIONS ACC.td)
 tablegen(LLVM ACC.h.inc --gen-directive-decl)
-tablegen(LLVM ACC.inc --gen-directive-gen)
+tablegen(LLVM ACC.inc --gen-directive-impl)
 add_public_tablegen_target(acc_gen)

llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt

 set(LLVM_TARGET_DEFINITIONS OMP.td)
 tablegen(LLVM OMP.h.inc --gen-directive-decl)
-tablegen(LLVM OMP.inc --gen-directive-gen)
+tablegen(LLVM OMP.inc --gen-directive-impl)
 add_public_tablegen_target(omp_gen)

llvm/include/llvm/Frontend/OpenMP/OMP.td

 
 def OpenMP : DirectiveLanguage {
   let name = "OpenMP";
   let cppNamespace = "omp"; // final namespace will be llvm::omp
   let directivePrefix = "OMPD_";
   let clausePrefix = "OMPC_";
   let makeEnumAvailableInNamespace = true;
   let enableBitmaskEnumInNamespace = true;
-  let includeHeader = "llvm/Frontend/OpenMP/OMP.h.inc";
   let clauseEnumSetClass = "OmpClauseSet";
   let flangClauseBaseClass = "OmpClause";
 }
 
 //===----------------------------------------------------------------------===//
 // Definition of OpenMP clauses
 //===----------------------------------------------------------------------===//
 

llvm/include/llvm/TableGen/DirectiveEmitter.h

public:
   StringRef getDirectivePrefix() const {
     return Def->getValueAsString("directivePrefix");
   }
 
   StringRef getClausePrefix() const {
     return Def->getValueAsString("clausePrefix");
   }
 
-  StringRef getIncludeHeader() const {
-    return Def->getValueAsString("includeHeader");
-  }
-
   StringRef getClauseEnumSetClass() const {
     return Def->getValueAsString("clauseEnumSetClass");
   }
 
   StringRef getFlangClauseBaseClass() const {
     return Def->getValueAsString("flangClauseBaseClass");
   }
 

llvm/lib/Frontend/OpenACC/ACC.cpp

+//===- ACC.cpp ------ Collection of helpers for OpenACC -------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Frontend/OpenACC/ACC.h.inc"
+
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/ErrorHandling.h"
+
+using namespace llvm;
+using namespace acc;
+
+#define GEN_DIRECTIVES_IMPL
+#include "llvm/Frontend/OpenACC/ACC.inc"

llvm/lib/Frontend/OpenACC/CMakeLists.txt

-set(LLVM_TARGET_DEFINITIONS ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend/OpenACC/ACC.td)
-tablegen(LLVM ACC.cpp --gen-directive-impl)
-add_public_tablegen_target(acc_cpp)
-
 add_llvm_component_library(LLVMFrontendOpenACC
-  ACC.cpp # Generated by tablegen above
+  ACC.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend/OpenACC
 
   DEPENDS
   acc_gen
-  acc_cpp
 )
 
 target_link_libraries(LLVMFrontendOpenACC LLVMSupport)
 

llvm/lib/Frontend/OpenMP/CMakeLists.txt

-set(LLVM_TARGET_DEFINITIONS ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend/OpenMP/OMP.td)
-tablegen(LLVM OMP.cpp --gen-directive-impl)
-add_public_tablegen_target(omp_cpp)
-
 add_llvm_component_library(LLVMFrontendOpenMP
-  OMP.cpp # Generated by tablegen above
+  OMP.cpp
   OMPContext.cpp
   OMPIRBuilder.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend/OpenMP
 
   DEPENDS
   intrinsics_gen
   omp_gen
-  omp_cpp
 
   LINK_COMPONENTS
   Core
   Support
   TransformUtils
   )

llvm/lib/Frontend/OpenMP/OMP.cpp

+//===- OMP.cpp ------ Collection of helpers for OpenMP --------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Frontend/OpenMP/OMP.h.inc"
+
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/ErrorHandling.h"
+
+using namespace llvm;
+using namespace omp;
+
+#define GEN_DIRECTIVES_IMPL
+#include "llvm/Frontend/OpenMP/OMP.inc"

llvm/test/TableGen/directive1.td

 // RUN: llvm-tblgen -gen-directive-decl -I %p/../../include %s | FileCheck -match-full-lines %s
 // RUN: llvm-tblgen -gen-directive-impl -I %p/../../include %s | FileCheck -match-full-lines %s -check-prefix=IMPL
-// RUN: llvm-tblgen -gen-directive-gen -I %p/../../include %s | FileCheck -match-full-lines %s -check-prefix=GEN
 
 include "llvm/Frontend/Directive/DirectiveBase.td"
 
 def TestDirectiveLanguage : DirectiveLanguage {
   let name = "Tdl";
 
   let cppNamespace = "tdl";
   let directivePrefix = "TDLD_";

 // CHECK-NEXT:  AKind getAKind(StringRef);
 // CHECK-NEXT:  llvm::StringRef getTdlAKindName(AKind);
 // CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace tdl
 // CHECK-NEXT:  } // namespace llvm
 // CHECK-NEXT:  #endif // LLVM_Tdl_INC
 
 
-// IMPL:       #include "llvm/ADT/StringRef.h"
-// IMPL-NEXT:  #include "llvm/ADT/StringSwitch.h"
-// IMPL-NEXT:  #include "llvm/Support/ErrorHandling.h"
+// IMPL:       #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
+// IMPL-NEXT:  #undef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
 // IMPL-EMPTY:
-// IMPL-NEXT:  using namespace llvm;
-// IMPL-NEXT:  using namespace tdl;
+// IMPL-NEXT:  namespace llvm {
+// IMPL-NEXT:  namespace tdl {
+// IMPL-EMPTY:
+// IMPL-NEXT:    // Sets for dira
+// IMPL-EMPTY:
+// IMPL-NEXT:    static  allowedClauses_TDLD_dira {
+// IMPL-NEXT:      llvm::tdl::Clause::TDLC_clausea,
+// IMPL-NEXT:      llvm::tdl::Clause::TDLC_clauseb,
+// IMPL-NEXT:    };
+// IMPL-EMPTY:
+// IMPL-NEXT:    static  allowedOnceClauses_TDLD_dira {
+// IMPL-NEXT:    };
+// IMPL-EMPTY:
+// IMPL-NEXT:    static  allowedExclusiveClauses_TDLD_dira {
+// IMPL-NEXT:    };
+// IMPL-EMPTY:
+// IMPL-NEXT:    static  requiredClauses_TDLD_dira {
+// IMPL-NEXT:    };
+// IMPL-NEXT:  } // namespace tdl
+// IMPL-NEXT:  } // namespace llvm
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_DIRECTIVE_CLAUSE_SETS
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-NEXT:  #undef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT:  {
+// IMPL-NEXT:    {llvm::tdl::Directive::TDLD_dira,
+// IMPL-NEXT:      {
+// IMPL-NEXT:        llvm::tdl::allowedClauses_TDLD_dira,
+// IMPL-NEXT:        llvm::tdl::allowedOnceClauses_TDLD_dira,
+// IMPL-NEXT:        llvm::tdl::allowedExclusiveClauses_TDLD_dira,
+// IMPL-NEXT:        llvm::tdl::requiredClauses_TDLD_dira,
+// IMPL-NEXT:      }
+// IMPL-NEXT:    },
+// IMPL-NEXT:  }
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  EMPTY_CLASS(Clausea);
+// IMPL-NEXT:  WRAPPER_CLASS(Clauseb, std::optional<IntExpr>);
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-EMPTY:
+// IMPL-NEXT:  Clausea
+// IMPL-NEXT:  , Clauseb
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-NEXT:  #undef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  NODE(TdlClause, Clausea)
+// IMPL-NEXT:  NODE(TdlClause, Clauseb)
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_UNPARSE
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_UNPARSE
+// IMPL-EMPTY:
+// IMPL-NEXT:  void Before(const TdlClause::Clausea &) { Word("CLAUSEA"); }
+// IMPL-NEXT:  void Unparse(const TdlClause::Clauseb &x) {
+// IMPL-NEXT:    Word("CLAUSEB");
+// IMPL-NEXT:    Walk("(", x.v, ")");
+// IMPL-NEXT:  }
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_UNPARSE
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_CHECK_ENTER
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_CHECK_ENTER
+// IMPL-EMPTY:
+// IMPL-NEXT:  void Enter(const parser::TdlClause::Clausea &);
+// IMPL-NEXT:  void Enter(const parser::TdlClause::Clauseb &);
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_CHECK_ENTER
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_KIND_MAP
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_KIND_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT:  if constexpr (std::is_same_v<A, parser::TdlClause::Clausea>)
+// IMPL-NEXT:    return llvm::tdl::Clause::TDLC_clausea;
+// IMPL-NEXT:  if constexpr (std::is_same_v<A, parser::TdlClause::Clauseb>)
+// IMPL-NEXT:    return llvm::tdl::Clause::TDLC_clauseb;
+// IMPL-NEXT:  llvm_unreachable("Invalid Tdl Parser clause");
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_KIND_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_CLANG_CLAUSE_CLASS
+// IMPL-NEXT:  #undef GEN_CLANG_CLAUSE_CLASS
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifndef CLAUSE
+// IMPL-NEXT:  #define CLAUSE(Enum, Str, Implicit)
+// IMPL-NEXT:  #endif
+// IMPL-NEXT:  #ifndef CLAUSE_CLASS
+// IMPL-NEXT:  #define CLAUSE_CLASS(Enum, Str, Class)
+// IMPL-NEXT:  #endif
+// IMPL-NEXT:  #ifndef CLAUSE_NO_CLASS
+// IMPL-NEXT:  #define CLAUSE_NO_CLASS(Enum, Str)
+// IMPL-NEXT:  #endif
+// IMPL-EMPTY:
+// IMPL-NEXT:  #define __CLAUSE(Name, Class)                      \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
+// IMPL-NEXT:    CLAUSE_CLASS(TDLC_##Name, #Name, Class)
+// IMPL-NEXT:  #define __CLAUSE_NO_CLASS(Name)                    \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
+// IMPL-NEXT:    CLAUSE_NO_CLASS(TDLC_##Name, #Name)
+// IMPL-NEXT:  #define __IMPLICIT_CLAUSE_CLASS(Name, Str, Class)  \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
+// IMPL-NEXT:    CLAUSE_CLASS(TDLC_##Name, Str, Class)
+// IMPL-NEXT:  #define __IMPLICIT_CLAUSE_NO_CLASS(Name, Str)      \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
+// IMPL-NEXT:    CLAUSE_NO_CLASS(TDLC_##Name, Str)
+// IMPL-EMPTY:
+// IMPL-NEXT:  __CLAUSE_NO_CLASS(clausea)
+// IMPL-NEXT:  __CLAUSE_NO_CLASS(clauseb)
+// IMPL-EMPTY:
+// IMPL-NEXT:  #undef __IMPLICIT_CLAUSE_NO_CLASS
+// IMPL-NEXT:  #undef __IMPLICIT_CLAUSE_CLASS
+// IMPL-NEXT:  #undef __CLAUSE
+// IMPL-NEXT:  #undef CLAUSE_NO_CLASS
+// IMPL-NEXT:  #undef CLAUSE_CLASS
+// IMPL-NEXT:  #undef CLAUSE
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_CLANG_CLAUSE_CLASS
+// IMPL-EMPTY:
+
+// IMPL:       #ifdef GEN_DIRECTIVES_IMPL
+// IMPL-NEXT:  #undef GEN_DIRECTIVES_IMPL
 // IMPL-EMPTY:
 // IMPL-NEXT:  Directive llvm::tdl::getTdlDirectiveKind(llvm::StringRef Str) {
 // IMPL-NEXT:    return llvm::StringSwitch<Directive>(Str)
 // IMPL-NEXT:      .Case("dira",TDLD_dira)
 // IMPL-NEXT:      .Default(TDLD_dira);
 // IMPL-NEXT:  }
 // IMPL-EMPTY:
 // IMPL-NEXT:  llvm::StringRef llvm::tdl::getTdlDirectiveName(Directive Kind) {

 // IMPL-NEXT:          default:
 // IMPL-NEXT:            return false;
 // IMPL-NEXT:        }
 // IMPL-NEXT:        break;
 // IMPL-NEXT:    }
 // IMPL-NEXT:    llvm_unreachable("Invalid Tdl Directive kind");
 // IMPL-NEXT:  }
 // IMPL-EMPTY:
-
-
-
-// GEN:       #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-NEXT:  #undef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-EMPTY:
-// GEN-NEXT:  namespace llvm {
-// GEN-NEXT:  namespace tdl {
-// GEN-EMPTY:
-// GEN-NEXT:    // Sets for dira
-// GEN-EMPTY:
-// GEN-NEXT:    static  allowedClauses_TDLD_dira {
-// GEN-NEXT:      llvm::tdl::Clause::TDLC_clausea,
-// GEN-NEXT:      llvm::tdl::Clause::TDLC_clauseb,
-// GEN-NEXT:    };
-// GEN-EMPTY:
-// GEN-NEXT:    static  allowedOnceClauses_TDLD_dira {
-// GEN-NEXT:    };
-// GEN-EMPTY:
-// GEN-NEXT:    static  allowedExclusiveClauses_TDLD_dira {
-// GEN-NEXT:    };
-// GEN-EMPTY:
-// GEN-NEXT:    static  requiredClauses_TDLD_dira {
-// GEN-NEXT:    };
-// GEN-NEXT:  } // namespace tdl
-// GEN-NEXT:  } // namespace llvm
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-NEXT:  #undef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-EMPTY:
-// GEN-NEXT:  {
-// GEN-NEXT:    {llvm::tdl::Directive::TDLD_dira,
-// GEN-NEXT:      {
-// GEN-NEXT:        llvm::tdl::allowedClauses_TDLD_dira,
-// GEN-NEXT:        llvm::tdl::allowedOnceClauses_TDLD_dira,
-// GEN-NEXT:        llvm::tdl::allowedExclusiveClauses_TDLD_dira,
-// GEN-NEXT:        llvm::tdl::requiredClauses_TDLD_dira,
-// GEN-NEXT:      }
-// GEN-NEXT:    },
-// GEN-NEXT:  }
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-EMPTY:
-// GEN-NEXT:  EMPTY_CLASS(Clausea);
-// GEN-NEXT:  WRAPPER_CLASS(Clauseb, std::optional<IntExpr>);
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-EMPTY:
-// GEN-NEXT:  Clausea
-// GEN-NEXT:  , Clauseb
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-NEXT:  #undef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-EMPTY:
-// GEN-NEXT:  NODE(TdlClause, Clausea)
-// GEN-NEXT:  NODE(TdlClause, Clauseb)
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_UNPARSE
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_UNPARSE
-// GEN-EMPTY:
-// GEN-NEXT:  void Before(const TdlClause::Clausea &) { Word("CLAUSEA"); }
-// GEN-NEXT:  void Unparse(const TdlClause::Clauseb &x) {
-// GEN-NEXT:    Word("CLAUSEB");
-// GEN-NEXT:    Walk("(", x.v, ")");
-// GEN-NEXT:  }
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_UNPARSE
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_CHECK_ENTER
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_CHECK_ENTER
-// GEN-EMPTY:
-// GEN-NEXT:  void Enter(const parser::TdlClause::Clausea &);
-// GEN-NEXT:  void Enter(const parser::TdlClause::Clauseb &);
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_CHECK_ENTER
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_KIND_MAP
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_KIND_MAP
-// GEN-EMPTY:
-// GEN-NEXT:  if constexpr (std::is_same_v<A, parser::TdlClause::Clausea>)
-// GEN-NEXT:    return llvm::tdl::Clause::TDLC_clausea;
-// GEN-NEXT:  if constexpr (std::is_same_v<A, parser::TdlClause::Clauseb>)
-// GEN-NEXT:    return llvm::tdl::Clause::TDLC_clauseb;
-// GEN-NEXT:  llvm_unreachable("Invalid Tdl Parser clause");
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_KIND_MAP
-// GEN-EMPTY:
+// IMPL-NEXT:  #endif // GEN_DIRECTIVES_IMPL

llvm/test/TableGen/directive2.td

 // RUN: llvm-tblgen -gen-directive-decl -I %p/../../include %s | FileCheck -match-full-lines %s
 // RUN: llvm-tblgen -gen-directive-impl -I %p/../../include %s | FileCheck -match-full-lines %s -check-prefix=IMPL
-// RUN: llvm-tblgen -gen-directive-gen -I %p/../../include %s | FileCheck -match-full-lines %s -check-prefix=GEN
 
 include "llvm/Frontend/Directive/DirectiveBase.td"
 
 def TestDirectiveLanguage : DirectiveLanguage {
   let name = "Tdl";
 
   let cppNamespace = "tdl";
   let directivePrefix = "TDLD_";

 // CHECK-EMPTY:
 // CHECK-NEXT:  /// Return true if \p C is a valid clause for \p D in version \p Version.
 // CHECK-NEXT:  bool isAllowedClauseForDirective(Directive D, Clause C, unsigned Version);
 // CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace tdl
 // CHECK-NEXT:  } // namespace llvm
 // CHECK-NEXT:  #endif // LLVM_Tdl_INC
 
-// IMPL:       #include "tdl.h.inc"
+// IMPL:      #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
+// IMPL-NEXT: #undef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
 // IMPL-EMPTY:
-// IMPL-NEXT:  #include "llvm/ADT/StringRef.h"
-// IMPL-NEXT:  #include "llvm/ADT/StringSwitch.h"
-// IMPL-NEXT:  #include "llvm/Support/ErrorHandling.h"
+// IMPL-NEXT: namespace llvm {
+// IMPL-NEXT: namespace tdl {
 // IMPL-EMPTY:
-// IMPL-NEXT:  using namespace llvm;
-// IMPL-NEXT:  using namespace tdl;
+// IMPL-NEXT:   // Sets for dira
+// IMPL-EMPTY:
+// IMPL-NEXT:   static  allowedClauses_TDLD_dira {
+// IMPL-NEXT:     llvm::tdl::Clause::TDLC_clausea,
+// IMPL-NEXT:     llvm::tdl::Clause::TDLC_clauseb,
+// IMPL-NEXT:   };
+// IMPL-EMPTY:
+// IMPL-NEXT:   static  allowedOnceClauses_TDLD_dira {
+// IMPL-NEXT:   };
+// IMPL-EMPTY:
+// IMPL-NEXT:   static  allowedExclusiveClauses_TDLD_dira {
+// IMPL-NEXT:   };
+// IMPL-EMPTY:
+// IMPL-NEXT:   static  requiredClauses_TDLD_dira {
+// IMPL-NEXT:   };
+// IMPL-NEXT: } // namespace tdl
+// IMPL-NEXT: } // namespace llvm
+// IMPL-EMPTY:
+// IMPL-NEXT: #endif // GEN_FLANG_DIRECTIVE_CLAUSE_SETS
+// IMPL-EMPTY:
+// IMPL-NEXT: #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-NEXT: #undef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT: {
+// IMPL-NEXT:   {llvm::tdl::Directive::TDLD_dira,
+// IMPL-NEXT:     {
+// IMPL-NEXT:       llvm::tdl::allowedClauses_TDLD_dira,
+// IMPL-NEXT:       llvm::tdl::allowedOnceClauses_TDLD_dira,
+// IMPL-NEXT:       llvm::tdl::allowedExclusiveClauses_TDLD_dira,
+// IMPL-NEXT:       llvm::tdl::requiredClauses_TDLD_dira,
+// IMPL-NEXT:     }
+// IMPL-NEXT:   },
+// IMPL-NEXT: }
+// IMPL-EMPTY:
+// IMPL-NEXT: #endif // GEN_FLANG_DIRECTIVE_CLAUSE_MAP
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  EMPTY_CLASS(Clausea);
+// IMPL-NEXT:  WRAPPER_CLASS(Clauseb, std::list<IntExpr>);
+// IMPL-NEXT:  WRAPPER_CLASS(Clausec, std::optional<Name>);
+// IMPL-NEXT:  EMPTY_CLASS(Claused);
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-EMPTY:
+// IMPL-NEXT:  Clausea
+// IMPL-NEXT:  , Clauseb
+// IMPL-NEXT:  , Clausec
+// IMPL-NEXT:  , Claused
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-NEXT:  #undef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  NODE(TdlClause, Clausea)
+// IMPL-NEXT:  NODE(TdlClause, Clauseb)
+// IMPL-NEXT:  NODE(TdlClause, Clausec)
+// IMPL-NEXT:  NODE(TdlClause, Claused)
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifdef GEN_FLANG_CLAUSE_UNPARSE
+// IMPL-NEXT:  #undef GEN_FLANG_CLAUSE_UNPARSE
+// IMPL-EMPTY:
+// IMPL-NEXT:  void Before(const TdlClause::Clausea &) { Word("CLAUSEA"); }
+// IMPL-NEXT:  void Unparse(const TdlClause::Clauseb &x) {
+// IMPL-NEXT:    Word("CLAUSEB");
+// IMPL-NEXT:    Put("(");
+// IMPL-NEXT:    Walk(x.v, ",");
+// IMPL-NEXT:    Put(")");
+// IMPL-NEXT:  }
+// IMPL-NEXT:  void Unparse(const TdlClause::Clausec &x) {
+// IMPL-NEXT:  Word("CLAUSEC");
+// IMPL-NEXT:    Put("(");
+// IMPL-NEXT:    if (x.v.has_value())
+// IMPL-NEXT:    Walk(x.v);
+// IMPL-NEXT:    else
+// IMPL-NEXT:    Put("*");
+// IMPL-NEXT:    Put(")");
+// IMPL-NEXT:  }
+// IMPL-NEXT:  void Before(const TdlClause::Claused &) { Word("CLAUSED"); }
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_FLANG_CLAUSE_UNPARSE
+
+// IMPL:       #ifdef GEN_CLANG_CLAUSE_CLASS
+// IMPL-NEXT:  #undef GEN_CLANG_CLAUSE_CLASS
+// IMPL-EMPTY:
+// IMPL-NEXT:  #ifndef CLAUSE
+// IMPL-NEXT:  #define CLAUSE(Enum, Str, Implicit)
+// IMPL-NEXT:  #endif
+// IMPL-NEXT:  #ifndef CLAUSE_CLASS
+// IMPL-NEXT:  #define CLAUSE_CLASS(Enum, Str, Class)
+// IMPL-NEXT:  #endif
+// IMPL-NEXT:  #ifndef CLAUSE_NO_CLASS
+// IMPL-NEXT:  #define CLAUSE_NO_CLASS(Enum, Str)
+// IMPL-NEXT:  #endif
+// IMPL-EMPTY:
+// IMPL-NEXT:  #define __CLAUSE(Name, Class)                      \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
+// IMPL-NEXT:    CLAUSE_CLASS(TDLC_##Name, #Name, Class)
+// IMPL-NEXT:  #define __CLAUSE_NO_CLASS(Name)                    \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
+// IMPL-NEXT:    CLAUSE_NO_CLASS(TDLC_##Name, #Name)
+// IMPL-NEXT:  #define __IMPLICIT_CLAUSE_CLASS(Name, Str, Class)  \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
+// IMPL-NEXT:  CLAUSE_CLASS(TDLC_##Name, Str, Class)
+// IMPL-NEXT:  #define __IMPLICIT_CLAUSE_NO_CLASS(Name, Str)      \
+// IMPL-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
+// IMPL-NEXT:  CLAUSE_NO_CLASS(TDLC_##Name, Str)
+// IMPL-EMPTY:
+// IMPL-NEXT:  __IMPLICIT_CLAUSE_NO_CLASS(clausea, "clausea")
+// IMPL-NEXT:  __CLAUSE_NO_CLASS(clauseb)
+// IMPL-NEXT:  __CLAUSE(clausec, ClauseC)
+// IMPL-NEXT:  __IMPLICIT_CLAUSE_CLASS(claused, "claused", ClauseD)
+// IMPL-EMPTY:
+// IMPL-NEXT:  #undef __IMPLICIT_CLAUSE_NO_CLASS
+// IMPL-NEXT:  #undef __IMPLICIT_CLAUSE_CLASS
+// IMPL-NEXT:  #undef __CLAUSE
+// IMPL-NEXT:  #undef CLAUSE_NO_CLASS
+// IMPL-NEXT:  #undef CLAUSE_CLASS
+// IMPL-NEXT:  #undef CLAUSE
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_CLANG_CLAUSE_CLASS
+
+// IMPL:       #ifdef GEN_DIRECTIVES_IMPL
+// IMPL-NEXT:  #undef GEN_DIRECTIVES_IMPL
 // IMPL-EMPTY:
 // IMPL-NEXT:  Directive llvm::tdl::getTdlDirectiveKind(llvm::StringRef Str) {
 // IMPL-NEXT:    return llvm::StringSwitch<Directive>(Str)
 // IMPL-NEXT:      .Case("dira",TDLD_dira)
 // IMPL-NEXT:      .Default(TDLD_dira);
 // IMPL-NEXT:  }
 // IMPL-EMPTY:
 // IMPL-NEXT:  llvm::StringRef llvm::tdl::getTdlDirectiveName(Directive Kind) {

 // 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:  }
-
-
-// GEN:      #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-NEXT: #undef GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-EMPTY:
-// GEN-NEXT: namespace llvm {
-// GEN-NEXT: namespace tdl {
-// GEN-EMPTY:
-// GEN-NEXT:   // Sets for dira
-// GEN-EMPTY:
-// GEN-NEXT:   static  allowedClauses_TDLD_dira {
-// GEN-NEXT:     llvm::tdl::Clause::TDLC_clausea,
-// GEN-NEXT:     llvm::tdl::Clause::TDLC_clauseb,
-// GEN-NEXT:   };
-// GEN-EMPTY:
-// GEN-NEXT:   static  allowedOnceClauses_TDLD_dira {
-// GEN-NEXT:   };
-// GEN-EMPTY:
-// GEN-NEXT:   static  allowedExclusiveClauses_TDLD_dira {
-// GEN-NEXT:   };
-// GEN-EMPTY:
-// GEN-NEXT:   static  requiredClauses_TDLD_dira {
-// GEN-NEXT:   };
-// GEN-NEXT: } // namespace tdl
-// GEN-NEXT: } // namespace llvm
-// GEN-EMPTY:
-// GEN-NEXT: #endif // GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-// GEN-EMPTY:
-// GEN-NEXT: #ifdef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-NEXT: #undef GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-EMPTY:
-// GEN-NEXT: {
-// GEN-NEXT:   {llvm::tdl::Directive::TDLD_dira,
-// GEN-NEXT:     {
-// GEN-NEXT:       llvm::tdl::allowedClauses_TDLD_dira,
-// GEN-NEXT:       llvm::tdl::allowedOnceClauses_TDLD_dira,
-// GEN-NEXT:       llvm::tdl::allowedExclusiveClauses_TDLD_dira,
-// GEN-NEXT:       llvm::tdl::requiredClauses_TDLD_dira,
-// GEN-NEXT:     }
-// GEN-NEXT:   },
-// GEN-NEXT: }
-// GEN-EMPTY:
-// GEN-NEXT: #endif // GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-EMPTY:
-// GEN-NEXT:  EMPTY_CLASS(Clausea);
-// GEN-NEXT:  WRAPPER_CLASS(Clauseb, std::list<IntExpr>);
-// GEN-NEXT:  WRAPPER_CLASS(Clausec, std::optional<Name>);
-// GEN-NEXT:  EMPTY_CLASS(Claused);
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-EMPTY:
-// GEN-NEXT:  Clausea
-// GEN-NEXT:  , Clauseb
-// GEN-NEXT:  , Clausec
-// GEN-NEXT:  , Claused
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-NEXT:  #undef GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-EMPTY:
-// GEN-NEXT:  NODE(TdlClause, Clausea)
-// GEN-NEXT:  NODE(TdlClause, Clauseb)
-// GEN-NEXT:  NODE(TdlClause, Clausec)
-// GEN-NEXT:  NODE(TdlClause, Claused)
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-// GEN-EMPTY:
-// GEN-NEXT:  #ifdef GEN_FLANG_CLAUSE_UNPARSE
-// GEN-NEXT:  #undef GEN_FLANG_CLAUSE_UNPARSE
-// GEN-EMPTY:
-// GEN-NEXT:  void Before(const TdlClause::Clausea &) { Word("CLAUSEA"); }
-// GEN-NEXT:  void Unparse(const TdlClause::Clauseb &x) {
-// GEN-NEXT:    Word("CLAUSEB");
-// GEN-NEXT:    Put("(");
-// GEN-NEXT:    Walk(x.v, ",");
-// GEN-NEXT:    Put(")");
-// GEN-NEXT:  }
-// GEN-NEXT:  void Unparse(const TdlClause::Clausec &x) {
-// GEN-NEXT:  Word("CLAUSEC");
-// GEN-NEXT:    Put("(");
-// GEN-NEXT:    if (x.v.has_value())
-// GEN-NEXT:    Walk(x.v);
-// GEN-NEXT:    else
-// GEN-NEXT:    Put("*");
-// GEN-NEXT:    Put(")");
-// GEN-NEXT:  }
-// GEN-NEXT:  void Before(const TdlClause::Claused &) { Word("CLAUSED"); }
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_FLANG_CLAUSE_UNPARSE
-
-// GEN:       #ifdef GEN_CLANG_CLAUSE_CLASS
-// GEN-NEXT:  #undef GEN_CLANG_CLAUSE_CLASS
-// GEN-EMPTY:
-// GEN-NEXT:  #ifndef CLAUSE
-// GEN-NEXT:  #define CLAUSE(Enum, Str, Implicit)
-// GEN-NEXT:  #endif
-// GEN-NEXT:  #ifndef CLAUSE_CLASS
-// GEN-NEXT:  #define CLAUSE_CLASS(Enum, Str, Class)
-// GEN-NEXT:  #endif
-// GEN-NEXT:  #ifndef CLAUSE_NO_CLASS
-// GEN-NEXT:  #define CLAUSE_NO_CLASS(Enum, Str)
-// GEN-NEXT:  #endif
-// GEN-EMPTY:
-// GEN-NEXT:  #define __CLAUSE(Name, Class)                      \
-// GEN-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
-// GEN-NEXT:    CLAUSE_CLASS(TDLC_##Name, #Name, Class)
-// GEN-NEXT:  #define __CLAUSE_NO_CLASS(Name)                    \
-// GEN-NEXT:    CLAUSE(TDLC_##Name, #Name, /* Implicit */ false) \
-// GEN-NEXT:    CLAUSE_NO_CLASS(TDLC_##Name, #Name)
-// GEN-NEXT:  #define __IMPLICIT_CLAUSE_CLASS(Name, Str, Class)  \
-// GEN-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
-// GEN-NEXT:  CLAUSE_CLASS(TDLC_##Name, Str, Class)
-// GEN-NEXT:  #define __IMPLICIT_CLAUSE_NO_CLASS(Name, Str)      \
-// GEN-NEXT:    CLAUSE(TDLC_##Name, Str, /* Implicit */ true)    \
-// GEN-NEXT:  CLAUSE_NO_CLASS(TDLC_##Name, Str)
-// GEN-EMPTY:
-// GEN-NEXT:  __IMPLICIT_CLAUSE_NO_CLASS(clausea, "clausea")
-// GEN-NEXT:  __CLAUSE_NO_CLASS(clauseb)
-// GEN-NEXT:  __CLAUSE(clausec, ClauseC)
-// GEN-NEXT:  __IMPLICIT_CLAUSE_CLASS(claused, "claused", ClauseD)
-// GEN-EMPTY:
-// GEN-NEXT:  #undef __IMPLICIT_CLAUSE_NO_CLASS
-// GEN-NEXT:  #undef __IMPLICIT_CLAUSE_CLASS
-// GEN-NEXT:  #undef __CLAUSE
-// GEN-NEXT:  #undef CLAUSE_NO_CLASS
-// GEN-NEXT:  #undef CLAUSE_CLASS
-// GEN-NEXT:  #undef CLAUSE
-// GEN-EMPTY:
-// GEN-NEXT:  #endif // GEN_CLANG_CLAUSE_CLASS
-
+// IMPL-EMPTY:
+// IMPL-NEXT:  #endif // GEN_DIRECTIVES_IMPL

llvm/test/TableGen/directive3.td

 // RUN: not llvm-tblgen -gen-directive-decl -I %p/../../include %s 2>&1 | FileCheck -match-full-lines %s
 // RUN: not llvm-tblgen -gen-directive-impl -I %p/../../include %s 2>&1 | FileCheck -match-full-lines %s
-// RUN: not llvm-tblgen -gen-directive-gen -I %p/../../include %s 2>&1 | FileCheck -match-full-lines %s
 
 include "llvm/Frontend/Directive/DirectiveBase.td"
 
 def TestDirectiveLanguage : DirectiveLanguage {
   let name = "TdlError";
 }
 
 def TDLC_ClauseA : Clause<"clausea"> {

llvm/utils/TableGen/DirectiveEmitter.cpp

void GenerateClauseClassMacro(const DirectiveLanguage &DirLang,
   OS << "#undef __IMPLICIT_CLAUSE_NO_CLASS\n";
   OS << "#undef __IMPLICIT_CLAUSE_CLASS\n";
   OS << "#undef __CLAUSE\n";
   OS << "#undef CLAUSE_NO_CLASS\n";
   OS << "#undef CLAUSE_CLASS\n";
   OS << "#undef CLAUSE\n";
 }
 
-// Generate the implementation section for the enumeration in the directive
-// language.
-void EmitDirectivesGen(RecordKeeper &Records, raw_ostream &OS) {
-  const auto DirLang = DirectiveLanguage{Records};
-  if (DirLang.HasValidityErrors())
-    return;
-
-  EmitDirectivesFlangImpl(DirLang, OS);
-
-  GenerateClauseClassMacro(DirLang, OS);
-}
-
-// Generate the implementation for the enumeration in the directive
+// Generate the implemenation for the enumeration in the directive
 // language. This code can be included in library.
-void EmitDirectivesImpl(RecordKeeper &Records, raw_ostream &OS) {
-  const auto DirLang = DirectiveLanguage{Records};
-  if (DirLang.HasValidityErrors())
-    return;
-
-  if (!DirLang.getIncludeHeader().empty())
-    OS << "#include \"" << DirLang.getIncludeHeader() << "\"\n\n";
-
-  OS << "#include \"llvm/ADT/StringRef.h\"\n";
-  OS << "#include \"llvm/ADT/StringSwitch.h\"\n";
-  OS << "#include \"llvm/Support/ErrorHandling.h\"\n";
-  OS << "\n";
-  OS << "using namespace llvm;\n";
-  llvm::SmallVector<StringRef, 2> Namespaces;
-  llvm::SplitString(DirLang.getCppNamespace(), Namespaces, "::");
-  for (auto Ns : Namespaces)
-    OS << "using namespace " << Ns << ";\n";
+void EmitDirectivesBasicImpl(const DirectiveLanguage &DirLang,
+                             raw_ostream &OS) {
+  IfDefScope Scope("GEN_DIRECTIVES_IMPL", OS);
 
   // getDirectiveKind(StringRef Str)
   GenerateGetKind(DirLang.getDirectives(), OS, "Directive", DirLang,
                   DirLang.getDirectivePrefix(), /*ImplicitAsUnknown=*/false);
 
   // getDirectiveName(Directive Kind)
   GenerateGetName(DirLang.getDirectives(), OS, "Directive", DirLang,
                   DirLang.getDirectivePrefix());
void EmitDirectivesBasicImpl(const DirectiveLanguage &DirLang,
 
   // get<ClauseVal>Kind(StringRef Str)
   GenerateGetKindClauseVal(DirLang, OS);
 
   // isAllowedClauseForDirective(Directive D, Clause C, unsigned Version)
   GenerateIsAllowedClause(DirLang, OS);
 }
 
+// Generate the implemenation section for the enumeration in the directive
+// language.
+void EmitDirectivesImpl(RecordKeeper &Records, raw_ostream &OS) {
+  const auto DirLang = DirectiveLanguage{Records};
+  if (DirLang.HasValidityErrors())
+    return;
+
+  EmitDirectivesFlangImpl(DirLang, OS);
+
+  GenerateClauseClassMacro(DirLang, OS);
+
+  EmitDirectivesBasicImpl(DirLang, OS);
+}
+
 } // namespace llvm

llvm/utils/TableGen/TableGen.cpp

enum ActionType {
   GenGICombiner,
   GenX86EVEX2VEXTables,
   GenX86FoldTables,
   GenRegisterBank,
   GenExegesis,
   GenAutomata,
   GenDirectivesEnumDecl,
   GenDirectivesEnumImpl,
-  GenDirectivesEnumGen,
 };
 
 namespace llvm {
 cl::opt<bool> EmitLongStrLiterals(
     "long-string-literals",
     cl::desc("when emitting large string tables, prefer string literals over "
              "comma-separated char literals. This can be a readability and "
              "compile-time performance win, but upsets some compilers"),
cl::values(
         clEnumValN(GenRegisterBank, "gen-register-bank",
                    "Generate registers bank descriptions"),
         clEnumValN(GenExegesis, "gen-exegesis",
                    "Generate llvm-exegesis tables"),
         clEnumValN(GenAutomata, "gen-automata", "Generate generic automata"),
         clEnumValN(GenDirectivesEnumDecl, "gen-directive-decl",
                    "Generate directive related declaration code (header file)"),
         clEnumValN(GenDirectivesEnumImpl, "gen-directive-impl",
-                   "Generate directive related implementation code"),
-        clEnumValN(GenDirectivesEnumGen, "gen-directive-gen",
-                   "Generate directive related implementation code part")));
+                   "Generate directive related implementation code")));
 
 cl::OptionCategory PrintEnumsCat("Options for -print-enums");
 cl::opt<std::string> Class("class", cl::desc("Print Enum list for this class"),
                            cl::value_desc("class name"),
                            cl::cat(PrintEnumsCat));
 
 bool LLVMTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
   switch (Action) {
case GenAutomata:
     EmitAutomata(Records, OS);
     break;
   case GenDirectivesEnumDecl:
     EmitDirectivesDecl(Records, OS);
     break;
   case GenDirectivesEnumImpl:
     EmitDirectivesImpl(Records, OS);
     break;
-  case GenDirectivesEnumGen:
-    EmitDirectivesGen(Records, OS);
-    break;
   }
 
   return false;
 }
 }
 
 int main(int argc, char **argv) {
   InitLLVM X(argc, argv);

llvm/utils/TableGen/TableGenBackends.h

 void EmitGICombiner(RecordKeeper &RK, raw_ostream &OS);
 void EmitX86EVEX2VEXTables(RecordKeeper &RK, raw_ostream &OS);
 void EmitX86FoldTables(RecordKeeper &RK, raw_ostream &OS);
 void EmitRegisterBank(RecordKeeper &RK, raw_ostream &OS);
 void EmitExegesis(RecordKeeper &RK, raw_ostream &OS);
 void EmitAutomata(RecordKeeper &RK, raw_ostream &OS);
 void EmitDirectivesDecl(RecordKeeper &RK, raw_ostream &OS);
 void EmitDirectivesImpl(RecordKeeper &RK, raw_ostream &OS);
-void EmitDirectivesGen(RecordKeeper &RK, raw_ostream &OS);
 
 } // End llvm namespace
 
 #endif

llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenACC/BUILD.gn

 import("//llvm/utils/TableGen/tablegen.gni")
 
 tablegen("ACC") {
   visibility = [ ":acc_gen" ]
   args = [ "-gen-directive-decl" ]
   output_name = "ACC.h.inc"
 }
 
 tablegen("ACCcpp") {
   visibility = [ ":acc_gen" ]
-  args = [ "-gen-directive-gen" ]
+  args = [ "-gen-directive-impl" ]
   output_name = "ACC.inc"
   td_file = "ACC.td"
 }
 
 group("acc_gen") {
   deps = [
     ":ACC",
     ":ACCcpp",
   ]
 }

llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn

 import("//llvm/utils/TableGen/tablegen.gni")
 
 tablegen("OMPh") {
   visibility = [ ":public_tablegen" ]
   args = [ "-gen-directive-decl" ]
   output_name = "OMP.h.inc"
   td_file = "OMP.td"
 }
 
 tablegen("OMP") {
   visibility = [ ":public_tablegen" ]
-  args = [ "-gen-directive-gen" ]
+  args = [ "-gen-directive-impl" ]
 }
 
 # Groups all tablegen() calls that create .inc files that are included in
 # Frontent/OpenMP's public headers (just one so far).
 # //llvm/lib/Frontend/OpenMP has this as a public_dep, so targets depending on
 # //llvm/lib/Frontend/OpenMP don't need to depend on this.
 group("public_tablegen") {
   public_deps = [
     # Frontend/OpenMP's public headers include OMP.h.inc.
     ":OMP",
     ":OMPh",
   ]
 }