Skip to content

[SYCL][NFC] Remove SYCL specific TargetInfo types #965

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 26, 2019
Merged

[SYCL][NFC] Remove SYCL specific TargetInfo types #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 8 additions & 26 deletions clang/lib/Basic/Targets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,19 +564,10 @@ TargetInfo *AllocateTarget(const llvm::Triple &Triple,
case llvm::Triple::spir: {
if (Triple.getEnvironment() == llvm::Triple::SYCLDevice) {
llvm::Triple HT(Opts.HostTriple);
switch (HT.getOS()) {
case llvm::Triple::Win32:
switch (HT.getEnvironment()) {
default: // Assume MSVC for unknown environments
case llvm::Triple::MSVC:
assert(HT.getArch() == llvm::Triple::x86 &&
"Unsupported host architecture");
return new MicrosoftX86_32SPIRTargetInfo(Triple, Opts);
}
case llvm::Triple::Linux:
return new LinuxTargetInfo<SPIR32SYCLDeviceTargetInfo>(Triple, Opts);
Copy link

@mibintc mibintc Dec 24, 2019

Choose a reason for hiding this comment

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

You don't need LinuxTargetInfo any more for SPIR device?

Copy link
Contributor Author

@bader bader Dec 24, 2019

Choose a reason for hiding this comment

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

No. There is no Linux on SPIR devices.

default:
return new SPIR32SYCLDeviceTargetInfo(Triple, Opts);
if (HT.getOS() == llvm::Triple::Win32) {
assert(HT.getArch() == llvm::Triple::x86 &&
"Unsupported host architecture");
return new MicrosoftX86_32SPIRTargetInfo(Triple, Opts);
}
}
return new SPIR32TargetInfo(Triple, Opts);
Expand All @@ -585,19 +576,10 @@ TargetInfo *AllocateTarget(const llvm::Triple &Triple,
case llvm::Triple::spir64: {
if (Triple.getEnvironment() == llvm::Triple::SYCLDevice) {
llvm::Triple HT(Opts.HostTriple);
switch (HT.getOS()) {
case llvm::Triple::Win32:
switch (HT.getEnvironment()) {
default: // Assume MSVC for unknown environments
case llvm::Triple::MSVC:
assert(HT.getArch() == llvm::Triple::x86_64 &&
"Unsupported host architecture");
return new MicrosoftX86_64_SPIR64TargetInfo(Triple, Opts);
}
case llvm::Triple::Linux:
return new LinuxTargetInfo<SPIR64SYCLDeviceTargetInfo>(Triple, Opts);
default:
return new SPIR64SYCLDeviceTargetInfo(Triple, Opts);
if (HT.getOS() == llvm::Triple::Win32) {
assert(HT.getArch() == llvm::Triple::x86_64 &&
"Unsupported host architecture");
return new MicrosoftX86_64_SPIR64TargetInfo(Triple, Opts);
}
}
return new SPIR64TargetInfo(Triple, Opts);
Expand Down
36 changes: 4 additions & 32 deletions clang/lib/Basic/Targets/SPIR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,40 +153,12 @@ class LLVM_LIBRARY_VISIBILITY SPIR64TargetInfo : public SPIRTargetInfo {
MacroBuilder &Builder) const override;
};

class LLVM_LIBRARY_VISIBILITY SPIR32SYCLDeviceTargetInfo
: public SPIR32TargetInfo {
public:
SPIR32SYCLDeviceTargetInfo(const llvm::Triple &Triple,
const TargetOptions &Opts)
: SPIR32TargetInfo(Triple, Opts) {
// This is workaround for exception_ptr class.
// Exceptions is not allowed in sycl device code but we should be able
// to parse host code. So we allow compilation of exception_ptr but
// if exceptions are used in device code we should emit a diagnostic.
MaxAtomicInlineWidth = 32;
}
};

class LLVM_LIBRARY_VISIBILITY SPIR64SYCLDeviceTargetInfo
: public SPIR64TargetInfo {
public:
SPIR64SYCLDeviceTargetInfo(const llvm::Triple &Triple,
const TargetOptions &Opts)
: SPIR64TargetInfo(Triple, Opts) {
// This is workaround for exception_ptr class.
// Exceptions is not allowed in sycl device code but we should be able
// to parse host code. So we allow compilation of exception_ptr but
// if exceptions are used in device code we should emit a diagnostic.
MaxAtomicInlineWidth = 64;
}
};

// x86-32 SPIR Windows target
class LLVM_LIBRARY_VISIBILITY WindowsX86_32SPIRTargetInfo
: public WindowsTargetInfo<SPIR32SYCLDeviceTargetInfo> {
: public WindowsTargetInfo<SPIR32TargetInfo> {
public:
WindowsX86_32SPIRTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
: WindowsTargetInfo<SPIR32SYCLDeviceTargetInfo>(Triple, Opts) {
: WindowsTargetInfo<SPIR32TargetInfo>(Triple, Opts) {
DoubleAlign = LongLongAlign = 64;
WCharType = UnsignedShort;
}
Expand Down Expand Up @@ -229,10 +201,10 @@ class LLVM_LIBRARY_VISIBILITY MicrosoftX86_32SPIRTargetInfo

// x86-64 SPIR64 Windows target
class LLVM_LIBRARY_VISIBILITY WindowsX86_64_SPIR64TargetInfo
: public WindowsTargetInfo<SPIR64SYCLDeviceTargetInfo> {
: public WindowsTargetInfo<SPIR64TargetInfo> {
public:
WindowsX86_64_SPIR64TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
: WindowsTargetInfo<SPIR64SYCLDeviceTargetInfo>(Triple, Opts) {
: WindowsTargetInfo<SPIR64TargetInfo>(Triple, Opts) {
LongWidth = LongAlign = 32;
DoubleAlign = LongLongAlign = 64;
IntMaxType = SignedLongLong;
Expand Down