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-PTX] Fix geometric and common builtin categories #1832

Merged
merged 1 commit into from
Jun 25, 2020

Conversation

Naghasan
Copy link
Contributor

@Naghasan Naghasan commented Jun 8, 2020

Remove old forward declared SPIR-V builtin from the geometric and common categories.
Update the binding file using the header generator.
Add relevant binding test.
Remove XFAIL from related SYCL tests.

Note there is a dependency with #1828 but can be reviewed independently.

Signed-off-by: Victor Lomuller [email protected]

@Naghasan Naghasan requested review from bader and a team as code owners June 8, 2020 11:05
@Naghasan Naghasan requested a review from againull June 8, 2020 11:05
@bader bader added cuda CUDA back-end libclc libclc project related issues labels Jun 8, 2020
@bader
Copy link
Contributor

bader commented Jun 11, 2020

LGTM

@bader
Copy link
Contributor

bader commented Jun 19, 2020

@Naghasan, could you resolve merge conflicts, please?

@Naghasan Naghasan changed the title [WIP][SYCL-PTX] Fix geometric and common builtin categories [SYCL-PTX] Fix geometric and common builtin categories Jun 23, 2020
bader
bader previously approved these changes Jun 23, 2020
@bader
Copy link
Contributor

bader commented Jun 23, 2020

@Naghasan, could you resolve merge conflicts, please?

@Naghasan
Copy link
Contributor Author

I rebased the patch

bader
bader previously approved these changes Jun 23, 2020
@Naghasan
Copy link
Contributor Author

@bader I have rebased to tip, I'm sure why the build failed before. Last version compiles fine on my side.

bader
bader previously approved these changes Jun 25, 2020
@bader
Copy link
Contributor

bader commented Jun 25, 2020

@bader I have rebased to tip, I'm sure why the build failed before. Last version compiles fine on my side.

According to the logs _CLC_OVERLOAD is not defined in unary_decl.inc, which is included from sqrt.cl.

In file included from /localdisk2/sycl_ci/buildbot/worker/Lit_With_Cuda/llvm.src/libclc/generic/libspirv/math/sqrt.cl:9:
In file included from /localdisk2/sycl_ci/buildbot/worker/Lit_With_Cuda/llvm.src/libclc/generic/include/math/clc_sqrt.h:3:
In file included from /localdisk2/sycl_ci/buildbot/worker/Lit_With_Cuda/llvm.src/libclc/generic/include/clc/math/gentype.inc:7:
/localdisk2/sycl_ci/buildbot/worker/Lit_With_Cuda/llvm.src/libclc/generic/include/clc/math/unary_decl.inc:1:1: error: unknown type name '_CLC_OVERLOAD'
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);
^
/localdisk2/sycl_ci/buildbot/worker/Lit_With_Cuda/llvm.src/libclc/generic/include/clc/math/unary_decl.inc:1:24: error: expected ';' after top level declarator
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);
                       ^

Signed-off-by: Victor Lomuller <[email protected]>
Co-authored-by: David Wood <[email protected]>
@Naghasan
Copy link
Contributor Author

Oh I see what happened now, not all the target where built on my side and there is a sqrt specialization for the ptx side. Thus hiding the issue on my side ...

This is fixed.

@bader bader merged commit d9bad0b into intel:sycl Jun 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cuda CUDA back-end libclc libclc project related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants