intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Compile built-ins per release

Browse Source 
- Preserve releases on CMake level.
- Instead of generating builtins per platform, generate them per-release
(+ correct naming accordingly).
- Stop using revisions in builtin compilation logic path, as they are
already embedded in release (device ip).
- Remove platform names & revisions from names for generated files
(related to builtins).
- Remove unnecessary code, refactor ULT logic.

Related-To: NEO-7783
Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak
2023-07-07 12:09:44 +00:00
committed by Compute-Runtime-Automation
parent 1a398c7199
commit b908203001
26 changed files with 133 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
shared/generate_cpp_array/source/generate_cpp_array.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Intel Corporation
* Copyright (C) 2020-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -18,17 +18,29 @@ static void showUsage(std::string name) {
<< "Options :\n"
<< "\t -f, --file\t\tA file which content will be parsed into a uint32_t array in a .cpp file\n"
<< "\t -o, --output\t\t.Cpp output file name\n"
<< "\t -p, --platform\t\tOPTIONAL - Family name with type\n"
<< "\t -r, --revision_id\t\tOPTIONAL - Revision id\n"
<< "\t -d, --device\t\tOPTIONAL - device ip version in format <major>_<minor>_<revision>\n"
<< "\t -a, --array\t\tName of an uin32_t type array containing parsed input file" << std::endl;
}
std::string parseToCharArray(std::unique_ptr<uint8_t[]> &binary, size_t size, std::string &builtinName, std::string &platform, std::string revisionId, bool isSpirV) {
std::string parseToCharArray(std::unique_ptr<uint8_t[]> &binary, size_t size, std::string &builtinName, std::string &deviceIp, bool isSpirV) {
std::ostringstream out;
bool deviceIpPresent = !deviceIp.empty();
out << "#include <cstddef>\n";
out << "#include <cstdint>\n\n";
out << "size_t " << builtinName << "BinarySize_" << platform << "_" << revisionId << " = " << size << ";\n";
out << "uint32_t " << builtinName << "Binary_" << platform << "_" << revisionId << "[" << (size + 3) / 4 << "] = {"
out << "size_t " << builtinName;
if (deviceIpPresent) {
out << "BinarySize_" << deviceIp;
} else {
out << "BinarySize";
}
out << " = " << size << ";\n";
out << "uint32_t " << builtinName;
if (deviceIpPresent) {
out << "Binary_" << deviceIp;
} else {
out << "Binary";
}
out << "[" << (size + 3) / 4 << "] = {"
<< std::endl
<< " ";
uint32_t *binaryUint = reinterpret_cast<uint32_t *>(binary.get());
@@ -62,11 +74,23 @@ std::string parseToCharArray(std::unique_ptr<uint8_t[]> &binary, size_t size, st
isSpirV ? out << "Ir(" : out << "Bin(";
out << std::endl;
out << " \"";
platform != "" ? out << platform << "_" << revisionId << "_" << builtinName : out << builtinName;
deviceIp != "" ? out << deviceIp << "_" << builtinName : out << builtinName;
isSpirV ? out << ".builtin_kernel.bc\"," : out << ".builtin_kernel.bin\",";
out << std::endl;
out << " (const char *)" << builtinName << "Binary_" << platform << "_" << revisionId << "," << std::endl;
out << " " << builtinName << "BinarySize_" << platform << "_" << revisionId << ");" << std::endl;
out << " (const char *)" << builtinName;
if (deviceIpPresent) {
out << "Binary_" << deviceIp;
} else {
out << "Binary";
}
out << "," << std::endl;
out << " " << builtinName;
if (deviceIpPresent) {
out << "BinarySize_" << deviceIp;
} else {
out << "BinarySize";
}
out << ");" << std::endl;
out << "}" << std::endl;
return out.str();
@@ -80,8 +104,7 @@ int main(int argc, char *argv[]) {
std::string fileName;
std::string cppOutputName;
std::string arrayName;
std::string platform = "";
std::string revisionId = "0";
std::string deviceIp = "";
size_t size = 0;
std::fstream inputFile;
bool isSpirV;
@@ -93,10 +116,8 @@ int main(int argc, char *argv[]) {
cppOutputName = argv[++i];
} else if ((arg == "-a") || (arg == "--array")) {
arrayName = argv[++i];
} else if ((arg == "-p") || (arg == "--platform")) {
platform = argv[++i];
} else if ((arg == "-r") || (arg == "--revision_id")) {
revisionId = argv[++i];
} else if ((arg == "-d") || (arg == "--device")) {
deviceIp = argv[++i];
} else {
return 1;
}
@@ -115,7 +136,7 @@ int main(int argc, char *argv[]) {
inputFile.read(reinterpret_cast<char *>(memblock.get()), size);
inputFile.close();
isSpirV = fileName.find(".spv") != std::string::npos;
std::string cpp = parseToCharArray(memblock, size, arrayName, platform, revisionId, isSpirV);
std::string cpp = parseToCharArray(memblock, size, arrayName, deviceIp, isSpirV);
std::fstream(cppOutputName.c_str(), std::ios::out | std::ios::binary).write(cpp.c_str(), cpp.size());
} else {
std::cerr << "File cannot be opened!" << std::endl;