aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some code improvement

Browse Source
This commit is contained in:
evghenii
2015-01-29 13:16:58 +01:00
parent 008fc6c51e
commit c1777bff3b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ptxtools/ptxgen.cpp
View File

@@ -159,25 +159,25 @@ static std::string generatePTX(
/* Create the compiliation unit. */ /* Create the compiliation unit. */
NVVMProg prog; NVVMProg prog;
std::vector<const char*> options;
/* Add libdevice. */ /* Add libdevice. */
try try
{ {
const std::string &libDeviceName = getLibDeviceName(computeArch); const std::string &libDeviceName = getLibDeviceName(computeArch);
addFileToProgram(libDeviceName, prog); addFileToProgram(libDeviceName, prog);
for (const auto &f : nvvmFiles)
addFileToProgram(f, prog);
for (const auto &o : nvvmOptions)
options.push_back(o.c_str());
} }
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
throw Exception(ex.what()); throw Exception(ex.what());
} }
std::vector<const char*> options;
for (const auto &f : nvvmFiles)
addFileToProgram(f, prog);
for (const auto &o : nvvmOptions)
options.push_back(o.c_str());
try try
{ {
if (nvvmVerifyProgram(prog.get(), options.size(), &options[0]) != NVVM_SUCCESS) if (nvvmVerifyProgram(prog.get(), options.size(), &options[0]) != NVVM_SUCCESS)
@@ -199,8 +199,9 @@ static std::string generatePTX(
} }
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
std::cerr << "NVVM exception: " << ex.what() << std::endl;
printWarningsAndErrors(prog); printWarningsAndErrors(prog);
throw Exception(ex.what()); throw Exception("");
} }
return ptxString; return ptxString;