[UR][L0] Add several fixes to L0 adapter for test-usm #1105

jandres742 · 2023-11-22T00:46:07Z

intel/llvm testing: intel/llvm#11980

kswiecicki · 2023-11-22T14:04:59Z

source/adapters/level_zero/usm.cpp

+        return ReturnValue(Pool);
+      }
+      if (Pool->HostMemPool.get() == UMFPool) {
+        return ReturnValue(Pool->HostMemPool.get());


This should return ReturnValue(Pool);

thanks @kswiecicki! fixed.

kswiecicki · 2023-11-22T14:12:42Z

source/adapters/level_zero/usm.cpp

@@ -829,6 +884,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreate(
  try {
    *Pool = reinterpret_cast<ur_usm_pool_handle_t>(
        new ur_usm_pool_handle_t_(Context, PoolDesc));
+
+    std::shared_lock<ur_shared_mutex> ContextLock(Context->Mutex);
+    Context->UsmPoolHandles.push_back(*Pool);


Context->UsmPoolHandles should also be updated in urUSMPoolRelease.

thanks @kswiecicki. missed it. fixed.

jandres742 · 2023-11-22T18:01:41Z

There are some tests failing because we need to have UMF tracking. So we need to have this one merged #1071

fabiomestre · 2023-12-05T16:48:04Z

I have updated the target branch of this PR from the adapters branch to the main branch.
Development in UR is moving back to main. The adapters branch will soon be deleted.

kbenzie · 2023-12-06T16:17:00Z

There are some tests failing because we need to have UMF tracking. So we need to have this one merged #1071

I'm merged #1071 now so will rebase this on top of the main branch.

EDIT: I didn't notice the merge conflict, I'll let you resolve that as part of updating the branch @jandres742

kbenzie · 2023-12-07T11:39:25Z

I went ahead and rebased this on top of main.

codecov-commenter · 2023-12-07T11:57:20Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (95f9092) 15.73% compared to head (815a286) 15.74%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1105   +/-   ##
=======================================
  Coverage   15.73%   15.74%           
=======================================
  Files         223      223           
  Lines       31466    31466           
  Branches     3556     3556           
=======================================
+ Hits         4952     4953    +1     
+ Misses      26463    26462    -1     
  Partials       51       51

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

kbenzie · 2023-12-12T16:59:55Z

I updated intel/llvm#11980 to point at the latest commit on this branch and its caused 121 failures. @nrspruit I think I've taken this one as far as I can. I'll need to hand that over to you.

nrspruit · 2023-12-13T02:41:08Z

I updated intel/llvm#11980 to point at the latest commit on this branch and its caused 121 failures. @nrspruit I think I've taken this one as far as I can. I'll need to hand that over to you.

Thanks @kbenzie , I will be taking a look tomorrow to determine what is causing the failures.

aarongreig · 2023-12-13T14:16:06Z

source/adapters/level_zero/usm.cpp

@@ -187,8 +187,15 @@ static ur_result_t USMDeviceAllocImpl(void **ResultPtr,
    ZeDesc.pNext = &RelaxedDesc;
  }

-  ZE2UR_CALL(zeMemAllocDevice, (Context->ZeContext, &ZeDesc, Size, Alignment,


Looks like this macro was needed for the l0 api tracing enabled with UR_L0_DEBUG, that tracing it necessary for a lot of the sycl-e2e tests (they check for certain l0 api calls in the trace output). We should make these kinds of changes like this

ze_result_t ZeResult = ZE_CALL_NOCHECK(zeMemAllocDevice, (Context->ZeContext, &ZeDesc, Size, Alignment, Device->ZeDevice, ResultPtr));

instead

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>

There is a discrepancy between Debug and Release build pass rates in the USM test suite on Level Zero. Make those tests optional until the fix is introduced.

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>

kbenzie · 2023-12-14T12:02:55Z

Looks like the SYCL E2E failures have been resolved so I'll merge this.

[UR][L0] Add several fixes to L0 adapter for test-usm

Corresponding UR chanages oneapi-src/unified-runtime#1105. --------- Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com> Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>

[UR][L0] Add several fixes to L0 adapter for test-usm

Corresponding UR chanages oneapi-src/unified-runtime#1105. --------- Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com> Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>

pbalcer requested a review from kswiecicki November 22, 2023 13:28

kswiecicki reviewed Nov 22, 2023

View reviewed changes

jandres742 force-pushed the fixtestusm branch from feda3bd to 60ad384 Compare November 22, 2023 17:25

jandres742 mentioned this pull request Nov 22, 2023

[UR] Enable UMF tracking by default #1071

Merged

jandres742 force-pushed the fixtestusm branch from 1bdeaca to 6caf12a Compare November 22, 2023 18:04

kbenzie added the v0.8.x Include in the v0.8.x release label Nov 28, 2023

fabiomestre changed the base branch from adapters to main December 5, 2023 16:47

jandres742 force-pushed the fixtestusm branch from 6caf12a to 45b23e5 Compare December 5, 2023 18:11

kbenzie mentioned this pull request Dec 6, 2023

Candidate for v0.8.2 release tag #1163

Merged

13 tasks

kbenzie force-pushed the fixtestusm branch from 45b23e5 to 9902664 Compare December 7, 2023 11:38

kbenzie force-pushed the fixtestusm branch from 9902664 to 61a3820 Compare December 12, 2023 12:05

kbenzie marked this pull request as ready for review December 12, 2023 15:26

kbenzie requested review from a team as code owners December 12, 2023 15:26

aarongreig reviewed Dec 13, 2023

View reviewed changes

nrspruit mentioned this pull request Dec 14, 2023

[UR][L0] Add several fixes to L0 adapter for test-usm intel/llvm#12168

Closed

Jaime Arteaga and others added 3 commits December 13, 2023 18:26

[UR][L0] Add several fixes to L0 adapter for test-usm

776a647

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>

[L0] Make two USM tests optionally pass

ad970bf

There is a discrepancy between Debug and Release build pass rates in the USM test suite on Level Zero. Make those tests optional until the fix is introduced.

[L0] Fix Calls to L0 apis to use ZE_CALL_NOCHECK

a51f6aa

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>

nrspruit force-pushed the fixtestusm branch from 03aa124 to a51f6aa Compare December 14, 2023 02:26

nrspruit added 2 commits December 13, 2023 18:28

[L0] Fix formatting of new api calls

fdfdb1a

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>

[L0] Fix reformatted calls to no check

815a286

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>

kbenzie merged commit 3e4d724 into oneapi-src:main Dec 14, 2023
51 checks passed

kbenzie mentioned this pull request Dec 14, 2023

[UR][L0] Add several fixes to L0 adapter for test-usm intel/llvm#11980

Merged

kbenzie added a commit to kbenzie/unified-runtime that referenced this pull request Dec 14, 2023

Merge pull request oneapi-src#1105 from jandres742/fixtestusm

93e3234

[UR][L0] Add several fixes to L0 adapter for test-usm

kbenzie added a commit to kbenzie/unified-runtime that referenced this pull request Dec 15, 2023

Merge pull request oneapi-src#1105 from jandres742/fixtestusm

3748aaf

[UR][L0] Add several fixes to L0 adapter for test-usm

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UR][L0] Add several fixes to L0 adapter for test-usm #1105

[UR][L0] Add several fixes to L0 adapter for test-usm #1105

jandres742 commented Nov 22, 2023 •

edited

Loading

kswiecicki Nov 22, 2023 •

edited

Loading

jandres742 Nov 22, 2023

kswiecicki Nov 22, 2023

jandres742 Nov 22, 2023

jandres742 commented Nov 22, 2023

fabiomestre commented Dec 5, 2023

kbenzie commented Dec 6, 2023 •

edited

Loading

kbenzie commented Dec 7, 2023

codecov-commenter commented Dec 7, 2023 •

edited

Loading

kbenzie commented Dec 12, 2023

nrspruit commented Dec 13, 2023

aarongreig Dec 13, 2023

kbenzie commented Dec 14, 2023

[UR][L0] Add several fixes to L0 adapter for test-usm #1105

[UR][L0] Add several fixes to L0 adapter for test-usm #1105

Conversation

jandres742 commented Nov 22, 2023 • edited Loading

kswiecicki Nov 22, 2023 • edited Loading

Choose a reason for hiding this comment

jandres742 Nov 22, 2023

Choose a reason for hiding this comment

kswiecicki Nov 22, 2023

Choose a reason for hiding this comment

jandres742 Nov 22, 2023

Choose a reason for hiding this comment

jandres742 commented Nov 22, 2023

fabiomestre commented Dec 5, 2023

kbenzie commented Dec 6, 2023 • edited Loading

kbenzie commented Dec 7, 2023

codecov-commenter commented Dec 7, 2023 • edited Loading

Codecov Report

kbenzie commented Dec 12, 2023

nrspruit commented Dec 13, 2023

aarongreig Dec 13, 2023

Choose a reason for hiding this comment

kbenzie commented Dec 14, 2023

jandres742 commented Nov 22, 2023 •

edited

Loading

kswiecicki Nov 22, 2023 •

edited

Loading

kbenzie commented Dec 6, 2023 •

edited

Loading

codecov-commenter commented Dec 7, 2023 •

edited

Loading