Skip to content

Commit 0877049

Browse files
committed
Merge branch 'main' into review/yang/misalign_access
2 parents 4d0dc14 + ba369ea commit 0877049

File tree

7 files changed

+83
-58
lines changed

7 files changed

+83
-58
lines changed

.github/workflows/cmake.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ concurrency:
88

99
permissions:
1010
contents: read
11+
pull-requests: write
1112

1213
jobs:
1314
ubuntu-build:
@@ -191,6 +192,30 @@ jobs:
191192
with:
192193
name: NATIVE_CPU
193194

195+
e2e-level-zero:
196+
name: E2E L0
197+
permissions:
198+
contents: read
199+
pull-requests: write
200+
needs: [ubuntu-build, level-zero]
201+
uses: ./.github/workflows/e2e_level_zero.yml
202+
203+
e2e-opencl:
204+
name: E2E OpenCL
205+
permissions:
206+
contents: read
207+
pull-requests: write
208+
needs: [ubuntu-build, opencl]
209+
uses: ./.github/workflows/e2e_opencl.yml
210+
211+
e2e-cuda:
212+
name: E2E CUDA
213+
permissions:
214+
contents: read
215+
pull-requests: write
216+
needs: [ubuntu-build, cuda]
217+
uses: ./.github/workflows/e2e_cuda.yml
218+
194219
windows-build:
195220
name: Build - Windows
196221
strategy:

.github/workflows/e2e.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/e2e_core.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,23 @@ jobs:
178178
id: tests
179179
run: ninja -C build-e2e check-sycl-e2e
180180

181-
- name: Add comment to PR
182-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
183-
if: ${{ always() }}
184-
with:
185-
script: |
186-
const adapter = '${{ matrix.adapter.name }}';
187-
const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
188-
const test_status = '${{ steps.tests.outcome }}';
189-
const job_status = '${{ job.status }}';
190-
const body = `E2E ${adapter} build:\n${url}\nJob status: ${job_status}. Test status: ${test_status}`;
191-
192-
github.rest.issues.createComment({
193-
issue_number: context.issue.number,
194-
owner: context.repo.owner,
195-
repo: context.repo.repo,
196-
body: body
197-
})
181+
# FIXME: Requires pull-request: write permissions but this is only granted
182+
# on pull requests from forks if using pull_request_target workflow
183+
# trigger but not the pull_request trigger..
184+
# - name: Add comment to PR
185+
# uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
186+
# if: ${{ always() }}
187+
# with:
188+
# script: |
189+
# const adapter = '${{ matrix.adapter.name }}';
190+
# const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
191+
# const test_status = '${{ steps.tests.outcome }}';
192+
# const job_status = '${{ job.status }}';
193+
# const body = `E2E ${adapter} build:\n${url}\nJob status: ${job_status}. Test status: ${test_status}`;
194+
195+
# github.rest.issues.createComment({
196+
# issue_number: context.issue.number,
197+
# owner: context.repo.owner,
198+
# repo: context.repo.repo,
199+
# body: body
200+
# })

scripts/core/EXP-BINDLESS-IMAGES.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Runtime:
5050
* Sampled images
5151
* Unsampled images
5252
* Mipmaps
53+
* Image arrays
5354
* Cubemaps
5455
* USM backed images
5556

@@ -207,6 +208,8 @@ Changelog
207208
+------------------------------------------------------------------------+
208209
| 11.0 | Added device queries for sampled image fetch capabilities. |
209210
+----------+-------------------------------------------------------------+
211+
| 12.0 | Added image arrays to list of supported bindless images |
212+
+----------+-------------------------------------------------------------+
210213

211214
Contributors
212215
--------------------------------------------------------------------------------

scripts/core/PROG.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,39 @@ native handle to a driver handle. For example, OpenCL platform
277277
may expose an extension ${x}ProgramCreateWithNativeHandle to retrieve
278278
a cl_program.
279279

280+
Memory
281+
======
282+
283+
UR Mem Handles
284+
--------------
285+
286+
A ${x}_mem_handle_t can represent an untyped memory buffer object, created by
287+
${x}MemBufferCreate, or a memory image object, created by ${x}MemImageCreate.
288+
A ${x}_mem_handle_t manages the internal allocation and deallocation of native
289+
memory objects across all devices in a ${x}_context_handle_t. A
290+
${x}_mem_handle_t may only be used by queues that share the same
291+
${x}_context_handle_t.
292+
293+
If multiple queues in the same ${x}_context_handle_t use the same
294+
${x}_mem_handle_t across dependent commands, a dependency must be defined by the
295+
user using the enqueue entry point's phEventWaitList parameter. Provided that
296+
dependencies are explicitly passed to UR entry points, a UR adapter will manage
297+
memory migration of native memory objects across all devices in a context, if
298+
memory migration is indeed necessary in the backend API.
299+
300+
.. parsed-literal::
301+
302+
// Q1 and Q2 are both in hContext
303+
${x}_mem_handle_t hBuffer;
304+
${x}MemBufferCreate(hContext,,,,&hBuffer);
305+
${x}EnqueueMemBufferWrite(Q1, hBuffer,,,,,,, &outEv);
306+
${x}EnqueueMemBufferRead(Q2, hBuffer,,,,, 1, &outEv /*phEventWaitList*/, );
307+
308+
As such, the buffer written to in ${x}EnqueueMemBufferWrite can be
309+
successfully read using ${x}EnqueueMemBufferRead from another queue in the same
310+
context, since the event associated with the write operation has been passed as
311+
a dependency to the read operation.
312+
280313
Memory Pooling
281314
----------------------------------
282315

source/adapters/cuda/enqueue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueCooperativeKernelLaunchExp(
535535
const size_t *pGlobalWorkOffset, const size_t *pGlobalWorkSize,
536536
const size_t *pLocalWorkSize, uint32_t numEventsInWaitList,
537537
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
538-
if (*pGlobalWorkOffset == 0 || pGlobalWorkOffset == nullptr) {
538+
if (pGlobalWorkOffset == nullptr || *pGlobalWorkOffset == 0) {
539539
ur_exp_launch_property_t coop_prop;
540540
coop_prop.id = UR_EXP_LAUNCH_PROPERTY_ID_COOPERATIVE;
541541
coop_prop.value.cooperative = 1;

source/loader/layers/sanitizer/asan_interceptor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct ContextInfo {
131131
};
132132

133133
struct USMLaunchInfo {
134-
LaunchInfo *Data;
134+
LaunchInfo *Data = nullptr;
135135

136136
ur_context_handle_t Context = nullptr;
137137
ur_device_handle_t Device = nullptr;

0 commit comments

Comments
 (0)