Revert "feat(ocl): Generate minimal set of args info"

This reverts commit ea6c91eccc.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-12-29 06:18:48 +01:00
committed by Compute-Runtime-Automation
parent ea6c91eccc
commit 8d18a0cd12
8 changed files with 11 additions and 250 deletions

View File

@@ -887,11 +887,7 @@ NEO::DecodeError populateArgDescriptor(const NEO::Elf::ZebinKernelMetadata::Type
dst.payloadMappings.explicitArgs[src.argIndex].as<ArgDescPointer>(true);
break;
case NEO::Elf::ZebinKernelMetadata::Types::Kernel::PayloadArgument::AddressSpaceImage: {
auto &argAsImage = dst.payloadMappings.explicitArgs[src.argIndex].as<ArgDescImage>(true);
if (src.imageType != NEO::Elf::ZebinKernelMetadata::Types::Kernel::PayloadArgument::ImageTypeMax) {
argAsImage.imageType = static_cast<NEOImageType>(src.imageType);
}
dst.payloadMappings.explicitArgs[src.argIndex].as<ArgDescImage>(true);
auto &extendedInfo = dst.payloadMappings.explicitArgs[src.argIndex].getExtendedTypeInfo();
extendedInfo.isMediaImage = (src.imageType == NEO::Elf::ZebinKernelMetadata::Types::Kernel::PayloadArgument::ImageType::ImageType2DMedia);
extendedInfo.isMediaBlockImage = (src.imageType == NEO::Elf::ZebinKernelMetadata::Types::Kernel::PayloadArgument::ImageType::ImageType2DMediaBlock);

View File

@@ -45,26 +45,6 @@ struct ArgDescPointer final {
}
};
enum class NEOImageType : uint8_t {
ImageTypeUnknown,
ImageTypeBuffer,
ImageType1D,
ImageType1DArray,
ImageType2D,
ImageType2DArray,
ImageType3D,
ImageTypeCube,
ImageTypeCubeArray,
ImageType2DDepth,
ImageType2DArrayDepth,
ImageType2DMSAA,
ImageType2DMSAADepth,
ImageType2DArrayMSAA,
ImageType2DArrayMSAADepth,
ImageType2DMedia,
ImageType2DMediaBlock,
};
struct ArgDescImage final {
SurfaceStateHeapOffset bindful = undefined<SurfaceStateHeapOffset>; // stateful with BTI
CrossThreadDataOffset bindless = undefined<CrossThreadDataOffset>;
@@ -84,7 +64,6 @@ struct ArgDescImage final {
CrossThreadDataOffset flatHeight = undefined<CrossThreadDataOffset>;
CrossThreadDataOffset flatPitch = undefined<CrossThreadDataOffset>;
} metadataPayload;
NEOImageType imageType;
};
struct ArgDescSampler final {
@@ -203,7 +182,7 @@ struct ArgDescriptor final {
namespace {
constexpr auto ArgSize = sizeof(ArgDescriptor);
static_assert(ArgSize <= 72, "Keep it small");
static_assert(ArgSize <= 64, "Keep it small");
} // namespace
template <>