[sycl-rel-7_0] Cherry-pick version-related patches (#21703)

Cherry-pick patches adding version macros:
#21570
#21572
#21610
#21702

And also remove some info from the workflow file, since it's placed in
the source code now.

---------

Co-authored-by: elizabethandrews <elizabeth.andrews@intel.com>
Co-authored-by: ykhatav <yashasvi.khatavkar@intel.com>

Author: 3 people

.github/workflows/sycl-rel-nightly.yml

@@ -23,8 +23,7 @@ jobs:
           echo "info=${{ inputs.sycl_build_info }}" >> $GITHUB_OUTPUT
         else
           date=$(date +'%Y-%m-%d')
-          version="7.0.0"
-          info="Nightly $date $version pre-release"
+          info="Nightly $date"
           echo "info=$info" >> $GITHUB_OUTPUT
         fi
 

clang/CMakeLists.txt

@@ -351,6 +351,8 @@ set(CLANG_VERSION "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}.${CLANG_VERSION
 set(MAX_CLANG_ABI_COMPAT_VERSION "${LLVM_VERSION_MAJOR}")
 message(STATUS "Clang version: ${CLANG_VERSION}")
 
+set(DPCPP_VERSION "${DPCPP_VERSION_MAJOR}.${DPCPP_VERSION_MINOR}.${DPCPP_VERSION_PATCH}")
+
 # Configure the Version.inc file.
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/clang/Basic/Version.inc.in

clang/include/clang/Basic/Version.h

@@ -62,13 +62,17 @@ namespace clang {
   /// number, the repository version, and the vendor tag.
   std::string getClangFullCPPVersion();
 
+  /// Retrieves a string representing the complete DPC++ version suitable
+  /// for use in the CPP __VERSION__ macro, including repository information.
+  std::string getDPCPPFullCPPVersion();
+
   /// Retrieves a string representing the SYCL standard version for use in
   /// the CL_SYCL_LANGUAGE_VERSION and SYCL_LANGUAGE_VERSION macros.
   llvm::SmallVector<std::pair<llvm::StringRef, llvm::StringRef>, 2>
   getSYCLVersionMacros(const LangOptions &LangOpts);
 
-  /// Retrieves a string representing the Intel SYCL compiler build info.
-  std::string getSYCLBuildInfo();
+  /// Retrieves a string representing the DPC++ Version.
+  std::string getDPCPPVersion();
 }
 
 #endif // LLVM_CLANG_BASIC_VERSION_H

clang/include/clang/Basic/Version.inc.in

@@ -5,3 +5,8 @@
 #define CLANG_VERSION_MINOR @CLANG_VERSION_MINOR@
 #define CLANG_VERSION_PATCHLEVEL @CLANG_VERSION_PATCHLEVEL@
 #define MAX_CLANG_ABI_COMPAT_VERSION @MAX_CLANG_ABI_COMPAT_VERSION@
+#define DPCPP_VERSION_MAJOR @DPCPP_VERSION_MAJOR@
+#define DPCPP_VERSION_MINOR @DPCPP_VERSION_MINOR@
+#define DPCPP_VERSION_PATCH @DPCPP_VERSION_PATCH@
+#define DPCPP_VERSION "@DPCPP_VERSION@"
+#define PRE_RELEASE @PRE_RELEASE@

clang/lib/Basic/Version.cpp

@@ -65,11 +65,25 @@ std::string getClangVendor() {
 #endif
 }
 
-std::string getSYCLBuildInfo() {
+std::string getDPCPPPreReleaseInfo() {
+#if PRE_RELEASE
+  std::string buf;
+  llvm::raw_string_ostream OS(buf);
+  OS << DPCPP_VERSION << " (pre-release)";
+  return buf;
+#else
+  return DPCPP_VERSION;
+#endif
+}
+
+std::string getDPCPPVersion() {
 #ifdef SYCL_BUILD_INFO
-  return SYCL_BUILD_INFO;
+  std::string buf;
+  llvm::raw_string_ostream OS(buf);
+  OS << getDPCPPPreReleaseInfo() << " (" << SYCL_BUILD_INFO << ")";
+  return buf;
 #else
-  return "development";
+  return getDPCPPPreReleaseInfo();
 #endif
 }
 
@@ -132,6 +146,21 @@ std::string getClangFullCPPVersion() {
 
   return buf;
 }
+std::string getDPCPPFullCPPVersion() {
+  // Format: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"
+  std::string buf;
+  llvm::raw_string_ostream OS(buf);
+  OS << "DPC++ " DPCPP_VERSION;
+#if PRE_RELEASE
+  OS << " (pre-release)";
+#endif
+  std::string repo = getClangFullRepositoryVersion();
+  if (!repo.empty()) {
+    OS << " " << repo;
+  }
+
+  return buf;
+}
 
 llvm::SmallVector<std::pair<llvm::StringRef, llvm::StringRef>, 2>
 getSYCLVersionMacros(const LangOptions &LangOpts) {

clang/lib/Driver/Driver.cpp

@@ -2748,7 +2748,7 @@ void Driver::PrintSYCLToolHelp(const Compilation &C) const {
 }
 
 void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
-  OS << "Intel SYCL compiler " << getSYCLBuildInfo() << " build based on:\n";
+  OS << "DPC++ compiler " << getDPCPPVersion() << " build based on:\n";
   if (IsFlangMode()) {
     OS << getClangToolFullVersion("flang") << '\n';
   } else {

clang/lib/Frontend/InitPreprocessor.cpp

@@ -875,12 +875,18 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
   Builder.defineMacro("__clang_major__", TOSTR(CLANG_VERSION_MAJOR));
   Builder.defineMacro("__clang_minor__", TOSTR(CLANG_VERSION_MINOR));
   Builder.defineMacro("__clang_patchlevel__", TOSTR(CLANG_VERSION_PATCHLEVEL));
-#undef TOSTR
-#undef TOSTR2
   Builder.defineMacro("__clang_version__",
                       "\"" CLANG_VERSION_STRING " "
                       + getClangFullRepositoryVersion() + "\"");
 
+  // DPC++ version macros - Intel's SYCL compiler
+  Builder.defineMacro("__DPCPP__", "1");
+  Builder.defineMacro("__dpcpp_major__", TOSTR(DPCPP_VERSION_MAJOR));
+  Builder.defineMacro("__dpcpp_minor__", TOSTR(DPCPP_VERSION_MINOR));
+  Builder.defineMacro("__dpcpp_patchlevel__", TOSTR(DPCPP_VERSION_PATCH));
+#undef TOSTR
+#undef TOSTR2
+
   if (LangOpts.GNUCVersion != 0) {
     // Major, minor, patch, are given two decimal places each, so 4.2.1 becomes
     // 40201.
@@ -944,9 +950,9 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
   Builder.defineMacro("__PRAGMA_REDEFINE_EXTNAME", "1");
 
   // Previously this macro was set to a string aiming to achieve compatibility
-  // with GCC 4.2.1. Now, just return the full Clang version
-  Builder.defineMacro("__VERSION__", "\"" +
-                      Twine(getClangFullCPPVersion()) + "\"");
+  // with GCC 4.2.1. Now, just return the full DPC++ version
+  Builder.defineMacro("__VERSION__",
+                      "\"" + Twine(getDPCPPFullCPPVersion()) + "\"");
 
   // Initialize language-specific preprocessor defines.
 

clang/test/Driver/sycl-build-info.cpp clang/test/Driver/dpcpp_version.cppclang/test/Driver/sycl-build-info.cpp renamed to clang/test/Driver/dpcpp_version.cpp

@@ -1,3 +1,3 @@
 // RUN: %clang --version 2>&1 | FileCheck %s
 
-// CHECK: Intel SYCL compiler{{.*}}based on:
+// CHECK: DPC++ compiler {{.*}}based on:

clang/test/Preprocessor/init-aarch64.c

@@ -78,6 +78,7 @@
 // AARCH64-NEXT: #define __DBL_MIN__ 2.2250738585072014e-308
 // AARCH64-NEXT: #define __DBL_NORM_MAX__ 1.7976931348623157e+308
 // AARCH64-NEXT: #define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
+// AARCH64-NEXT: #define __DPCPP__ 1
 // AARCH64-NEXT: #define __ELF__ 1
 // AARCH64-NEXT: #define __FINITE_MATH_ONLY__ 0
 // AARCH64-NEXT: #define __FLT16_DECIMAL_DIG__ 5

clang/test/Preprocessor/init.c

@@ -1192,7 +1192,7 @@
 // SPARC:#define __UINT_LEAST8_MAX__ 255
 // SPARC:#define __UINT_LEAST8_TYPE__ unsigned char
 // SPARC:#define __USER_LABEL_PREFIX__
-// SPARC:#define __VERSION__ "{{.*}}Clang{{.*}}
+// SPARC:#define __VERSION__ "{{.*}}DPC++{{.*}}
 // SPARC:#define __WCHAR_MAX__ 2147483647
 // SPARC:#define __WCHAR_TYPE__ int
 // SPARC:#define __WCHAR_WIDTH__ 32
@@ -1715,6 +1715,7 @@
 // WEBASSEMBLY-NEXT:#define __DBL_MIN__ 2.2250738585072014e-308
 // WEBASSEMBLY-NEXT:#define __DBL_NORM_MAX__ 1.7976931348623157e+308
 // WEBASSEMBLY-NEXT:#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
+// WEBASSEMBLY-NEXT:#define __DPCPP__ 1
 // WEBASSEMBLY-NOT:#define __ELF__
 // EMSCRIPTEN-THREADS-NEXT:#define __EMSCRIPTEN_PTHREADS__ 1
 // EMSCRIPTEN-NEXT:#define __EMSCRIPTEN__ 1
@@ -2078,6 +2079,9 @@
 // WEBASSEMBLY-NEXT:#define __clang_patchlevel__ {{.*}}
 // WEBASSEMBLY-NEXT:#define __clang_version__ "{{.*}}"
 // WEBASSEMBLY-NEXT:#define __clang_wide_literal_encoding__ {{.*}}
+// WEBASSEMBLY-NEXT:#define __dpcpp_major__ 7
+// WEBASSEMBLY-NEXT:#define __dpcpp_minor__ 0
+// WEBASSEMBLY-NEXT:#define __dpcpp_patchlevel__ 0
 // WEBASSEMBLY-NEXT:#define __llvm__ 1
 // WEBASSEMBLY-WASI-NOT:#define __unix
 // WEBASSEMBLY-WASI-NOT:#define __unix__