diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-13 22:26:30 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-13 22:26:30 +0000 |
commit | c5920d028947df0d271a93ff32af6390c4a18b5a (patch) | |
tree | 74d3371dc380a765d8781233942f7ecc6a827549 /include/clang/Driver | |
parent | 99d062ea385858e8769aa5d8e89b3f00f3723c9e (diff) |
This reverts commit r242058, r242065, r242067.
The tests were failing on OS X.
Revert "[cuda] Driver changes to compile and stitch together host and device-side CUDA code."
Revert "Fixed regex to properly match '64' in the test case."
Revert "clang/test/Driver/cuda-options.cu REQUIRES clang-driver, at least."
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242077 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Driver')
-rw-r--r-- | include/clang/Driver/Action.h | 37 | ||||
-rw-r--r-- | include/clang/Driver/Options.td | 6 | ||||
-rw-r--r-- | include/clang/Driver/Types.def | 1 | ||||
-rw-r--r-- | include/clang/Driver/Types.h | 3 |
4 files changed, 0 insertions, 47 deletions
diff --git a/include/clang/Driver/Action.h b/include/clang/Driver/Action.h index fddd15885e..847c994a58 100644 --- a/include/clang/Driver/Action.h +++ b/include/clang/Driver/Action.h @@ -41,8 +41,6 @@ public: enum ActionClass { InputClass = 0, BindArchClass, - CudaDeviceClass, - CudaHostClass, PreprocessJobClass, PrecompileJobClass, AnalyzeJobClass, @@ -135,41 +133,6 @@ public: } }; -class CudaDeviceAction : public Action { - virtual void anchor(); - /// GPU architecture to bind -- e.g 'sm_35'. - const char *GpuArchName; - /// True when action results are not consumed by the host action (e.g when - /// -fsyntax-only or --cuda-device-only options are used). - bool AtTopLevel; - -public: - CudaDeviceAction(std::unique_ptr<Action> Input, const char *ArchName, - bool AtTopLevel); - - const char *getGpuArchName() const { return GpuArchName; } - bool isAtTopLevel() const { return AtTopLevel; } - - static bool classof(const Action *A) { - return A->getKind() == CudaDeviceClass; - } -}; - -class CudaHostAction : public Action { - virtual void anchor(); - ActionList DeviceActions; - -public: - CudaHostAction(std::unique_ptr<Action> Input, - const ActionList &DeviceActions); - ~CudaHostAction() override; - - ActionList &getDeviceActions() { return DeviceActions; } - const ActionList &getDeviceActions() const { return DeviceActions; } - - static bool classof(const Action *A) { return A->getKind() == CudaHostClass; } -}; - class JobAction : public Action { virtual void anchor(); protected: diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 81a097e743..6cc92f61fb 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -351,12 +351,6 @@ def cxx_isystem : JoinedOrSeparate<["-"], "cxx-isystem">, Group<clang_i_Group>, MetaVarName<"<directory>">; def c : Flag<["-"], "c">, Flags<[DriverOption]>, HelpText<"Only run preprocess, compile, and assemble steps">; -def cuda_device_only : Flag<["--"], "cuda-device-only">, - HelpText<"Do device-side CUDA compilation only">; -def cuda_gpu_arch_EQ : Joined<["--"], "cuda-gpu-arch=">, - Flags<[DriverOption, HelpHidden]>, HelpText<"CUDA GPU architecture">; -def cuda_host_only : Flag<["--"], "cuda-host-only">, - HelpText<"Do host-side CUDA compilation only">; def dA : Flag<["-"], "dA">, Group<d_Group>; def dD : Flag<["-"], "dD">, Group<d_Group>, Flags<[CC1Option]>, HelpText<"Print macro definitions in -E mode in addition to normal output">; diff --git a/include/clang/Driver/Types.def b/include/clang/Driver/Types.def index d1b69151b0..4b696ae5e0 100644 --- a/include/clang/Driver/Types.def +++ b/include/clang/Driver/Types.def @@ -44,7 +44,6 @@ TYPE("c", C, PP_C, "c", "u") TYPE("cl", CL, PP_C, "cl", "u") TYPE("cuda-cpp-output", PP_CUDA, INVALID, "cui", "u") TYPE("cuda", CUDA, PP_CUDA, "cu", "u") -TYPE("cuda", CUDA_DEVICE, PP_CUDA, "cu", "") TYPE("objective-c-cpp-output", PP_ObjC, INVALID, "mi", "u") TYPE("objc-cpp-output", PP_ObjC_Alias, INVALID, "mi", "u") TYPE("objective-c", ObjC, PP_ObjC, "m", "u") diff --git a/include/clang/Driver/Types.h b/include/clang/Driver/Types.h index dd95d65991..34442eb637 100644 --- a/include/clang/Driver/Types.h +++ b/include/clang/Driver/Types.h @@ -63,9 +63,6 @@ namespace types { /// isCXX - Is this a "C++" input (C++ and Obj-C++ sources and headers). bool isCXX(ID Id); - /// isCuda - Is this a CUDA input. - bool isCuda(ID Id); - /// isObjC - Is this an "ObjC" input (Obj-C and Obj-C++ sources and headers). bool isObjC(ID Id); |