intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 17:00:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "performance: align structures for 64-bit platforms"

Browse Source 
This reverts commit 9f07f56f7f.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-01-15 07:45:01 +01:00
committed by Compute-Runtime-Automation
parent ca72dff1ab
commit af031ee0e3
16 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/copy_engine_state.h
View File

@@ -13,8 +13,8 @@
namespace NEO {
struct CopyEngineState {
TaskCountType taskCount = 0;
aub_stream::EngineType engineType = aub_stream::EngineType::NUM_ENGINES;
TaskCountType taskCount = 0;
bool csrClientRegistered = false;
bool isValid() const {

12
opencl/source/command_queue/csr_selection_args.h
View File

@@ -24,21 +24,21 @@ struct CsrSelectionArgs {
const size_t *imageOrigin = nullptr;
};
cl_command_type cmdType;
const size_t *size = nullptr;
Resource srcResource;
Resource dstResource;
const size_t *size = nullptr;
cl_command_type cmdType;
TransferDirection direction;
CsrSelectionArgs(cl_command_type cmdType, const size_t *size)
: size(size),
cmdType(cmdType),
: cmdType(cmdType),
size(size),
direction(TransferDirection::hostToHost) {}
template <typename ResourceType>
CsrSelectionArgs(cl_command_type cmdType, ResourceType *src, ResourceType *dst, uint32_t rootDeviceIndex, const size_t *size)
: size(size),
cmdType(cmdType) {
: cmdType(cmdType),
size(size) {
if (src) {
processResource(*src, rootDeviceIndex, this->srcResource);
}

6
opencl/source/command_queue/enqueue_svm.h
View File

@@ -25,20 +25,20 @@ using SvmFreeClbT = void(CL_CALLBACK *)(cl_command_queue queue,
void *userData);
struct SvmFreeUserData {
cl_uint numSvmPointers;
void **svmPointers;
SvmFreeClbT clb;
void *userData;
cl_uint numSvmPointers;
bool ownsEventDeletion;
SvmFreeUserData(cl_uint numSvmPointers,
void **svmPointers, SvmFreeClbT clb,
void *userData,
bool ownsEventDeletion)
: svmPointers(svmPointers),
: numSvmPointers(numSvmPointers),
svmPointers(svmPointers),
clb(clb),
userData(userData),
numSvmPointers(numSvmPointers),
ownsEventDeletion(ownsEventDeletion){};
};

2
opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp
View File

@@ -1251,7 +1251,7 @@ HWTEST_TEMPLATED_F(BlitEnqueueTaskCountTests, whenWaitUntilCompletionCalledThenW
uint32_t gpgpuTaskCount = 123;
uint32_t bcsTaskCount = 123;
CopyEngineState bcsState{bcsTaskCount, bcsCsr->getOsContext().getEngineType()};
CopyEngineState bcsState{bcsCsr->getOsContext().getEngineType(), bcsTaskCount};
commandQueue->waitUntilComplete(gpgpuTaskCount, Range{&bcsState}, 0, false);
EXPECT_EQ(gpgpuTaskCount, static_cast<UltCommandStreamReceiver<FamilyType> *>(gpgpuCsr)->latestWaitForCompletionWithTimeoutTaskCount.load());

2
opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp
View File

@@ -55,7 +55,7 @@ HWTEST_F(CommandQueueHwTest, whenCallingIsCompletedThenTestTaskCountValue) {
bcsCsr->setupContext(*osContext);
bcsCsr->initializeTagAllocation();
EngineControl control(bcsCsr.get(), osContext.get());
CopyEngineState state{1, aub_stream::EngineType::ENGINE_BCS, false};
CopyEngineState state{aub_stream::EngineType::ENGINE_BCS, 1, false};
MockCommandQueueHw<FamilyType> cmdQ(context, pClDevice, nullptr);

2
opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp
View File

@@ -47,7 +47,7 @@ HWTEST_F(ClTbxCommandStreamTests, givenTbxCsrWhenDispatchBlitEnqueueThenProcessC
cmdQ.clearBcsEngines();
cmdQ.bcsEngines[0] = &engineControl1;
cmdQ.bcsStates[0] = {0, aub_stream::ENGINE_BCS, false};
cmdQ.bcsStates[0] = {aub_stream::ENGINE_BCS, 0, false};
cl_int error = CL_SUCCESS;
std::unique_ptr<Buffer> buffer(Buffer::create(&context, 0, 1, nullptr, error));

2
opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
View File

@@ -619,7 +619,7 @@ HWTEST_TEMPLATED_F(BcsBufferTests, givenAllBcsEnginesReadyWhenWaitingForEventThe
ultCsr2.initializeTagAllocation();
ultCsr2.setupContext(osContext);
CopyEngineState copyEngineState = {2, aub_stream::EngineType::ENGINE_BCS2, false};
CopyEngineState copyEngineState = {aub_stream::EngineType::ENGINE_BCS2, 2, false};
EngineControl engineControl = {&ultCsr2, &osContext};
auto bcs2Index = EngineHelpers::getBcsIndex(aub_stream::EngineType::ENGINE_BCS2);
mockCmdQ->bcsStates[bcs2Index] = copyEngineState;

2
opencl/test/unit_test/mem_obj/image_tests.cpp
View File

@@ -1559,7 +1559,7 @@ TEST(ImageConvertDescriptorTest, givenClImageDescWhenConvertedThenCorrectImageDe
}
TEST(ImageConvertDescriptorTest, givenImageDescriptorWhenConvertedThenCorrectClImageDescIsReturned) {
ImageDescriptor desc = {16, 24, 1, 1, 1024, 2048, ImageType::image2D, 1, 3, false};
ImageDescriptor desc = {ImageType::image2D, 16, 24, 1, 1, 1024, 2048, 1, 3, false};
auto clDesc = Image::convertDescriptor(desc);
EXPECT_EQ(clDesc.image_type, static_cast<cl_mem_object_type>(CL_MEM_OBJECT_IMAGE2D));

6
shared/source/command_stream/command_stream_receiver_hw.h
View File

@@ -25,10 +25,10 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
using STATE_BASE_ADDRESS = typename GfxFamily::STATE_BASE_ADDRESS;
struct ImmediateFlushData {
void *endPtr = nullptr;
size_t estimatedSize = 0;
size_t csrStartOffset = 0;
PipelineSelectArgs pipelineSelectArgs{};
size_t estimatedSize = 0;
void *endPtr = nullptr;
size_t csrStartOffset = 0;
bool pipelineSelectFullConfigurationNeeded = false;
bool pipelineSelectDirty = false;

6
shared/source/command_stream/command_stream_receiver_simulated_common_hw.h
View File

@@ -81,12 +81,12 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw<Gf
struct EngineInfo {
void *pLRCA;
void *pGlobalHWStatusPage;
void *pRingBuffer;
size_t sizeRingBuffer;
uint32_t ggttLRCA;
void *pGlobalHWStatusPage;
uint32_t ggttHWSP;
void *pRingBuffer;
uint32_t ggttRingBuffer;
size_t sizeRingBuffer;
uint32_t tailRingBuffer;
} engineInfo = {};

10
shared/source/command_stream/submissions_aggregator.cpp
View File

@@ -99,11 +99,11 @@ NEO::BatchBuffer::BatchBuffer(GraphicsAllocation *commandBufferAllocation, size_
size_t usedSize, LinearStream *stream, void *endCmdPtr, uint32_t numCsrClients, bool hasStallingCmds,
bool hasRelaxedOrderingDependencies, bool dispatchMonitorFence, bool taskCountUpdateOnly)
: commandBufferAllocation(commandBufferAllocation), startOffset(startOffset),
chainedBatchBufferStartOffset(chainedBatchBufferStartOffset), taskStartAddress(taskStartAddress), stream(stream), endCmdPtr(endCmdPtr),
numCsrClients(numCsrClients), hasStallingCmds(hasStallingCmds), hasRelaxedOrderingDependencies(hasRelaxedOrderingDependencies),
dispatchMonitorFence(dispatchMonitorFence), taskCountUpdateOnly(taskCountUpdateOnly), lowPriority(lowPriority), throttle(throttle),
chainedBatchBuffer(chainedBatchBuffer), sliceCount(sliceCount),
usedSize(usedSize) {}
chainedBatchBufferStartOffset(chainedBatchBufferStartOffset), taskStartAddress(taskStartAddress), chainedBatchBuffer(chainedBatchBuffer),
lowPriority(lowPriority),
throttle(throttle), sliceCount(sliceCount),
usedSize(usedSize), stream(stream), endCmdPtr(endCmdPtr), numCsrClients(numCsrClients), hasStallingCmds(hasStallingCmds),
hasRelaxedOrderingDependencies(hasRelaxedOrderingDependencies), dispatchMonitorFence(dispatchMonitorFence), taskCountUpdateOnly(taskCountUpdateOnly) {}
NEO::CommandBuffer::CommandBuffer(Device &device) : device(device) {
flushStamp.reset(new FlushStampTracker(false));

17
shared/source/command_stream/submissions_aggregator.h
View File

@@ -46,31 +46,30 @@ struct BatchBuffer {
bool dispatchMonitorFence,
bool taskCountUpdateOnly);
BatchBuffer() {}
PagingFenceSemaphoreInfo pagingFenceSemInfo{};
GraphicsAllocation *commandBufferAllocation = nullptr;
ResidencyContainer *allocationsForResidency = nullptr;
size_t startOffset = 0u;
size_t chainedBatchBufferStartOffset = 0u;
uint64_t taskStartAddress = 0; // if task not available, use CSR stream
GraphicsAllocation *chainedBatchBuffer = nullptr;
bool lowPriority = false;
QueueThrottle throttle = QueueThrottle::MEDIUM;
uint64_t sliceCount = QueueSliceCount::defaultSliceCount;
size_t usedSize = 0u;
// only used in drm csr in gem close worker active mode
LinearStream *stream = nullptr;
void *endCmdPtr = nullptr;
uint32_t numCsrClients = 0;
PagingFenceSemaphoreInfo pagingFenceSemInfo{};
bool hasStallingCmds = false;
bool hasRelaxedOrderingDependencies = false;
bool disableFlatRingBuffer = false;
bool dispatchMonitorFence = false;
bool taskCountUpdateOnly = false;
bool lowPriority = false;
QueueThrottle throttle = QueueThrottle::MEDIUM;
GraphicsAllocation *chainedBatchBuffer = nullptr;
uint64_t sliceCount = QueueSliceCount::defaultSliceCount;
size_t usedSize = 0u;
};
struct CommandBuffer : public IDNode<CommandBuffer> {

6
shared/source/device_binary_format/zebin/zeinfo.h
View File

@@ -634,12 +634,12 @@ inline constexpr BtiValueT btiValue = -1;
} // namespace Defaults
struct PayloadArgumentBaseT {
ArgTypeT argType = argTypeUnknown;
OffsetT offset = Defaults::offset;
SourceOffseT sourceOffset = Defaults::sourceOffset;
SizeT size = 0;
ArgIndexT argIndex = Defaults::argIndex;
BtiValueT btiValue = Defaults::btiValue;
ArgTypeT argType = argTypeUnknown;
AddrmodeT addrmode = memoryAddressingModeUnknown;
AddrspaceT addrspace = addressSpaceUnknown;
AccessTypeT accessType = accessTypeUnknown;
@@ -692,9 +692,9 @@ inline constexpr Slot slot = 0U;
} // namespace Defaults
struct PerThreadMemoryBufferBaseT {
SizeT size = 0U;
AllocationType allocationType = AllocationTypeUnknown;
MemoryUsageT memoryUsage = MemoryUsageUnknown;
SizeT size = 0U;
IsSimtThreadT isSimtThread = Defaults::isSimtThread;
Slot slot = Defaults::slot;
};
@@ -732,8 +732,8 @@ inline constexpr NormalizedT normalized = false;
struct InlineSamplerBaseT {
SamplerIndexT samplerIndex = Defaults::samplerIndex;
FilterModeT filterMode = Defaults::filterMode;
AddrModeT addrMode = Defaults::addrMode;
FilterModeT filterMode = Defaults::filterMode;
NormalizedT normalized = Defaults::normalized;
};
} // namespace InlineSamplers

2
shared/source/helpers/surface_format_info.h
View File

@@ -218,13 +218,13 @@ enum class ImageType {
};
struct ImageDescriptor {
ImageType imageType;
size_t imageWidth;
size_t imageHeight;
size_t imageDepth;
size_t imageArraySize;
size_t imageRowPitch;
size_t imageSlicePitch;
ImageType imageType;
uint32_t numMipLevels;
uint32_t numSamples;
bool fromParent;

2
shared/source/memory_manager/host_ptr_defines.h
View File

@@ -51,9 +51,9 @@ struct AllocationRequirements {
struct FragmentStorage {
const void *fragmentCpuPointer = nullptr;
size_t fragmentSize = 0;
int refCount = 0;
OsHandle *osInternalStorage = nullptr;
ResidencyData *residency = nullptr;
int refCount = 0;
bool driverAllocation = false;
};

2
shared/source/os_interface/linux/xe/ioctl_helper_xe.h
View File

@@ -190,9 +190,9 @@ class IoctlHelperXe : public IoctlHelper {
std::unique_ptr<XeDrm::drm_xe_engine_class_instance> defaultEngine;
struct DebugMetadata {
DrmResourceClass type;
uint64_t offset;
uint64_t size;
DrmResourceClass type;
bool isCookie;
};