Skip to content

[sycl-post-link][NFC] Refactored writing to the output table #3043

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 1 commit into from
Jan 20, 2021
Merged

[sycl-post-link][NFC] Refactored writing to the output table #3043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 31 additions & 14 deletions llvm/tools/sycl-post-link/sycl-post-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,10 @@ static string_vector saveResultSymbolsLists(string_vector &ResSymbolsLists) {
} \
}

static int processOneModule(std::unique_ptr<Module> M,
util::SimpleTable &Table) {
using TableFiles = std::map<StringRef, string_vector>;

static TableFiles processOneModule(std::unique_ptr<Module> M) {
TableFiles TblFiles;
std::map<StringRef, std::vector<Function *>> GlobalsSet;

bool DoSplit = SplitMode.getNumOccurrences() > 0;
Expand Down Expand Up @@ -657,7 +659,7 @@ static int processOneModule(std::unique_ptr<Module> M,
if (IROutputOnly) {
// the result is the transformed input LLVMIR file rather than a file table
saveModule(*M, OutputFilename);
return 0;
return TblFiles;
}
if (DoSplit) {
splitModule(*M, GlobalsSet, ResultModules);
Expand All @@ -673,16 +675,16 @@ static int processOneModule(std::unique_ptr<Module> M,
? saveResultModules(ResultModules)
: string_vector{InputFilename};
// "Code" column is always output
Error Err = Table.addColumn(COL_CODE, Files);
CHECK_AND_EXIT(Err);
std::copy(Files.begin(), Files.end(),
std::back_inserter(TblFiles[COL_CODE]));
}

{
ImagePropSaveInfo ImgPSInfo = {true, DoSpecConst, SetSpecConstAtRT,
SpecConstsMet, EmitKernelParamInfo};
string_vector Files = saveDeviceImageProperty(ResultModules, ImgPSInfo);
Error Err = Table.addColumn(COL_PROPS, Files);
CHECK_AND_EXIT(Err);
std::copy(Files.begin(), Files.end(),
std::back_inserter(TblFiles[COL_PROPS]));
}
if (DoSymGen) {
// extract symbols per each module
Expand All @@ -693,10 +695,10 @@ static int processOneModule(std::unique_ptr<Module> M,
ResultSymbolsLists.push_back("");
}
string_vector Files = saveResultSymbolsLists(ResultSymbolsLists);
Error Err = Table.addColumn(COL_SYM, Files);
CHECK_AND_EXIT(Err);
std::copy(Files.begin(), Files.end(),
std::back_inserter(TblFiles[COL_SYM]));
}
return 0;
return TblFiles;
}

int main(int argc, char **argv) {
Expand Down Expand Up @@ -789,14 +791,29 @@ int main(int argc, char **argv) {
if (OutputFilename.getNumOccurrences() == 0)
OutputFilename = (Twine(sys::path::stem(InputFilename)) + ".files").str();

util::SimpleTable Table;
int Res = processOneModule(std::move(M), Table);
if (Res)
return Res;
TableFiles TblFiles = processOneModule(std::move(M));

if (IROutputOnly)
return 0;

util::SimpleTable Table;
auto addTableColumn = [&Table, &TblFiles](std::string Str) {
auto &Files = TblFiles[Str];
if (Files.empty())
return 0;
Error Err = Table.addColumn(Str, Files);
CHECK_AND_EXIT(Err);
return 0;
};

int Res;
if ((Res = addTableColumn(COL_CODE)) != 0)
return Res;
if ((Res = addTableColumn(COL_PROPS)) != 0)
return Res;
if ((Res = addTableColumn(COL_SYM)) != 0)
return Res;

{
std::error_code EC;
raw_fd_ostream Out{OutputFilename, EC, sys::fs::OF_None};
Expand Down