Skip to content

Commit 2a51c3a

Browse files
Merge branch 'sycl' into refactorcache
2 parents a1cd6c8 + 4140ba1 commit 2a51c3a

File tree

15 files changed

+8763
-85
lines changed

15 files changed

+8763
-85
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,4 @@ sycl/test-e2e/ThreadSanitizer/ @intel/dpcpp-sanitizers-review
226226

227227
# ABI compatibility
228228
devops/compat_ci_exclude.sycl-rel-** @gmlueck @xtian-github
229+
sycl/test/abi/*sycl-rel*.dump @AlexeySachkov @KornevNikita

.github/workflows/sycl-nightly.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ on:
88
permissions: read-all
99

1010
jobs:
11+
check_abi_symbols:
12+
name: Check ABI symbols tests match release branch
13+
runs-on: [Linux, build]
14+
if: github.repository == 'intel/llvm'
15+
container: ghcr.io/intel/llvm/ubuntu2404_build
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
sparse-checkout: |
20+
sycl/test/abi
21+
- run: |
22+
git fetch --depth=1 origin sycl-rel-6_3
23+
git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_linux.dump sycl/test/abi/sycl_symbols_linux-sycl-rel-6_3.dump
24+
git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_windows.dump sycl/test/abi/sycl_symbols_windows-sycl-rel-6_3.dump
25+
1126
ubuntu2204_build:
1227
if: github.repository == 'intel/llvm'
1328
uses: ./.github/workflows/sycl-linux-build.yml

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ for general guidelines around contributing to this project. You can then see
7979
[ContributeToDPCPP](./sycl/doc/developer/ContributeToDPCPP.md) for DPC++ specific
8080
guidelines.
8181

82-
## Late-outline OpenMP\* and OpenMP\* Offload
83-
84-
See [openmp](/openmp) branch.
85-
8682
# License
8783

8884
See [LICENSE](./sycl/LICENSE.TXT) for details.

devops/dependencies-igc-dev.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"linux": {
33
"igc_dev": {
4-
"github_tag": "igc-dev-3c9eb3b",
5-
"version": "3c9eb3b",
6-
"updated_at": "2025-08-16T05:10:12Z",
7-
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3778774566/zip",
4+
"github_tag": "igc-dev-47c1f6e",
5+
"version": "47c1f6e",
6+
"updated_at": "2025-08-20T15:46:36Z",
7+
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3810490997/zip",
88
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
99
}
1010
}

sycl/doc/EnvironmentVariables.md

Lines changed: 28 additions & 22 deletions
Large diffs are not rendered by default.

sycl/doc/Releases.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,26 @@ ordered from the newest to the oldest.
2727

2828
Release branches are prefixed with `sycl-rel-`
2929

30-
### **[Upcoming]** `6.2.0` release
30+
### _[Upcoming]_ `6.3.0` release
3131

32-
This release will be made from
33-
the [`sycl-rel-6_2`](https://github.com/intel/llvm/tree/sycl-rel-6_2) branch.
32+
This release will be made from the
33+
[`sycl-rel-6_3`](https://github.com/intel/llvm/tree/sycl-rel-6_3) branch.
34+
35+
### **[Latest]** `6.2.0` release
36+
37+
This release was made from
38+
the [`sycl-rel-6_2`](https://github.com/intel/llvm/tree/sycl-rel-6_2) branch and
39+
we have the following tags published:
40+
- **[Latest]** [`v6.2.0`](https://github.com/intel/llvm/releases/tag/v6.2.0)
41+
- [`v6.2.0-rc1`](https://github.com/intel/llvm/releases/tag/v6.2.0-rc1) -
42+
release candidate 1 for 6.2.0 release
3443

3544
### `6.1.0` release
3645

3746
This release was made from
3847
the [`sycl-rel-6_1_0`](https://github.com/intel/llvm/tree/sycl-rel-6_1_0)
3948
branch and we have the following tags published:
40-
- **[Latest]** [`v6.1.0`](https://github.com/intel/llvm/releases/tag/v6.1.0)
49+
- [`v6.1.0`](https://github.com/intel/llvm/releases/tag/v6.1.0)
4150

4251
### `6.0.X` releases
4352

sycl/doc/extensions/template.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ https://github.com/intel/llvm/issues
3737

3838
== Dependencies
3939

40-
This extension is written against the SYCL 2020 revision 9 specification. All
40+
This extension is written against the SYCL 2020 revision 10 specification. All
4141
references below to the "core SYCL specification" or to section numbers in the
4242
SYCL specification refer to that revision.
4343

sycl/include/sycl/detail/string_view.hpp

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,15 @@ class string_view {
6868

6969
constexpr const char *data() const noexcept { return str ? str : ""; }
7070

71-
constexpr explicit operator std::string_view() const noexcept {
71+
constexpr operator std::string_view() const noexcept {
72+
if (str == nullptr)
73+
return std::string_view{};
7274
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
7375
return std::string_view(str, len);
7476
#else
7577
return std::string_view(str);
7678
#endif
7779
}
78-
79-
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
80-
friend constexpr bool operator==(string_view lhs,
81-
std::string_view rhs) noexcept {
82-
return rhs == std::string_view(lhs);
83-
}
84-
friend constexpr bool operator==(std::string_view lhs,
85-
string_view rhs) noexcept {
86-
return lhs == std::string_view(rhs);
87-
}
88-
89-
friend constexpr bool operator!=(string_view lhs,
90-
std::string_view rhs) noexcept {
91-
return rhs != std::string_view(lhs);
92-
}
93-
friend constexpr bool operator!=(std::string_view lhs,
94-
string_view rhs) noexcept {
95-
return lhs != std::string_view(rhs);
96-
}
97-
#else
98-
friend constexpr bool operator==(string_view lhs,
99-
std::string_view rhs) noexcept {
100-
return rhs == lhs.data();
101-
}
102-
friend constexpr bool operator==(std::string_view lhs,
103-
string_view rhs) noexcept {
104-
return lhs == rhs.data();
105-
}
106-
107-
friend constexpr bool operator!=(string_view lhs,
108-
std::string_view rhs) noexcept {
109-
return rhs != lhs.data();
110-
}
111-
friend constexpr bool operator!=(std::string_view lhs,
112-
string_view rhs) noexcept {
113-
return lhs != rhs.data();
114-
}
115-
#endif
11680
};
11781

11882
} // namespace detail

0 commit comments

Comments
 (0)