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

OCL: Set target device product family

Browse Source 
In OCL product family of target device is not set
which leads to a fail on validating target device in
ZEBin path.
This change adds function that sets all
necessary fields based on provided hardware info.

Signed-off-by: Krystian Chmielewski <krystian.chmielewski@intel.com>
This commit is contained in:
Krystian Chmielewski
2022-02-03 09:17:37 +00:00
committed by Compute-Runtime-Automation
parent b61d213f4f
commit d49c5d6185
6 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
level_zero/core/source/module/module_imp.cpp
View File

@@ -240,11 +240,7 @@ bool ModuleTranslationUnit::createFromNativeBinary(const char *input, size_t inp
UNRECOVERABLE_IF((nullptr == device) || (nullptr == device->getNEODevice()));
auto productAbbreviation = NEO::hardwarePrefix[device->getNEODevice()->getHardwareInfo().platform.eProductFamily];
NEO::TargetDevice targetDevice = {};
targetDevice.coreFamily = device->getNEODevice()->getHardwareInfo().platform.eRenderCoreFamily;
targetDevice.productFamily = device->getNEODevice()->getHardwareInfo().platform.eProductFamily;
targetDevice.stepping = device->getNEODevice()->getHardwareInfo().platform.usRevId;
targetDevice.maxPointerSizeInBytes = sizeof(uintptr_t);
NEO::TargetDevice targetDevice = NEO::targetDeviceFromHwInfo(device->getNEODevice()->getHardwareInfo());
std::string decodeErrors;
std::string decodeWarnings;
ArrayRef<const uint8_t> archive(reinterpret_cast<const uint8_t *>(input), inputSize);
@@ -294,7 +290,7 @@ bool ModuleTranslationUnit::processUnpackedBinary() {
auto blob = ArrayRef<const uint8_t>(reinterpret_cast<const uint8_t *>(this->unpackedDeviceBinary.get()), this->unpackedDeviceBinarySize);
NEO::SingleDeviceBinary binary = {};
binary.deviceBinary = blob;
binary.targetDevice.grfSize = device->getHwInfo().capabilityTable.grfSize;
binary.targetDevice = NEO::targetDeviceFromHwInfo(device->getHwInfo());
std::string decodeErrors;
std::string decodeWarnings;
@@ -354,17 +350,13 @@ bool ModuleTranslationUnit::processUnpackedBinary() {
kernelInfo->apply(deviceInfoConstants);
}
auto gfxCore = device->getNEODevice()->getHardwareInfo().platform.eRenderCoreFamily;
auto stepping = device->getNEODevice()->getHardwareInfo().platform.usRevId;
if (this->packedDeviceBinary != nullptr) {
return true;
}
NEO::SingleDeviceBinary singleDeviceBinary;
NEO::SingleDeviceBinary singleDeviceBinary = {};
singleDeviceBinary.targetDevice = NEO::targetDeviceFromHwInfo(device->getNEODevice()->getHardwareInfo());
singleDeviceBinary.buildOptions = this->options;
singleDeviceBinary.targetDevice.coreFamily = gfxCore;
singleDeviceBinary.targetDevice.stepping = stepping;
singleDeviceBinary.deviceBinary = ArrayRef<const uint8_t>(reinterpret_cast<const uint8_t *>(this->unpackedDeviceBinary.get()), this->unpackedDeviceBinarySize);
singleDeviceBinary.intermediateRepresentation = ArrayRef<const uint8_t>(reinterpret_cast<const uint8_t *>(this->irBinary.get()), this->irBinarySize);
singleDeviceBinary.debugData = ArrayRef<const uint8_t>(reinterpret_cast<const uint8_t *>(this->debugData.get()), this->debugDataSize);