Skip to content

Commit e820a39

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web' (9 commits)
2 parents e1d95f9 + dbe6a50 commit e820a39

File tree

98 files changed

+625
-3432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+625
-3432
lines changed

.github/workflows/sycl-linux-precommit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
uses: ./.github/workflows/sycl-detect-changes.yml
4545

4646
build:
47+
name: Self build
4748
needs: [detect_changes]
4849
if: always() && success()
4950
uses: ./.github/workflows/sycl-linux-build.yml

.github/workflows/sycl-post-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: ./.github/workflows/sycl-detect-changes.yml
3535

3636
build-lin:
37-
name: Linux (Self build + no-assertions)
37+
name: Linux (GCC + no-assertions)
3838
if: github.repository == 'intel/llvm'
3939
uses: ./.github/workflows/sycl-linux-build.yml
4040
with:

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-e22e2a8",
5-
"version": "e22e2a8",
6-
"updated_at": "2025-07-31T01:11:27Z",
7-
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3654137925/zip",
4+
"github_tag": "igc-dev-04d2e53",
5+
"version": "04d2e53",
6+
"updated_at": "2025-08-04T02:10:56Z",
7+
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3677914099/zip",
88
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
99
}
1010
}

devops/scripts/benchmarks/benches/compute.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def git_url(self) -> str:
5151
return "https://github.com/intel/compute-benchmarks.git"
5252

5353
def git_hash(self) -> str:
54-
return "83b9ae3ebb3563552409f3a317cdc1cf3d3ca6bd"
54+
return "c9e135d4f26dd6badd83009f92f25d6285fc1e21"
5555

5656
def setup(self) -> None:
5757
if options.sycl is None:
@@ -73,6 +73,8 @@ def setup(self) -> None:
7373
f"-DBUILD_SYCL=ON",
7474
f"-DSYCL_COMPILER_ROOT={options.sycl}",
7575
f"-DALLOW_WARNINGS=ON",
76+
f"-DCMAKE_CXX_COMPILER=clang++",
77+
f"-DCMAKE_C_COMPILER=clang",
7678
]
7779

7880
if options.ur_adapter == "cuda":
@@ -204,6 +206,17 @@ def benchmarks(self) -> list[Benchmark]:
204206

205207
# Add GraphApiSubmitGraph benchmarks
206208
for in_order_queue in [0, 1]:
209+
benches.append(
210+
GraphApiSubmitGraph(
211+
self,
212+
runtime,
213+
in_order_queue,
214+
self.submit_graph_num_kernels[-1],
215+
0,
216+
useEvents=0,
217+
useHostTasks=1,
218+
)
219+
)
207220
for num_kernels in self.submit_graph_num_kernels:
208221
for measure_completion_time in [0, 1]:
209222
for use_events in [0, 1]:
@@ -215,6 +228,7 @@ def benchmarks(self) -> list[Benchmark]:
215228
num_kernels,
216229
measure_completion_time,
217230
use_events,
231+
useHostTasks=0,
218232
)
219233
)
220234

@@ -840,22 +854,25 @@ def __init__(
840854
numKernels,
841855
measureCompletionTime,
842856
useEvents,
857+
useHostTasks,
843858
):
844859
self.inOrderQueue = inOrderQueue
845860
self.numKernels = numKernels
846861
self.measureCompletionTime = measureCompletionTime
847862
self.useEvents = useEvents
863+
self.useHostTasks = useHostTasks
848864
self.ioq_str = "in order" if self.inOrderQueue else "out of order"
849865
self.measure_str = (
850866
" with measure completion" if self.measureCompletionTime else ""
851867
)
852868
self.use_events_str = f" with events" if self.useEvents else ""
869+
self.host_tasks_str = f" use host tasks" if self.useHostTasks else ""
853870
super().__init__(
854871
bench, f"graph_api_benchmark_{runtime.value}", "SubmitGraph", runtime
855872
)
856873

857874
def explicit_group(self):
858-
return f"SubmitGraph {self.ioq_str}{self.measure_str}{self.use_events_str}, {self.numKernels} kernels"
875+
return f"SubmitGraph {self.ioq_str}{self.measure_str}{self.use_events_str}{self.host_tasks_str}, {self.numKernels} kernels"
859876

860877
def description(self) -> str:
861878
return (
@@ -864,10 +881,10 @@ def description(self) -> str:
864881
)
865882

866883
def name(self):
867-
return f"graph_api_benchmark_{self.runtime.value} SubmitGraph{self.use_events_str} numKernels:{self.numKernels} ioq {self.inOrderQueue} measureCompletion {self.measureCompletionTime}"
884+
return f"graph_api_benchmark_{self.runtime.value} SubmitGraph{self.use_events_str}{self.host_tasks_str} numKernels:{self.numKernels} ioq {self.inOrderQueue} measureCompletion {self.measureCompletionTime}"
868885

869886
def display_name(self) -> str:
870-
return f"{self.runtime.value.upper()} SubmitGraph {self.ioq_str}{self.measure_str}{self.use_events_str}, {self.numKernels} kernels"
887+
return f"{self.runtime.value.upper()} SubmitGraph {self.ioq_str}{self.measure_str}{self.use_events_str}{self.host_tasks_str}, {self.numKernels} kernels"
871888

872889
def get_tags(self):
873890
return [
@@ -888,6 +905,7 @@ def bin_args(self) -> list[str]:
888905
"--KernelExecutionTime=1",
889906
f"--UseEvents={self.useEvents}",
890907
"--UseExplicit=0",
908+
f"--UseHostTasks={self.useHostTasks}",
891909
]
892910

893911

devops/scripts/benchmarks/compare.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,9 @@ def get_result_paths() -> list[str]:
112112
def validate_benchmark_result(result: BenchmarkRun) -> bool:
113113
"""
114114
Returns True if result file:
115-
- Was ran on the target machine/hostname specified
116-
- Sanity check: ensure metadata are all expected values:
117115
- Date is truly before cutoff timestamp
118116
- Name truly matches up with specified result_name
119117
"""
120-
if result.hostname != hostname:
121-
return False
122118
if result.name != result_name:
123119
log.warning(
124120
f"Result file {result_path} does not match specified result name {result.name}."

llvm/docs/requirements-hashed.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ commonmark==0.9.1 \
118118
--hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \
119119
--hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9
120120
# via recommonmark
121-
docutils==0.22 \
122-
--hash=sha256:4ed966a0e96a0477d852f7af31bdcb3adc049fbb35ccba358c2ea8a03287615e \
123-
--hash=sha256:ba9d57750e92331ebe7c08a1bbf7a7f8143b86c476acd51528b042216a6aad0f
121+
docutils==0.21.2 \
122+
--hash=sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f \
123+
--hash=sha256:dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2
124124
# via
125125
# -r requirements.txt
126126
# myst-parser

llvm/docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sphinx==8.1.3
2-
docutils==0.22
2+
docutils==0.21.2
33
sphinx-markdown-tables==0.0.17
44
recommonmark==0.7.1
55
sphinx-automodapi==0.20.0

sycl/doc/extensions/experimental/sycl_ext_oneapi_device_image_backend_content.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,24 +224,24 @@ namespace syclexp = sycl::ext::oneapi::experimental;
224224
225225
SYCL_EXT_ONEAPI_FUNCTION_PROPERTY((syclexp::nd_range_kernel<1>))
226226
void iota(float start, float *ptr) {
227-
size_t id = syclext::this_work_item::get_nd_item().get_global_linear_id();
227+
size_t id = syclext::this_work_item::get_nd_item<1>().get_global_linear_id();
228228
ptr[id] = start + static_cast<float>(id);
229229
}
230230
231-
void main() {
231+
int main() {
232232
sycl::device d;
233233
sycl::queue q{d};
234234
sycl::context ctxt = q.get_context();
235235
236236
// Get a kernel bundle that contains the kernel "iota".
237-
sycl::kernel_id iota = syclexp::get_kernel_id<iota>();
237+
sycl::kernel_id iota_id = syclexp::get_kernel_id<iota>();
238238
auto exe_bndl =
239-
sycl::get_kernel_bundle<sycl::bundle_state::executable>(ctxt, {iota});
239+
sycl::get_kernel_bundle<sycl::bundle_state::executable>(ctxt, {iota_id});
240240
241241
std::vector<std::byte> bytes;
242-
for (auto& img: bundle) {
242+
for (auto& img: exe_bndl) {
243243
// Search for the device image that contains "iota" for this device.
244-
if (img.has_kernel(iota, dev)) {
244+
if (img.has_kernel(iota_id, d)) {
245245
bytes = img.ext_oneapi_get_backend_content();
246246
break;
247247
}

0 commit comments

Comments
 (0)