Skip to content

Conversation

@haonanya
Copy link

Signed-off-by: haonanya haonan.yang@intel.com

@haonanya
Copy link
Author

There are some changes from SPIRV llvm_release_100 branch on the last 3 days which cause cl_ext_float_atomics patch merge conflicts.

Signed-off-by: haonanya <haonan.yang@intel.com>
@haonanya haonanya requested review from cdai2, fzou1 and wenju-he August 30, 2021 10:11
@haonanya
Copy link
Author

Verified locally.

@haonanya
Copy link
Author

Hi, @cdai2 @fzou1, please review the patch. We need to have the patch on branch 100 since there are new changes on SPIRV recently.
The patch only resolves merge conflicts on lib/SPIRV/SPIRVToOCL.h.

@haonanya haonanya merged commit a32fbd4 into intel:ocl-open-100 Aug 31, 2021
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.

3 participants