maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Augmented CudaHostAction to carry device-side triple. 

Differential Revision: http://reviews.llvm.org/D12893

llvm-svn: 248298
This commit is contained in:
Artem Belevich 2015-09-22 17:23:13 +00:00
parent 2325675143
commit ccf0d699f0
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Driver/Action.h
View File

@ -160,14 +160,16 @@ public:
class CudaHostAction : public Action {
virtual void anchor();
ActionList DeviceActions;
const char *DeviceTriple;
public:
CudaHostAction(std::unique_ptr<Action> Input,
const ActionList &DeviceActions);
CudaHostAction(std::unique_ptr<Action> Input, const ActionList &DeviceActions,
const char *DeviceTriple);
~CudaHostAction() override;
ActionList &getDeviceActions() { return DeviceActions; }
const ActionList &getDeviceActions() const { return DeviceActions; }
const char *getDeviceTriple() const { return DeviceTriple; }
static bool classof(const Action *A) { return A->getKind() == CudaHostClass; }
};

6
clang/lib/Driver/Action.cpp
View File

@ -66,8 +66,10 @@ CudaDeviceAction::CudaDeviceAction(std::unique_ptr<Action> Input,
void CudaHostAction::anchor() {}
CudaHostAction::CudaHostAction(std::unique_ptr<Action> Input,
const ActionList &DeviceActions)
: Action(CudaHostClass, std::move(Input)), DeviceActions(DeviceActions) {}
const ActionList &DeviceActions,
const char *DeviceTriple)
: Action(CudaHostClass, std::move(Input)), DeviceActions(DeviceActions),
DeviceTriple(DeviceTriple) {}
CudaHostAction::~CudaHostAction() {
for (auto &DA : DeviceActions)

15
clang/lib/Driver/Driver.cpp
View File

@ -1246,13 +1246,18 @@ static std::unique_ptr<Action>
buildCudaActions(const Driver &D, const ToolChain &TC, DerivedArgList &Args,
const Arg *InputArg, std::unique_ptr<Action> HostAction,
ActionList &Actions) {
// Figure out which NVPTX triple to use for device-side compilation based on
// whether host is 64-bit.
const char *DeviceTriple = TC.getTriple().isArch64Bit()
? "nvptx64-nvidia-cuda"
: "nvptx-nvidia-cuda";
Arg *PartialCompilationArg = Args.getLastArg(options::OPT_cuda_host_only,
options::OPT_cuda_device_only);
// Host-only compilation case.
if (PartialCompilationArg &&
PartialCompilationArg->getOption().matches(options::OPT_cuda_host_only))
return std::unique_ptr<Action>(
new CudaHostAction(std::move(HostAction), {}));
new CudaHostAction(std::move(HostAction), {}, DeviceTriple));
// Collect all cuda_gpu_arch parameters, removing duplicates.
SmallVector<const char *, 4> GpuArchList;
@ -1290,12 +1295,6 @@ buildCudaActions(const Driver &D, const ToolChain &TC, DerivedArgList &Args,
}
}
// Figure out which NVPTX triple to use for device-side compilation based on
// whether host is 64-bit.
const char *DeviceTriple = TC.getTriple().isArch64Bit()
? "nvptx64-nvidia-cuda"
: "nvptx-nvidia-cuda";
// Figure out what to do with device actions -- pass them as inputs to the
// host action or run each of them independently.
bool DeviceOnlyCompilation = PartialCompilationArg != nullptr;
@ -1331,7 +1330,7 @@ buildCudaActions(const Driver &D, const ToolChain &TC, DerivedArgList &Args,
// Return a new host action that incorporates original host action and all
// device actions.
return std::unique_ptr<Action>(
new CudaHostAction(std::move(HostAction), DeviceActions));
new CudaHostAction(std::move(HostAction), DeviceActions, DeviceTriple));
}
void Driver::BuildActions(const ToolChain &TC, DerivedArgList &Args,