[SYCL] Enable programs that include system headers on Windows #325
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The previous version of this patch is here, #284 |
v-klochkov
reviewed
Jul 16, 2019
v-klochkov
reviewed
Jul 16, 2019
v-klochkov
reviewed
Jul 16, 2019
v-klochkov
reviewed
Jul 16, 2019
v-klochkov
reviewed
Jul 16, 2019
bader
requested changes
Jul 17, 2019
|
Melanie, please re-base this patch, it conflicts with changes from #324 |
v-klochkov
reviewed
Jul 18, 2019
mibintc
force-pushed
the
wintypes1
branch
2 times, most recently
from
6f2216b to
f6b9572
Compare
v-klochkov
previously approved these changes
Jul 22, 2019
mibintc
commented
Jul 23, 2019
bader
reviewed
Jul 23, 2019
erichkeane
reviewed
Jul 25, 2019
clang/lib/Basic/Targets/SPIR.h
Outdated
| @@ -56,9 +56,12 @@ static const unsigned SYCLAddrSpaceMap[] = { | |||
| }; | |||
|
|
|||
| class LLVM_LIBRARY_VISIBILITY SPIRTargetInfo : public TargetInfo { | |||
| private: | |||
| bool IsWindowsSYCL; | |||
There was a problem hiding this comment.
Typically just inheriting from this type for a WindowsSPIRTargetInfo would be the way to do this.
clang/lib/Basic/Targets/SPIR.h
Outdated
| @@ -141,8 +152,15 @@ class LLVM_LIBRARY_VISIBILITY SPIR64TargetInfo : public SPIRTargetInfo { | |||
| SPIR64TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) | |||
| : SPIRTargetInfo(Triple, Opts) { | |||
| PointerWidth = PointerAlign = 64; | |||
| SizeType = TargetInfo::UnsignedLong; | |||
| PtrDiffType = IntPtrType = TargetInfo::SignedLong; | |||
| SizeType = TargetInfo::UnsignedLongLong; | |||
There was a problem hiding this comment.
Doesn't this break Linux stuff? This seems like it'll mess up a bunch of types.
There was a problem hiding this comment.
Yes this needs to be fixed, thanks @erichkeane
There was a problem hiding this comment.
I think size type must be defined by the host triple, not SPIR.
So I think, we shoudn't modify SPIR target at all.
| CmdArgs.push_back(Args.MakeArgString("-fms-compatibility-version=" + | ||
| MSVT.getAsString())); | ||
| else { | ||
| const char *LowestMSVCSupported = |
There was a problem hiding this comment.
Sorry, I mean, why is LowestMSVCSupported a separate variable instead of just being a constant in the line below?
There was a problem hiding this comment.
I thought it was nicer this way, self documenting and all
Add Windows-specific predefined type characteristics for wchar, builtin VaListKind, and allow the vectorcall attribute on function declarations. Add Windows support for SPIR target. Signed-off-by: Melanie Blower <[email protected]>
v-klochkov
approved these changes
Jul 30, 2019
bader
approved these changes
Jul 30, 2019
asudarsa
added a commit
that referenced
this pull request
May 3, 2024
…ows for SPIRV32 and SPIRV64 targets (#13548) This is text from OpenCL SPIR Spec 2.0 (https://registry.khronos.org/SPIR/specs/spir_spec-2.0.pdf) The OpenCL size_t, ptrdiff_t,uintptr_t, intptr_t, atomic_size_t, atomic_ptrdiff_t, atomic_uintptr_t and atomic_intptr_t data types are mapped to LLVM i32 when the device address width is equal to 32 bits and to LLVM i64 when the device address width is equal 64 bits. After some analysis though, I see that the windows os based customizations made for the SPIR target (#325) are necessary for successful compilation on windows. Also, they do not seem to be violating the spec. It's just that 'long' and 'long long' mean different things on windows and linux. On 64-bit linux, long type has 8 bytes, but on 64-bit windows, long type has 4 bytes. Hence, I have extended the SPIR target changes to the SPIR-V target as well. This PR extends those changes for SPIRV32 and SPIRV64 targets and added appropriate tests as well. We would eventually want to submit this (and PR #325) upstream. Thanks --------- Signed-off-by: Arvind Sudarsanam <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add Windows-specific predefined type characteristics for wchar, builtin
VaListKind, and a temporary workaround for the vectorcall attribute
which is seen in the Microsoft headers.
We'll allow vectorcall to appear on function declarations, since they
occur in the Microsoft headers, but we won't allow or will ignore
vectorcall on function invocations from SYCL target. (The handling for
vectorcall is a work in progress.) Add Windows support for SPIR target.
Signed-off-by: Melanie Blower [email protected]