Skip to content
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

[SYCL][CUDA] Fix and cleanup more CUDA LIT fails #1303

Merged
merged 1 commit into from
Apr 9, 2020

Conversation

bjoernknafla
Copy link
Contributor

@bjoernknafla bjoernknafla commented Mar 12, 2020

Remove XFAIL from passing tests.

Change tests that should pass but fail as XFAIL, e.g., mark unexpectedly failing sub-buffer test to fix later for SYCL CUDA.

Add REQUIRES: opencl for LIT tests requiring OpenCL.
LIT tests that REQUIRES: opencl do not need an UNSUPPORTED: cuda.

Mark tests of features not supported by SYCL CUDA with UNSUPPORTED: cuda.

Tests that do not use the CUDA target triple do not require any CUDA related LIT marker.

Tests that do not fail with CUDA do not require any CUDA specific LIT marker.

Fix LIT test using -Werror to fail when the compiler driver warns about an unknown CUDA version as CUDA has otherwise nothing to do with the test.

Adapt test to moved pi_cuda.hpp header.

Some cleanup inside LIT configuration scripts.

Signed-off-by: Bjoern Knafla bjoern@codeplay.com

@bjoernknafla
Copy link
Contributor Author

bjoernknafla commented Mar 12, 2020

WIP as it requires #1302 and should be rebased on top of: #1242

@bader bader added the cuda CUDA back-end label Mar 12, 2020
fwyzard added a commit to fwyzard/llvm that referenced this pull request Mar 14, 2020
fwyzard added a commit to cms-patatrack/llvm that referenced this pull request Mar 21, 2020
# Conflicts:
#	sycl/test/basic_tests/buffer/buffer_full_copy.cpp
#	sycl/test/basic_tests/buffer/subbuffer.cpp
#	sycl/test/basic_tests/buffer/subbuffer_interop.cpp
#	sycl/test/basic_tests/event.cpp
#	sycl/test/basic_tests/image_api.cpp
#	sycl/test/basic_tests/kernel_interop.cpp
#	sycl/test/fpga_tests/fpga_queue.cpp
#	sycl/test/linear_id/opencl-interop.cpp
#	sycl/test/ordered_queue/prop.cpp
#	sycl/test/usm/badmalloc.cpp
#	sycl/test/usm/memset.cpp
@bjoernknafla
Copy link
Contributor Author

bjoernknafla commented Mar 27, 2020

After rebasing and updating #1300 based on feedback, this PR here now needs to be reworked.

@bjoernknafla bjoernknafla force-pushed the bjoern/lit-xfail-unsupported branch from 604b5f4 to fc4e86e Compare April 8, 2020 20:00
@bjoernknafla bjoernknafla changed the title [WIP][SYCL][CUDA] LIT XFAIL/UNSUPPORTED [SYCL][CUDA] Fix and cleanup more CUDA LIT fails Apr 8, 2020
Remove XFAIL from passing tests.

Change tests that should pass but fail as XFAIL, e.g., mark
unexpectedly failing sub-buffer test to fix later for SYCL CUDA.

Add `REQUIRES: opencl` for LIT tests requiring OpenCL.
LIT tests that `REQUIRES: opencl` do not need an `UNSUPPORTED: cuda`.

Mark tests of features not supported by SYCL CUDA with
`UNSUPPORTED: cuda`.

Tests that do not use the CUDA target triple do not require any
CUDA related LIT marker.

Tests that do not fail with CUDA do not require any CUDA specific
LIT marker.

Fix LIT test using `-Werror` to fail when the compiler driver warns
about an unknown CUDA version as CUDA has otherwise nothing to do with
the test.

Adapt test to moved `pi_cuda.hpp` header.

Some cleanup inside LIT configuration scripts.

Signed-off-by: Bjoern Knafla <bjoern@codeplay.com>
@bjoernknafla bjoernknafla force-pushed the bjoern/lit-xfail-unsupported branch from fc4e86e to 2eec1d0 Compare April 8, 2020 20:05
@bjoernknafla
Copy link
Contributor Author

I have rebased this PR based on the last LIT CUDA fixes: #1458

@@ -3,7 +3,7 @@
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// UNSUPPORTED: cuda
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it pass on CUDA device?

Copy link
Contributor Author

@bjoernknafla bjoernknafla Apr 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you prefer to mark all the fpga tests as not supported by CUDA? I am not entirely sure if the test semantics only work for accelerators anyway, in which case I could also quickly add REQUIRED: accelerator to all of them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this change actually.
We probably should have some common guidance for test behavior in unsupported environment and align all the tests in a separate PR.
+@MrSidims

@bader bader requested a review from vladimirlaz April 9, 2020 07:41
@bader bader merged commit cf9d1a4 into intel:sycl Apr 9, 2020
@bjoernknafla bjoernknafla deleted the bjoern/lit-xfail-unsupported branch April 9, 2020 11:16
alexbatashev pushed a commit to alexbatashev/llvm that referenced this pull request Apr 15, 2020
…duler_docs

* origin/sycl:
  [SYCL][PI][CUDA] Implements get_native interoperability (intel#1332)
  [SYCL] Fix check-sycl test suite on systems w/o OpenCL (intel#1503)
  [SYCL][Doc] Update ExtendedAtomics documentation (intel#1487)
  [SYCL][CUDA] Expose context extended deleters on PI API (intel#1483)
  [SYCL][NFC] Remove a dropped environment variable from a test (intel#1506)
  [SYCL] Add opencl-aot to sycl-toolchain target (intel#1504)
  [SYCL] Allow to run deploy LIT tests from particular directory
  [SYCL][CUDA] Fix LIT testing with CUDA devices (intel#1300)
  [SYCL] Remove operator name keywords (intel#1501)
  [Driver][SYCL] Consider .lo files as static archives (intel#1500)
  [SYCL-PTX] Update the compiler design to describe the CUDA target (intel#1408)
  [SYCL] Fix library build on Windows (intel#1499)
  [SYCL][NFC] Refactor lit.cfg.py (intel#1452)
  [SYCL] Fixed sub-buffer memory allocation update (intel#1486)
  [SYCL] Ensure proper definition of spirv builtins for SYCL (intel#1393)
  [SYCL][CUDA] LIT XFAIL/UNSUPPORTED (intel#1303)
  [SYCL][Doc] Function-type kernel attribute extension (intel#1494)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cuda CUDA back-end
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants