intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ocloc): correct ocloc name in supported devices query

Browse Source 
previous approach was to version ocloc library but it was deprecated
right now there will be 2 known libraries:
- libocloc.so - for mainstream
- libocloc-legacy1.so for legacy platforms

Related-To: NEO-12273, NEO-9630
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-08-14 09:07:50 +00:00
committed by Compute-Runtime-Automation
parent b063c3c62b
commit 922edfd68d
10 changed files with 100 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
shared/offline_compiler/source/linux/ocloc_supported_devices_helper_linux.cpp
View File

@@ -19,25 +19,24 @@ std::string SupportedDevicesHelper::getOutputFilenameSuffix(SupportedDevicesMode
return "_supported_devices_" + toStr(mode) + fileExtension.data();
}
std::string SupportedDevicesHelper::getOclocCurrentVersionOutputFilename() const {
return getOclocCurrentVersion() + getOutputFilenameSuffix(mode);
std::string SupportedDevicesHelper::getCurrentOclocOutputFilename() const {
return getCurrentOclocName() + getOutputFilenameSuffix(mode);
}
std::string SupportedDevicesHelper::getOclocCurrentVersion() const {
return extractOclocVersion(getOclocCurrentLibName());
std::string SupportedDevicesHelper::getCurrentOclocName() const {
return extractOclocName(getOclocCurrentLibName());
}
std::string SupportedDevicesHelper::getOclocFormerVersion() const {
return extractOclocVersion(getOclocFormerLibName());
}
std::string SupportedDevicesHelper::extractOclocVersion(std::string_view oclocLibNameWithVersion) const {
// libocloc-2.0.so -> ocloc-2.0
std::string_view view(oclocLibNameWithVersion);
auto start = view.find("ocloc-");
std::string SupportedDevicesHelper::extractOclocName(std::string_view oclocLibName) const {
// libocloc.so -> ocloc
// libocloc-legacy1.so -> ocloc-legacy1
std::string_view view(oclocLibName);
constexpr char prefix[] = "lib";
auto start = view.find(prefix);
if (start == std::string_view::npos) {
return "ocloc";
}
start += strlen(prefix);
auto end = view.find(".so", start);
if (end == std::string_view::npos) {
@@ -47,7 +46,7 @@ std::string SupportedDevicesHelper::extractOclocVersion(std::string_view oclocLi
return std::string(view.substr(start, end - start));
}
std::string SupportedDevicesHelper::getDataFromFormerOclocVersion() const {
std::string SupportedDevicesHelper::getDataFromFormerOcloc() const {
std::string retData;
const char *argv[] = {"ocloc", "query", "SUPPORTED_DEVICES", "-concat"};