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] Adjust device and AOCX link order for FPGA #1389

Merged
merged 5 commits into from
Mar 28, 2020

Conversation

mdtoguchi
Copy link
Contributor

When compiling with -fintelfpga, a user can provide an -fsycl-link=image
created aocx based binary/archive. When linked in, this archive should get
precedence over any other device object that is extracted from object or
generated from source to ensure the proper binary is grabbed at runtime.

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

When compiling with -fintelfpga, a user can provide an -fsycl-link=image
created aocx based binary/archive.  When linked in, this archive should get
precedence over any other device object that is extracted from object or
generated from source to ensure the proper binary is grabbed at runtime.

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

@sndmitriev sndmitriev left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Copy link
Contributor

@AGindinson AGindinson left a comment

Choose a reason for hiding this comment

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

IMO, this is the case where a simple E2E test that's actually executed would be highly desirable. Hitting "request changes" to hold off the merge before the discussion is settled - it may be just that I'm missing obvious stuff, in which case I'll gladly re-approve.

clang/lib/Driver/Driver.cpp Outdated Show resolved Hide resolved
clang/test/Driver/sycl-offload-intelfpga.cpp Show resolved Hide resolved
Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
@mdtoguchi mdtoguchi requested a review from AGindinson March 28, 2020 00:37
Signed-off-by: Michael D Toguchi <michael.d.toguchi@intel.com>
Copy link
Contributor

@AGindinson AGindinson left a comment

Choose a reason for hiding this comment

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

LGTM

@bader bader merged commit ba404be into intel:sycl Mar 28, 2020
alexbatashev pushed a commit to alexbatashev/llvm that referenced this pull request Apr 15, 2020
…c_abi_checks

* origin/sycl: (6966 commits)
  [NFC][SYCL] Do not add `sycl_device` attribute to OpenCL kernel (intel#1439)
  [SYCL][NFC] Move SYCL pipe metadata call to be inside the null check for D (intel#1436)
  [SYCL][NFC] Move template function definition to .h file (intel#1433)
  [SYCL] Don't expose vector of booleans as storage format (intel#1419)
  [SYCL] Don't throw exceptions from destructors (intel#1378)
  [BuildBot] Add support for multiple CMake options (intel#1434)
  [SYCL][NFC] Fix warning inline namespace reopened as no-inline (intel#1435)
  [SYCL] Check if loadPlugin returns a nullptr (intel#1411)
  [SYCL] Release notes for February'20 SYCL implementation update (intel#1400)
  [SYCL][Doc] Improve contribution guidelines (intel#1422)
  [BuildBot] Add --cmake-opts option to configure.py script (intel#1430)
  [SYCL] Enable non-read-write memory object mapping in scheduler (intel#1390)
  [SYCL][Driver] Do not store AOT-specific options in the image descriptor (intel#1428)
  [Driver][NFC] Fix string problem used for tracking duplicate triples (intel#1424)
  [SYCL][NFC] Use the non-deprecated setAlignment() in LowerWGScope (intel#1420)
  [SYCL][NFC] Fix formatting in GetStartedGuide (intel#1417)
  [NFC] Move CODEOWNERS file to enable GitHub automation (intel#1418)
  [SYCL] Add test for private array init by zeroes (intel#1402)
  [Driver][SYCL][FPGA] Adjust device and AOCX link order for FPGA (intel#1389)
  [SYCL] Change runtime check to assert in program_manager.cpp (intel#1413)
  ...
jsji pushed a commit that referenced this pull request Nov 30, 2023
This change is basically an update of #1389 for spec changes.

Implementation of the feature was based on Intel extension which was not officially published to Khronos.
Now it has been split, updated, and published to Khronos by KhronosGroup/SPIRV-Registry#205

Summary of the things that have changed:

Capability names and a new capability was added
Values for decorations have been updated to enums
Decoration names and IDs have been changed
Specs:
https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/INTEL/SPV_INTEL_global_variable_fpga_decorations.asciidoc https://github.com/KhronosGroup/SPIRV-Registry/blob/main/extensions/INTEL/SPV_INTEL_global_variable_host_access.asciidoc

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

4 participants