[openacc] Rename generated file from ACC.cpp.inc to ACC.inc to match D92955

[clementval]

Summary

This patch rename the tablegen generated file ACC.cpp.inc to ACC.inc in order
to match what was done in D92955. This file is included in header file as well as .cpp
file so it make more sense.

[sameeranjoshi]

Thank you for the patch.
It was pending since many days.
The changes look good to me from the matching point w.r.t the linked patch.
I couldn't understand still the rational for *.cpp.inc to *.inc for both OMP and OACC, could you please point why was that needed?
Thank you.

[clementval]

In D93485#2498333, @sameeranjoshi wrote:

I couldn't understand still the rational for *.cpp.inc to *.inc for both OMP and OACC, could you please point why was that needed?

Well, when we started with the TableGen code generation we separated definition and declaration but this was not really the way to go and that's why now all code block are generated in a single file. Since this file is included in both headers and .cpp file, .inc is more appropriate.

flang/include/flang/Parser/dump-parse-tree.h

#define NODE(T1, T2) NODE_NAME(T1::T2, #T2)
   NODE(parser, AccAtomicUpdate)
   NODE(parser, AccAtomicWrite)
   NODE(parser, AccBeginBlockDirective)
   NODE(parser, AccBeginCombinedDirective)
   NODE(parser, AccBeginLoopDirective)
   NODE(parser, AccBlockDirective)
   NODE(parser, AccClause)
 #define GEN_FLANG_DUMP_PARSE_TREE_CLAUSES
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
   NODE(parser, AccBindClause)
   NODE(parser, AccDefaultClause)
   static std::string GetNodeName(const llvm::acc::DefaultValue &x) {
     return llvm::Twine(
         "llvm::acc::DefaultValue = ", llvm::acc::getOpenACCDefaultValueName(x))
         .str();
   }
   NODE(parser, AccClauseList)

flang/include/flang/Parser/parse-tree.h

struct AccGangArgument {
   TUPLE_CLASS_BOILERPLATE(AccGangArgument);
   std::tuple<std::optional<ScalarIntExpr>, std::optional<AccSizeExpr>> t;
 };
 
 struct AccClause {
   UNION_CLASS_BOILERPLATE(AccClause);
 
 #define GEN_FLANG_CLAUSE_PARSER_CLASSES
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
 
   CharBlock source;
 
   std::variant<
 #define GEN_FLANG_CLAUSE_PARSER_CLASSES_LIST
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
       >
       u;
 };
 
 struct AccClauseList {
   WRAPPER_CLASS_BOILERPLATE(AccClauseList, std::list<AccClause>);
   CharBlock source;
 };

flang/lib/Parser/unparse.cpp

void Unparse(const AccAtomicUpdate &x) {
     BeginOpenACC();
     Walk(std::get<std::optional<AccEndAtomic>>(x.t), "!$ACC END ATOMIC\n");
     EndOpenACC();
   }
   void Unparse(const llvm::acc::Directive &x) {
     Word(llvm::acc::getOpenACCDirectiveName(x).str());
   }
 #define GEN_FLANG_CLAUSE_UNPARSE
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
   void Unparse(const AccObjectListWithModifier &x) {
     Walk(std::get<std::optional<AccDataModifier>>(x.t), ":");
     Walk(std::get<AccObjectList>(x.t));
   }
   void Unparse(const AccDataModifier::Modifier &x) {
     Word(AccDataModifier::EnumToString(x));
   }
   void Unparse(const AccBindClause &x) {

flang/lib/Semantics/check-acc-structure.h

 
 using AccDirectiveSet = Fortran::common::EnumSet<llvm::acc::Directive,
     llvm::acc::Directive_enumSize>;
 
 using AccClauseSet =
     Fortran::common::EnumSet<llvm::acc::Clause, llvm::acc::Clause_enumSize>;
 
 #define GEN_FLANG_DIRECTIVE_CLAUSE_SETS
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
 
 namespace Fortran::semantics {
 
 class AccStructureChecker
     : public DirectiveStructureChecker<llvm::acc::Directive, llvm::acc::Clause,
           parser::AccClause, llvm::acc::Clause_enumSize> {
 public:
   AccStructureChecker(SemanticsContext &context)
       : DirectiveStructureChecker(context,
 #define GEN_FLANG_DIRECTIVE_CLAUSE_MAP
-#include "llvm/Frontend/OpenACC/ACC.cpp.inc"
+#include "llvm/Frontend/OpenACC/ACC.inc"
         ) {
   }
 
   // Construct and directives
   void Enter(const parser::OpenACCBlockConstruct &);
   void Leave(const parser::OpenACCBlockConstruct &);
   void Enter(const parser::OpenACCCombinedConstruct &);
   void Leave(const parser::OpenACCCombinedConstruct &);

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

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

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" ]
-  output_name = "ACC.cpp.inc"
+  output_name = "ACC.inc"
   td_file = "ACC.td"
 }
 
 group("acc_gen") {
   deps = [
     ":ACC",
     ":ACCcpp",
   ]
 }