This revision was automatically updated to reflect the committed changes. Closed by commit rL258640: [CUDA] Use Triple::isNVPTX() instead of enumerating nvptx && nvptx64. (authored by jlebar).
Changed prior to commit: http://reviews.llvm.org/D16495?vs=45775&id=45808#toc Repository: rL LLVM http://reviews.llvm.org/D16495 Files: cfe/trunk/lib/Driver/Tools.cpp Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -10660,8 +10660,7 @@ const char *LinkingOutput) const { const auto &TC = static_cast<const toolchains::CudaToolChain &>(getToolChain()); - assert(TC.getArch() == llvm::Triple::nvptx || - TC.getArch() == llvm::Triple::nvptx64); + assert(TC.getTriple().isNVPTX() && "Wrong platform"); std::vector<std::string> gpu_archs = Args.getAllArgValues(options::OPT_march_EQ); @@ -10729,8 +10728,7 @@ const char *LinkingOutput) const { const auto &TC = static_cast<const toolchains::CudaToolChain &>(getToolChain()); - assert(TC.getArch() == llvm::Triple::nvptx || - TC.getArch() == llvm::Triple::nvptx64); + assert(TC.getTriple().isNVPTX() && "Wrong platform"); ArgStringList CmdArgs; CmdArgs.push_back("--cuda");
Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -10660,8 +10660,7 @@ const char *LinkingOutput) const { const auto &TC = static_cast<const toolchains::CudaToolChain &>(getToolChain()); - assert(TC.getArch() == llvm::Triple::nvptx || - TC.getArch() == llvm::Triple::nvptx64); + assert(TC.getTriple().isNVPTX() && "Wrong platform"); std::vector<std::string> gpu_archs = Args.getAllArgValues(options::OPT_march_EQ); @@ -10729,8 +10728,7 @@ const char *LinkingOutput) const { const auto &TC = static_cast<const toolchains::CudaToolChain &>(getToolChain()); - assert(TC.getArch() == llvm::Triple::nvptx || - TC.getArch() == llvm::Triple::nvptx64); + assert(TC.getTriple().isNVPTX() && "Wrong platform"); ArgStringList CmdArgs; CmdArgs.push_back("--cuda");
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits