Skip to content

Commit 3ed0f07

Browse files
smorek-intelCompute-Runtime-Automation
smorek-intel
authored and
Compute-Runtime-Automation
committed
Add method to set compression flag
Signed-off-by: Szymon Morek <[email protected]>
1 parent 8af9ca7 commit 3ed0f07

40 files changed

+109
-127
lines changed

‎level_zero/core/source/image/image_hw.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ze_result_t ImageCoreFamily<gfxCoreFamily>::initialize(Device *device, const ze_
127127

128128
surfaceState.setNumberOfMultisamples(RENDER_SURFACE_STATE::NUMBER_OF_MULTISAMPLES::NUMBER_OF_MULTISAMPLES_MULTISAMPLECOUNT_1);
129129

130-
if (gmm && gmm->isRenderCompressed) {
130+
if (gmm && gmm->isCompressionEnabled) {
131131
NEO::EncodeSurfaceState<GfxFamily>::setImageAuxParamsForCCS(&surfaceState, gmm);
132132
}
133133
}
@@ -168,7 +168,7 @@ ze_result_t ImageCoreFamily<gfxCoreFamily>::initialize(Device *device, const ze_
168168

169169
redescribedSurfaceState.setNumberOfMultisamples(RENDER_SURFACE_STATE::NUMBER_OF_MULTISAMPLES::NUMBER_OF_MULTISAMPLES_MULTISAMPLECOUNT_1);
170170

171-
if (gmm && gmm->isRenderCompressed) {
171+
if (gmm && gmm->isCompressionEnabled) {
172172
NEO::EncodeSurfaceState<GfxFamily>::setImageAuxParamsForCCS(&redescribedSurfaceState, gmm);
173173
}
174174
}

‎opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bool CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getParametersForWriteMem
5151
gpuAddress = GmmHelper::decanonize(graphicsAllocation.getGpuAddress());
5252
size = graphicsAllocation.getUnderlyingBufferSize();
5353
auto gmm = graphicsAllocation.getDefaultGmm();
54-
if (gmm && gmm->isRenderCompressed) {
54+
if (gmm && gmm->isCompressionEnabled) {
5555
size = gmm->gmmResourceInfo->getSizeAllocation();
5656
}
5757

‎opencl/source/command_stream/definitions/command_stream_receiver_simulated_hw.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCo
6262

6363
auto gmm = graphicsAllocation.getDefaultGmm();
6464

65-
allocationParams.additionalParams.compressionEnabled = gmm ? gmm->isRenderCompressed : false;
65+
allocationParams.additionalParams.compressionEnabled = gmm ? gmm->isCompressionEnabled : false;
6666

6767
this->aubManager->writeMemory2(allocationParams);
6868
}

‎opencl/source/mem_obj/buffer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ Buffer *Buffer::create(Context *context,
382382

383383
if (allocationInfo[rootDeviceIndex].copyMemoryFromHostPtr && !copyExecuted) {
384384
auto gmm = allocationInfo[rootDeviceIndex].memory->getDefaultGmm();
385-
bool gpuCopyRequired = (gmm && gmm->isRenderCompressed) || !MemoryPool::isSystemMemoryPool(allocationInfo[rootDeviceIndex].memory->getMemoryPool());
385+
bool gpuCopyRequired = (gmm && gmm->isCompressionEnabled) || !MemoryPool::isSystemMemoryPool(allocationInfo[rootDeviceIndex].memory->getMemoryPool());
386386

387387
if (gpuCopyRequired) {
388388
auto blitMemoryToAllocationResult = BlitHelperFunctions::blitMemoryToAllocation(pBuffer->getContext()->getDevice(0u)->getDevice(), allocationInfo[rootDeviceIndex].memory, pBuffer->getOffset(), hostPtr, {size, 1, 1});
@@ -741,7 +741,7 @@ uint64_t Buffer::getBufferAddress(uint32_t rootDeviceIndex) const {
741741
bool Buffer::isCompressed(uint32_t rootDeviceIndex) const {
742742
auto graphicsAllocation = multiGraphicsAllocation.getGraphicsAllocation(rootDeviceIndex);
743743
if (graphicsAllocation->getDefaultGmm()) {
744-
return graphicsAllocation->getDefaultGmm()->isRenderCompressed;
744+
return graphicsAllocation->getDefaultGmm()->isCompressionEnabled;
745745
}
746746
if (graphicsAllocation->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED) {
747747
return true;

‎opencl/source/mem_obj/image.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ Image *Image::create(Context *context,
415415

416416
if (context->isProvidingPerformanceHints() && HwHelper::renderCompressedImagesSupported(hwInfo)) {
417417
if (allocationInfo[rootDeviceIndex].memory->getDefaultGmm()) {
418-
if (allocationInfo[rootDeviceIndex].memory->getDefaultGmm()->isRenderCompressed) {
418+
if (allocationInfo[rootDeviceIndex].memory->getDefaultGmm()->isCompressionEnabled) {
419419
context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, IMAGE_IS_COMPRESSED, image);
420420
} else {
421421
context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, IMAGE_IS_NOT_COMPRESSED, image);

‎opencl/source/mem_obj/image.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void ImageHw<GfxFamily>::setImageArg(void *memory, bool setAsMediaBlockImage, ui
8888

8989
if (imageDesc.num_samples > 1) {
9090
setAuxParamsForMultisamples(surfaceState);
91-
} else if (gmm && gmm->isRenderCompressed) {
91+
} else if (gmm && gmm->isCompressionEnabled) {
9292
EncodeSurfaceState<GfxFamily>::setImageAuxParamsForCCS(surfaceState, gmm);
9393
} else {
9494
EncodeSurfaceState<GfxFamily>::disableCompressionFlags(surfaceState);

‎opencl/source/mem_obj/mem_obj.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ cl_int MemObj::getMemObjectInfo(cl_mem_info paramName,
191191
case CL_MEM_USES_COMPRESSION_INTEL:
192192
gmm = allocation->getDefaultGmm();
193193
if (gmm != nullptr) {
194-
usesCompression = gmm->isRenderCompressed;
194+
usesCompression = gmm->isCompressionEnabled;
195195
} else {
196196
usesCompression = allocation->getAllocationType() == GraphicsAllocation::AllocationType::BUFFER_COMPRESSED;
197197
}
@@ -398,7 +398,7 @@ bool MemObj::isTiledAllocation() const {
398398
bool MemObj::mappingOnCpuAllowed() const {
399399
auto graphicsAllocation = multiGraphicsAllocation.getDefaultGraphicsAllocation();
400400
return !isTiledAllocation() && !peekSharingHandler() && !isMipMapped(this) && !DebugManager.flags.DisableZeroCopyForBuffers.get() &&
401-
!(graphicsAllocation->getDefaultGmm() && graphicsAllocation->getDefaultGmm()->isRenderCompressed) &&
401+
!(graphicsAllocation->getDefaultGmm() && graphicsAllocation->getDefaultGmm()->isCompressionEnabled) &&
402402
MemoryPool::isSystemMemoryPool(graphicsAllocation->getMemoryPool());
403403
}
404404

‎opencl/source/sharings/d3d/d3d_texture.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ Image *D3DTexture<D3D>::create2d(Context *context, D3DTexture2d *d3dTexture, cl_
117117
}
118118

119119
if (alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
120-
alloc->getDefaultGmm()->isRenderCompressed = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
121-
: true;
120+
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
121+
: true;
122122
}
123123
auto multiGraphicsAllocation = MultiGraphicsAllocation(rootDeviceIndex);
124124
multiGraphicsAllocation.addAllocation(alloc);
@@ -203,8 +203,8 @@ Image *D3DTexture<D3D>::create3d(Context *context, D3DTexture3d *d3dTexture, cl_
203203
imgInfo.surfaceFormat = &clSurfaceFormat->surfaceFormat;
204204

205205
if (alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
206-
alloc->getDefaultGmm()->isRenderCompressed = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
207-
: true;
206+
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
207+
: true;
208208
}
209209
auto multiGraphicsAllocation = MultiGraphicsAllocation(rootDeviceIndex);
210210
multiGraphicsAllocation.addAllocation(alloc);

‎opencl/source/sharings/gl/windows/gl_texture_windows.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ Image *GlTexture::createSharedGlTexture(Context *context, cl_mem_flags flags, cl
149149
if (texInfo.isAuxEnabled && alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
150150
auto hwInfo = context->getDevice(0)->getHardwareInfo();
151151
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
152-
alloc->getDefaultGmm()->isRenderCompressed = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
153-
: true;
152+
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
153+
: true;
154154
}
155155
auto multiGraphicsAllocation = MultiGraphicsAllocation(context->getDevice(0)->getRootDeviceIndex());
156156
multiGraphicsAllocation.addAllocation(alloc);

‎opencl/source/sharings/unified/unified_image.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019-2020 Intel Corporation
2+
* Copyright (C) 2019-2021 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -43,7 +43,7 @@ Image *UnifiedImage::createSharedUnifiedImage(Context *context, cl_mem_flags fla
4343
if (graphicsAllocation->getDefaultGmm()->unifiedAuxTranslationCapable()) {
4444
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
4545
const auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
46-
graphicsAllocation->getDefaultGmm()->isRenderCompressed = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager.mapAuxGpuVA(graphicsAllocation) : true;
46+
graphicsAllocation->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager.mapAuxGpuVA(graphicsAllocation) : true;
4747
}
4848

4949
const uint32_t baseMipmapIndex = 0u;

0 commit comments

Comments
 (0)