Revert "Allow for zebin rebuild when IR is present"

This reverts commit 2ae3f3e521.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-04-06 22:46:39 +02:00
committed by Compute-Runtime-Automation
parent fe9fe80fc6
commit 64d3f95410
3 changed files with 9 additions and 48 deletions

View File

@@ -5,7 +5,6 @@
*
*/
#include "shared/source/compiler_interface/compiler_options/compiler_options.h"
#include "shared/source/compiler_interface/intermediate_representations.h"
#include "shared/source/device_binary_format/device_binary_formats.h"
#include "shared/source/device_binary_format/elf/elf_decoder.h"
@@ -47,13 +46,6 @@ SingleDeviceBinary unpackSingleDeviceBinary<NEO::DeviceBinaryFormat::Zebin>(cons
break;
}
ArrayRef<const uint8_t> intermediateRepresentation;
for (auto &elfSH : elf.sectionHeaders) {
if (elfSH.header->type == Elf::SHT_ZEBIN_SPIRV) {
intermediateRepresentation = elfSH.data;
}
}
bool validForTarget = true;
if (elf.elfFileHeader->machine == Elf::ELF_MACHINE::EM_INTELGT) {
validForTarget &= validateTargetDevice(elf, requestedTargetDevice);
@@ -66,22 +58,16 @@ SingleDeviceBinary unpackSingleDeviceBinary<NEO::DeviceBinaryFormat::Zebin>(cons
validForTarget &= (8U == requestedTargetDevice.maxPointerSizeInBytes);
}
if (false == validForTarget) {
outErrReason = "Unhandled target device";
return {};
}
SingleDeviceBinary ret;
ret.deviceBinary = archive;
ret.format = NEO::DeviceBinaryFormat::Zebin;
ret.targetDevice = requestedTargetDevice;
if (false == validForTarget) {
if (false == intermediateRepresentation.empty()) {
ret.intermediateRepresentation = intermediateRepresentation;
ret.buildOptions = NEO::CompilerOptions::allowZebin;
ret.deviceBinary = {};
} else {
outErrReason = "Unhandled target device";
return {};
}
}
return ret;
}