Skip to content

[SYCL] Fix LIT tests to take into account LLVM_LIBDIR_SUFFIX#1227

Closed
fwyzard wants to merge 1 commit intointel:syclfrom
fwyzard:fix_SYCL_LIT_test_for_LLVM_LIBDIR_SUFFIX
Closed

[SYCL] Fix LIT tests to take into account LLVM_LIBDIR_SUFFIX#1227
fwyzard wants to merge 1 commit intointel:syclfrom
fwyzard:fix_SYCL_LIT_test_for_LLVM_LIBDIR_SUFFIX

Conversation

@fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Mar 2, 2020

sycl/test/CMakeLists.txt uses

set(LLVM_BUILD_LIBRARY_DIRS "${LLVM_BINARY_DIR}/lib/")

instead of

set(LLVM_BUILD_LIBRARY_DIRS "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")

making all LIT tests will fail if a LLVM_LIBDIR_SUFFIX is specified.

This PR updates the path to take LLVM_LIBDIR_SUFFIX into account.

@fwyzard
[SYCL] Fix LIT tests to take into account LLVM_LIBDIR_SUFFIX
78bd98e 
Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch>
@fwyzard fwyzard mentioned this pull request Mar 2, 2020
Merged
@bader
Copy link
Contributor

bader commented Mar 2, 2020

@fwyzard, could you check if #1165 fixes the problem, please?
It allows to validate "deployed" compiler and it's already reviewed and approved for commit.

@fwyzard
Copy link
Contributor Author

fwyzard commented Mar 2, 2020

@fwyzard, could you check if #1165 fixes the problem, please?

I think it misses ${LLVM_LIBDIR_SUFFIX} as well.

It allows to validate "deployed" compiler and it's already reviewed and approved for commit.

Does it mean it allows to validate only a deployed compiler, or also a deployed compiler ?

In fact, how does the deployment work ?
The instructions at GetStartedWithSYCLCompiler.md say only

TODO: add instructions how to deploy built SYCL toolchain.

@bader
Copy link
Contributor

bader commented Mar 2, 2020

It allows to validate "deployed" compiler and it's already reviewed and approved for commit.

Does it mean it allows to validate only a deployed compiler, or also a deployed compiler ?

It allows to validate both: built and deployed compilers.

In fact, how does the deployment work ?
The instructions at GetStartedWithSYCLCompiler.md say only

TODO: add instructions how to deploy built SYCL toolchain.

There is a special cmake target deploy-sycl-toolchain, which is supposed to prepare a compiler toolchain with SYCL support.
Thanks for noticing missing instructions. I'll update the document later.

@fwyzard
Copy link
Contributor Author

fwyzard commented Mar 2, 2020

@fwyzard, could you check if #1165 fixes the problem, please?

I think it misses ${LLVM_LIBDIR_SUFFIX} as well.

Seems to work with #1165 (comment) .

@fwyzard
Copy link
Contributor Author

fwyzard commented Mar 2, 2020

#1165 together with #1165 (comment) should already fix this issue.

@fwyzard fwyzard closed this Mar 2, 2020
@fwyzard fwyzard deleted the fix_SYCL_LIT_test_for_LLVM_LIBDIR_SUFFIX branch March 2, 2020 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fwyzard @bader