Skip to content

[SYCL] Allow multiple build options for opencl-aot #2828

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 3 commits into from
Dec 1, 2020
Merged

[SYCL] Allow multiple build options for opencl-aot #2828

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b03b803
[SYCL] Allow multiple build options for opencl-aot
vmaksimo Nov 24, 2020
399316b
Apply suggestion from CR
vmaksimo Nov 30, 2020
211c162
Apply suggestion - do not handle trailing whitespace
vmaksimo Dec 1, 2020
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
17 changes: 11 additions & 6 deletions opencl-aot/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,9 @@ int main(int Argc, char *Argv[]) {
"o", cl::init("output.bin"),
cl::desc("Specify the output OpenCL program binary filename"),
cl::value_desc("filename"));
cl::opt<std::string> OptBuildOptions("bo",
cl::desc("Set OpenCL build options"),
cl::value_desc("build options"));
cl::list<std::string> OptBuildOptions("bo", cl::ZeroOrMore,
cl::desc("Set OpenCL build options"),
cl::value_desc("build options"));

cl::ParseCommandLineOptions(Argc, Argv,
"OpenCL ahead-of-time (AOT) compilation tool");
Expand Down Expand Up @@ -414,16 +414,21 @@ int main(int Argc, char *Argv[]) {
CLProgramUPtr ProgramUPtr(std::move(Progs[0]));

// step 7: set OpenCL build options
std::string BuildOptions = OptBuildOptions;
std::string BuildOptions;
if (!OptBuildOptions.empty()) {
for (const auto &BO : OptBuildOptions)
BuildOptions += BO + ' ';
}

auto ParentDir = sys::path::parent_path(OptInputBinary);
if (!ParentDir.empty()) {
BuildOptions += " -I \"" + std::string(ParentDir) + '\"';
}
std::cout << "Using build options: " << BuildOptions << '\n';

// step 8: build OpenCL program
CLErr = clBuildProgram(ProgramUPtr.get(), 1, &DeviceId,
OptBuildOptions.c_str(), nullptr, nullptr);
CLErr = clBuildProgram(ProgramUPtr.get(), 1, &DeviceId, BuildOptions.c_str(),
nullptr, nullptr);

std::string CompilerBuildLog;
std::tie(CompilerBuildLog, ErrorMessage, std::ignore) =
Expand Down