[SYCL] Update test scripts and sycl-ls to use 'fpga' with ONEAPI_DEVICE_SELECTOR #12596
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
uditagarwal97
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
|
I think |
sycl/test-e2e/lit.cfg.py
Outdated
| @@ -590,7 +590,7 @@ | |||
| config.intel_driver_ver = {} | |||
| for sycl_device in config.sycl_devices: | |||
| env = copy.copy(llvm_config.config.environment) | |||
| env["ONEAPI_DEVICE_SELECTOR"] = sycl_device | |||
| env["ONEAPI_DEVICE_SELECTOR"] = sycl_device.replace(":acc", ":fpga") | |||
There was a problem hiding this comment.
Line 430 should be updated instead, I think.
uditagarwal97
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
uditagarwal97
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
uditagarwal97
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
Yup. I've changed 'sycl-ls' output. |
uditagarwal97
changed the title
aelovikov-intel
approved these changes
Feb 5, 2024
|
@intel/llvm-gatekeepers the PR is ready! |
dm-vodopyanov
pushed a commit
that referenced
this pull request
Feb 8, 2024
) As per the ONEAPI_DEVICE_SELECTOR [documentation](https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md#oneapi_device_selector), the device type can only be cpu, gpu, or fpga (or any combination of those). Currently, 'acc' is also accepted by ONEAPI_DEVICE_SELECTOR as a valid device type, which is incorrect. This PR modifies drops support of 'acc' in ONEAPI_DEVICE_SELECTOR in favor of 'fpga'. We have already updated existing test cases (#12551), testing scripts (#12596 ) to use 'fpga' with ONEAPI_DEVICE_SELECTOR.
steffenlarsen
pushed a commit
that referenced
this pull request
Feb 9, 2024
In PR##12596, we changed the output of sycl-ls to use 'fpga' instead of 'acc'. This has caused several tests to fail when fpga is available on the system. This PR fixes that. In retrospect, we should have enabled testing on FPGA in pre-commit testing as this bug could have been caught earlier.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As per the ONEAPI_DEVICE_SELECTOR documentation, the device type can only be cpu, gpu, or fpga (or any combination of those). Currently, 'acc' is also accepted by ONEAPI_DEVICE_SELECTOR as a valid device type, which is incorrect.
This PR modifies lit.cfg.py and sycl-ls to use 'fpga' instead of 'acc' in ONEAPI_DEVICE_SELECTOR.