Skip to content

[SYCL][NFC] Fix SYCL lit test execution on a system w/o GPU #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2020

Conversation

bader
Copy link
Contributor

@bader bader commented Oct 2, 2020

This should fix post-commit failures introduced by #2492.

@bader bader requested a review from cperkinsintel October 2, 2020 09:52
@bader bader requested a review from a team as a code owner October 2, 2020 09:52
@bader bader requested a review from v-klochkov October 2, 2020 09:52
@bader
Copy link
Contributor Author

bader commented Oct 2, 2020

@v-klochkov, @cperkinsintel, I'm going to merge this w/o review to fix LIT tests in post-commit job.
Feel free to leave your comments - I'll address them in a separate PR.

@bader bader merged commit 787af47 into intel:sycl Oct 2, 2020
@bader bader deleted the release branch October 2, 2020 12:06
@cperkinsintel
Copy link
Contributor

What is the difference between %GPU_CHECK_PLACEHOLDER% and piping to FileCheck? Just convention?
I think the oversight is that I should have put CPU and ACC test lines in there for completeness .

@bader
Copy link
Contributor Author

bader commented Oct 2, 2020

What is the difference between %GPU_CHECK_PLACEHOLDER% and piping to FileCheck? Just convention?

%GPU_CHECK_PLACEHOLDER replaced with an empty line if test system doesn't have GPU device.
%GPU_RUN_PLACEHOLDER is replaced with true on the system with GPU, so we should avoid running FileCheck in this case.
The replacement logic is implemented here: https://github.com/intel/llvm/blob/sycl/sycl/test/lit.cfg.py#L148

I think the oversight is that I should have put CPU and ACC test lines in there for completeness .

Feel free to add them.

@cperkinsintel
Copy link
Contributor

cperkinsintel commented Oct 2, 2020

Feel free to add them.

done.
https://github.com/intel/llvm/pull/2589/files

alexbatashev pushed a commit to alexbatashev/llvm that referenced this pull request Oct 5, 2020
…_wrapper

* upstream/sycl: (1021 commits)
  [SYCL] Enable async_work_group_copy for scalar and vector bool types (intel#2582)
  [SYCL] Fix element type in handler::copy (intel#2590)
  [NFC][SYCL] Remove unnecessary if condition (intel#2585)
  [SYCL][NFC] Fix SYCL lit test execution on a system w/o GPU (intel#2584)
  [SYCL] Add error handling for non-uniform work group size case (intel#2569)
  [SYCL][ESIMD] Preserve undef initializer for globals in ESIMDLowerVecArg pass (intel#2555)
  [SYCL] Make Level-Zero events visible on the host (intel#2576)
  [Driver][SYCL][NFC] Add help information for -Wno-sycl-strict (intel#2570)
  [SYCL] Relax test to work in Win32 environment. (intel#2580)
  [SYCL] Emit suppressed warnings from SYCL headers (intel#2575)
  [SYCL][NFC] Cover more classes with ABI tests (intel#2577)
  [SYCL][ESIMD] Update ESIMD tests and add raw send support. (intel#2482)
  [SYCL] Make ESIMD on-device tests require linux,gpu,opencl. (intel#2560)
  [SYCL] Release commands with no dependencies after they're enqueued (intel#2492)
  [SYCL] Add multi-device and multi-platform support for SYCL_DEVICE_ALLOWLIST  (intel#2483)
  [SYCL] Try to enqueue host command depencies (intel#2561)
  [SYCL][ESIMD][NFC] Align namespace name with the spec guidelines (intel#2573)
  [SYCL][NFC] Add class layout ABI tests for memory objects (intel#2559)
  [SYCL] Change adress space for global variables (intel#2534)
  [NFC][SYCL] Fix comment. (intel#2541)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants