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][Driver] Enforce unique filenames when -save-temps is used #1545

Merged
merged 2 commits into from
Apr 21, 2020

Conversation

AGindinson
Copy link
Contributor

With the introduction of file table transformations, multiple
intermediate files with the same extension are now occuring
within any SYCL compilation (namely .txt and .table files).
Unless we treat this during the static creation of comands,
filename collision is bound to occur when saving temps.
This breaks -save-temps compilations due to files being
overwritten.

This commit ensures that unique files are created upon a
potential collision in the presence of -save-temps.

Signed-off-by: Artem Gindinson artem.gindinson@intel.com

With the introduction of file table transformations, multiple
intermediate files with the same extension are now occurring
within any SYCL compilation (namely .txt and .table files).
Unless we treat this during the static creation of comands,
filename collision is bound to occur when saving temps.
This breaks -save-temps compilations due to files being
overwritten.

This commit ensures that unique files are created upon a
potential collision in the presence of -save-temps.

Signed-off-by: Artem Gindinson <artem.gindinson@intel.com>
@AGindinson AGindinson requested review from mdtoguchi and a team as code owners April 17, 2020 15:57
@AGindinson AGindinson requested a review from s-kanaev April 17, 2020 15:57
@AGindinson
Copy link
Contributor Author

Looks like a separate Windows-specific issue will have to be addressed before this patch can go in...

@AGindinson
Copy link
Contributor Author

Looks like a separate Windows-specific issue will have to be addressed before this patch can go in...

@mdtoguchi, would a Windows XFAIL and a follow-up be acceptable? Apparently, the Windows issue is showing up in the integration header fixup.

@mdtoguchi
Copy link
Contributor

Looks like a separate Windows-specific issue will have to be addressed before this patch can go in...

@mdtoguchi, would a Windows XFAIL and a follow-up be acceptable? Apparently, the Windows issue is showing up in the integration header fixup.

Yes, that would be acceptable given the failure. The test is running clangxx (gnu mode) so Windows behavior isn't particularly interesting - but it should be addressed moving forward (and all of our other Windows XFAIL problems as well)

- Do not execute the E2E test
- Add checks for conflicts
- XFAIL the E2E test on Windows

Signed-off-by: Artem Gindinson <artem.gindinson@intel.com>
@AGindinson AGindinson force-pushed the private/agindins/fsycl-save-temps branch 2 times, most recently from c2ddb88 to 67e9559 Compare April 20, 2020 19:23
@AGindinson AGindinson requested a review from alexbatashev April 21, 2020 06:10
@bader bader merged commit 99fa86f into intel:sycl Apr 21, 2020
@AGindinson AGindinson deleted the private/agindins/fsycl-save-temps branch April 21, 2020 10:04
alexbatashev pushed a commit to alexbatashev/llvm that referenced this pull request Apr 21, 2020
…c_abi_checks

* origin/sycl:
  [SYCL][Driver] Enforce unique filenames when -save-temps is used (intel#1545)
  [SYCL] [xmethods] Allow replacing xmethod script (intel#1532)
  [SYCL] Add tests for inline asm feature (intel#1444)
  [SYCL][Doc] Add device_specific_kernel_queries extension. (intel#1540)
  [SYCL][USM] Remove unused header and unnecessary includes (intel#1537)
  Fix check-llvm dependencies (intel#1547)
  [SYCL] Add __SYCL_EXPORT to declaration of contextSetExtendedDeleter (intel#1531)
  [SYCL][Doc] Add static local memory query extension. (intel#1539)
  [SYCL][Doc] Add sycl_bitcast extension (intel#1541)
  [SYCL][NFC] Temporarily disable sporadically failing test (intel#1533)
  [SYCL][NFC] Adjust codeowners for sycl directory (intel#1529)
  [SYCL] Fix processing of spec consts referenced twice (intel#1524)
  [SYCL] Use correct macro name in export.hpp (intel#1527)
  [Driver][NFC] Fix -help information for -Xs options (intel#1530)
  [SYCL][Doc] Add Graph Scheduler design documentation (intel#1457)
  [SYCL] Add diagnostics for long double in device code (intel#1512)
  [SYCL] Add a mutex to state-modifying program functions (intel#1204)
  [SYCL][Test] Add Devicelib tests (intel#1256)
  [SYCL] Refactor semantic checks for variable types (intel#1513)
dwoodwor-intel pushed a commit to dwoodwor-intel/llvm that referenced this pull request Jul 15, 2022
This option is useful for testing opaque pointers support and controlled
transition of lit tests.

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