[flang][driver] Unify f18_version.h.in and Version.inc.in

[awarzynski]

Summary

Flang has two CMake configurable header files that define compiler
version numbers:

• f18_version.h.in - only used in f18.cpp (uses version numbers from LLVM's macro definitions)
• Version.inc.in - not currently used (uses version numbers hard-coded in Flang's top CMake script)

Currently only f18_version.h.in provides version numbers consistent with
other subprojects in llvm-project. However, its location and name is
inconsistent with other subprojects (e.g. Clang). This patch merges the
two headers together:

• hard-coded version numbers in Flang's top CMake script are deleted
• Version.inc.in is updated to provide string versions of version numbers (required by f18.cpp)
• f18_version.h.in is deleted as it's no longer needed

[richard.barton.arm]

LGTM - I think this amounts to some dead code removal at the end of the day. Thanks!

[sameeranjoshi]

flang/tools/f18/f18.cpp

392–394

Nit: Why not FLANG_VERSION
It's already appended with . at https://github.com/llvm/llvm-project/blob/e8622d27c0e3020177ff47ad57dd1e5371feb9cf/flang/CMakeLists.txt#L286

[awarzynski]

flang/tools/f18/f18.cpp

392–394

I missed that, thanks for pointing out! Fixed here: https://reviews.llvm.org/rG0afdbb4d2dead42df14361ca9f5613d56667481c

flang/CMakeLists.txt

if (NOT(FLANG_DEFAULT_RTLIB STREQUAL ""))
   message(WARNING "Resetting Flang's default runtime library to use platform default.")
   set(FLANG_DEFAULT_RTLIB "" CACHE STRING
       "Default runtime library to use (empty for platform default)" FORCE)
 endif()
 
 
 
 set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
-# Override LLVM versioning for now...
-set(FLANG_VERSION_MAJOR      "0")
-set(FLANG_VERSION_MINOR      "1")
-set(FLANG_VERSION_PATCHLEVEL "0")
 
 
 if (NOT DEFINED FLANG_VERSION_MAJOR)
   set(FLANG_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
 endif()
 
 if (NOT DEFINED FLANG_VERSION_MINOR)
   set(FLANG_VERSION_MINOR ${LLVM_VERSION_MINOR})

flang/include/flang/Version.inc.in

 #define FLANG_VERSION @FLANG_VERSION@
 #define FLANG_VERSION_STRING "@FLANG_VERSION@"
 #define FLANG_VERSION_MAJOR @FLANG_VERSION_MAJOR@
+#define FLANG_VERSION_MAJOR_STRING "@FLANG_VERSION_MAJOR@"
 #define FLANG_VERSION_MINOR @FLANG_VERSION_MINOR@
+#define FLANG_VERSION_MINOR_STRING "@FLANG_VERSION_MINOR@"
 #define FLANG_VERSION_PATCHLEVEL @FLANG_VERSION_PATCHLEVEL@
+#define FLANG_VERSION_PATCHLEVEL_STRING "@FLANG_VERSION_PATCHLEVEL@"

flang/tools/f18/CMakeLists.txt

 
 # This flang shell script will only work in a POSIX shell.
 if (NOT WIN32)
   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
     DESTINATION ${CMAKE_BINARY_DIR}/bin
     FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
   install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
 endif()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY)

flang/tools/f18/f18.cpp

 //===-- tools/f18/f18.cpp -------------------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 // Temporary Fortran front end driver main program for development scaffolding.
 
-#include "f18_version.h"
 #include "flang/Common/Fortran-features.h"
 #include "flang/Common/default-kinds.h"
 #include "flang/Evaluate/expression.h"
 #include "flang/Lower/PFTBuilder.h"
 #include "flang/Parser/characters.h"
 #include "flang/Parser/dump-parse-tree.h"
 #include "flang/Parser/message.h"
 #include "flang/Parser/parse-tree-visitor.h"
 #include "flang/Parser/parse-tree.h"
 #include "flang/Parser/parsing.h"
 #include "flang/Parser/provenance.h"
 #include "flang/Parser/unparse.h"
 #include "flang/Semantics/expression.h"
 #include "flang/Semantics/runtime-type-info.h"
 #include "flang/Semantics/semantics.h"
 #include "flang/Semantics/unparse-with-symbols.h"
+#include "flang/Version.inc"
 #include "llvm/Support/Errno.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstdio>
 #include <cstring>
 #include <fstream>
void Link(std::vector<std::string> &liblist, std::vector<std::string> &objects,
   for (auto &lib : liblist) {
     argv.push_back(lib.data());
   }
   Exec(argv, driver.verbose);
 }
 
 int printVersion() {
   llvm::errs() << "\nf18 compiler (under development), version "
-               << __FLANG_MAJOR__ << "." << __FLANG_MINOR__ << "."
-               << __FLANG_PATCHLEVEL__ << "\n";
+               << FLANG_VERSION_MAJOR << "." << FLANG_VERSION_MINOR << "."
+               << FLANG_VERSION_PATCHLEVEL << "\n";
   return exitStatus;
 }
 
 int main(int argc, char *const argv[]) {
 
   atexit(CleanUpAtExit);
 
   DriverOptions driver;
   const char *F18_FC{getenv("F18_FC")};
   driver.F18_FCArgs.push_back(F18_FC ? F18_FC : "gfortran");
   bool isPGF90{driver.F18_FCArgs.back().rfind("pgf90") != std::string::npos};
 
   std::list<std::string> args{argList(argc, argv)};
   std::vector<std::string> objlist, liblist;
   std::string prefix{args.front()};
   args.pop_front();
   prefix += ": ";
   driver.prefix = prefix.data();
 
   Fortran::parser::Options options;
   options.predefinitions.emplace_back("__F18", "1");
   options.predefinitions.emplace_back("__F18_MAJOR__", "1");
   options.predefinitions.emplace_back("__F18_MINOR__", "1");
   options.predefinitions.emplace_back("__F18_PATCHLEVEL__", "1");
-  options.predefinitions.emplace_back("__flang__", __FLANG__);
-  options.predefinitions.emplace_back("__flang_major__", __FLANG_MAJOR__);
-  options.predefinitions.emplace_back("__flang_minor__", __FLANG_MINOR__);
+  options.predefinitions.emplace_back("__flang__", FLANG_VERSION_STRING);
   options.predefinitions.emplace_back(
-      "__flang_patchlevel__", __FLANG_PATCHLEVEL__);
+      "__flang_major__", FLANG_VERSION_MAJOR_STRING);
+  options.predefinitions.emplace_back(
+      "__flang_minor__", FLANG_VERSION_MINOR_STRING);
+  options.predefinitions.emplace_back(
+      "__flang_patchlevel__", FLANG_VERSION_PATCHLEVEL_STRING);
 #if __x86_64__
   options.predefinitions.emplace_back("__x86_64__", "1");
 #endif
 
   Fortran::common::IntrinsicTypeDefaultKinds defaultKinds;
 
   std::vector<std::string> fortranSources, otherSources;
   bool anyFiles{false};

flang/tools/f18/f18_version.h.in

-#ifndef _F18_H_
-#define _F18_H_
-
-#define __FLANG__ "1"
-#define __FLANG_MAJOR__ "@LLVM_VERSION_MAJOR@"
-#define __FLANG_MINOR__ "@LLVM_VERSION_MINOR@"
-#define __FLANG_PATCHLEVEL__ "@LLVM_VERSION_PATCH@"
-
-#endif // _F18_H_