[SYCL] Add Self macro versioning by ykhatav · Pull Request #21572 · intel/llvm

ykhatav · 2026-03-19T19:38:49Z

Adds DPC++ compiler self-identification macros to differentiate intel/llvm compiler from upstream Clang and enable version detection for intel/llvm releases.
Fixes:#21509
Depends on: #21570

ykhatav · 2026-03-19T19:48:04Z

CC: @tahonermann , @dvrogozh

tahonermann · 2026-03-19T20:40:12Z

Thanks @ykhatav, this looks good to me once #21570 is merged.

dvrogozh

Let's get #21570 merged first then rebase this one on top. Setting -1 just to avoid accidental merge.

YuriPlyakhin

llvm/CMakeLists.txt change LGTM

hchilama

Driver - LGTM

tahonermann

Looks good to me.

Once these changes go into an official release, we should submit a PR to https://github.com/cpredef/predef/blob/master/Compilers.md to document these macros.

dvrogozh

LGTM

tahonermann · 2026-03-23T19:00:48Z

+  // 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;


I know that this was already merged, but perhaps we should follow up with an additional change to add the pre-release indicator here.

I'll create a follow-up PR. Just to confirm the output format for pre-release, does the following look good? "DPC++ 7.0.0 (pre-release) git (https://github.com/intel/llvm.git ...)"

Yes, that looks great!

This is a follow-up PR after- #21572 to add pre-release indicator to the text of the __VERSION__ macro so that it matches the --version output.

bader · 2026-04-05T17:39:06Z

 }
+std::string getDPCPPFullCPPVersion() {


Suggested change

}

std::string getDPCPPFullCPPVersion() {

}

std::string getDPCPPFullCPPVersion() {

bader · 2026-04-05T17:39:49Z

  return buf;
 }
+std::string getDPCPPFullCPPVersion() {
+  // Format: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"


This string looks like an example of the format rather than a format itself.

Suggested change

// Format: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"

// Format example: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"

bader · 2026-04-05T17:40:39Z

+  if (!repo.empty()) {
+    OS << " " << repo;
+  }


Suggested change

if (!repo.empty()) {

OS << " " << repo;

}

if (!repo.empty())

OS << " " << repo;

bader · 2026-04-05T17:43:08Z

 // SPARC:#define __UINT_LEAST8_TYPE__ unsigned char
 // SPARC:#define __USER_LABEL_PREFIX__
-// SPARC:#define __VERSION__ "{{.*}}Clang{{.*}}
+// SPARC:#define __VERSION__ "{{.*}}DPC++{{.*}}


Suggested change

// SPARC:#define __VERSION__ "{{.*}}DPC++{{.*}}

// SPARC:#define __VERSION__ "{{.*}}DPC++{{.*}}"

Adds DPC++ compiler self-identification macros to differentiate intel/llvm compiler from upstream Clang and enable version detection for intel/llvm releases. Fixes:intel#21509 Depends on: intel#21570

This is a follow-up PR after- intel#21572 to add pre-release indicator to the text of the __VERSION__ macro so that it matches the --version output.

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>

Adds DPC++ compiler self-identification macros to differentiate intel/llvm compiler from upstream Clang and enable version detection for intel/llvm releases. Fixes:#21509 Depends on: #21570

This is a follow-up PR after- #21572 to add pre-release indicator to the text of the __VERSION__ macro so that it matches the --version output.

ykhatav marked this pull request as ready for review March 19, 2026 19:47

ykhatav requested review from a team and bader as code owners March 19, 2026 19:47

dvrogozh suggested changes Mar 19, 2026

View reviewed changes

dvrogozh reviewed Mar 19, 2026

View reviewed changes

Comment thread clang/lib/Frontend/InitPreprocessor.cpp Outdated

YuriPlyakhin approved these changes Mar 19, 2026

View reviewed changes

hchilama approved these changes Mar 20, 2026

View reviewed changes

dvrogozh reviewed Mar 20, 2026

View reviewed changes

Comment thread clang/lib/Frontend/InitPreprocessor.cpp

ykhatav force-pushed the self-macro-versioning branch from dbdd3fe to 74d4e93 Compare March 23, 2026 15:14

ykhatav added 5 commits March 23, 2026 08:45

Add self macro versioning

11c62b8

fix formatting

d8c9e7e

Revert the changes for __clang_version__

49127be

fix build failure

2a79291

Rebase and update test

4acb486

ykhatav force-pushed the self-macro-versioning branch from 74d4e93 to 4acb486 Compare March 23, 2026 15:46

elizabethandrews approved these changes Mar 23, 2026

View reviewed changes

dvrogozh reviewed Mar 23, 2026

View reviewed changes

Comment thread clang/lib/Frontend/InitPreprocessor.cpp

tahonermann approved these changes Mar 23, 2026

View reviewed changes

dvrogozh approved these changes Mar 23, 2026

View reviewed changes

sarnex merged commit 6e4dcd8 into intel:sycl Mar 23, 2026
31 checks passed

tahonermann reviewed Mar 23, 2026

View reviewed changes

ykhatav mentioned this pull request Mar 24, 2026

[SYCL] Add pre-release indicator #21610

Merged

KornevNikita pushed a commit that referenced this pull request Mar 25, 2026

[SYCL] Add pre-release indicator (#21610)

60efd5c

This is a follow-up PR after- #21572 to add pre-release indicator to the text of the __VERSION__ macro so that it matches the --version output.

bader reviewed Apr 5, 2026

View reviewed changes

KornevNikita mentioned this pull request Apr 8, 2026

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

Merged

KornevNikita pushed a commit that referenced this pull request Apr 17, 2026

[SYCL] Add pre-release indicator (#21610)

bbc993c

This is a follow-up PR after- #21572 to add pre-release indicator to the text of the __VERSION__ macro so that it matches the --version output.

	// Format: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"
	// Format example: "DPC++ 6.3.0 git (https://github.com/intel/llvm.git ...)"

	// SPARC:#define __VERSION__ "{{.}}DPC++{{.}}
	// SPARC:#define __VERSION__ "{{.}}DPC++{{.}}"

Conversation

ykhatav commented Mar 19, 2026

Uh oh!

ykhatav commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tahonermann commented Mar 19, 2026

Uh oh!

dvrogozh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

YuriPlyakhin left a comment

Choose a reason for hiding this comment

Uh oh!

hchilama left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tahonermann left a comment

Choose a reason for hiding this comment

Uh oh!

dvrogozh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tahonermann Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

ykhatav Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

tahonermann Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

bader Apr 5, 2026

Choose a reason for hiding this comment

Uh oh!

bader Apr 5, 2026

Choose a reason for hiding this comment

Uh oh!

bader Apr 5, 2026

Choose a reason for hiding this comment

Uh oh!

bader Apr 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

ykhatav commented Mar 19, 2026 •

edited

Loading