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

[Driver][SYCL][FPGA] Improve expected triple and link behaviors for A… #1549

Merged
merged 7 commits into from
Apr 21, 2020

Conversation

mdtoguchi
Copy link
Contributor

…OCX files

When performing -fsycl-link=image behaviors on Windows, there was a mismatch
of triples being used when checking for existence of the AOCX binary. This
caused a problem when using clang-cl as the triples do not properly match.
We also do not want to do any additional unbundling of any AOCX archive, which
was causing a conflict of expected FPGA archives.

Signed-off-by: Michael D Toguchi michael.d.toguchi@intel.com

@mdtoguchi mdtoguchi requested review from AGindinson and a team as code owners April 18, 2020 03:04
@mdtoguchi mdtoguchi force-pushed the private/mdtoguchi/fpga-fsycl-link-lin-win branch from eca5edb to 363e007 Compare April 18, 2020 18:04
…OCX files

When performing -fsycl-link=image behaviors on Windows, there was a mismatch
of triples being used when checking for existence of the AOCX binary.  This
caused a problem when using clang-cl as the triples do not properly match.
We also do not want to do any additional unbundling of any AOCX archive, which
was causing a conflict of expected FPGA archives.

Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
@mdtoguchi mdtoguchi force-pushed the private/mdtoguchi/fpga-fsycl-link-lin-win branch from 363e007 to c23a03e Compare April 18, 2020 18:59
@meiyacha
Copy link

Hi Mike,
Just a question on

When performing -fsycl-link=image behaviors on Windows ...

What about -fsycl-link (without the =image part). Does this flow also get affected by the mismatched triple?

Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
…riple

When unbunding for aocx, we were not checking for -coff
Fix tests associated.

Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
@mdtoguchi
Copy link
Contributor Author

Hi Mike,
Just a question on

When performing -fsycl-link=image behaviors on Windows ...

What about -fsycl-link (without the =image part). Does this flow also get affected by the mismatched triple?

@meiyacha, yes, aocr is also impacted here.

@mdtoguchi mdtoguchi requested a review from AGindinson April 20, 2020 19:22
…t archive

Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
AGindinson
AGindinson previously approved these changes Apr 20, 2020
Copy link
Contributor

@sergey-semenov sergey-semenov left a comment

Choose a reason for hiding this comment

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

Other than the minor comments, LGTM.

sycl/test/fpga_tests/Inputs/fpga_host.cpp Outdated Show resolved Hide resolved
sycl/test/fpga_tests/Inputs/fpga_device.cpp Outdated Show resolved Hide resolved
Co-Authored-By: Sergey Semenov <43845535+sergey-semenov@users.noreply.github.com>
@AGindinson AGindinson dismissed stale reviews from themself via 813ebcb April 21, 2020 07:45
@bader bader merged commit f117aa4 into intel:sycl Apr 21, 2020
dwoodwor-intel pushed a commit to dwoodwor-intel/llvm that referenced this pull request Jul 22, 2022
This includes a rejigging of the BuiltinFuncMangleInfo to actually act as the
source of information to pass this information into.

Only some of the call sites of mangleBuiltin have been properly updated to pass
in the pointer type element information. The various mutateCallInst* callers
have yet to be updated, so those methods are temporarily relying on querying
getPointerElementType() to generate this information.

Original commit:
KhronosGroup/SPIRV-LLVM-Translator@0eb9a7d
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.

5 participants