intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-11 16:45:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename member variables to camelCase 2/n

Browse Source 
Signed-off-by: Fabian Zwolinski <fabian.zwolinski@intel.com>
This commit is contained in:
Fabian Zwolinski
2023-04-27 09:50:55 +00:00
committed by Compute-Runtime-Automation
parent c84c7a0c91
commit e351a90f81
168 changed files with 1421 additions and 1423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
shared/source/aub_mem_dump/aub_alloc_dump.inl
View File

@@ -84,17 +84,17 @@ template <typename GfxFamily>
void dumpBufferInBinFormat(GraphicsAllocation &gfxAllocation, AubMemDump::AubFileStream *stream, uint32_t context) {
AubMemDump::AubCaptureBinaryDumpHD cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.Header.Type = 0x7;
cmd.Header.Opcode = 0x1;
cmd.Header.SubOp = 0x15;
cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1;
cmd.header.type = 0x7;
cmd.header.opcode = 0x1;
cmd.header.subOp = 0x15;
cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1;
cmd.setHeight(1);
cmd.setWidth(gfxAllocation.getUnderlyingBufferSize());
cmd.setBaseAddr(gfxAllocation.getGpuAddress());
cmd.setPitch(gfxAllocation.getUnderlyingBufferSize());
cmd.GttType = 1;
cmd.DirectoryHandle = context;
cmd.gttType = 1;
cmd.directoryHandle = context;
stream->write(reinterpret_cast<char *>(&cmd), sizeof(cmd));
}
@@ -105,31 +105,31 @@ void dumpImageInBmpFormat(GraphicsAllocation &gfxAllocation, AubMemDump::AubFile
AubMemDump::AubCmdDumpBmpHd cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.Header.Type = 0x7;
cmd.Header.Opcode = 0x1;
cmd.Header.SubOp = 0x44;
cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1;
cmd.header.type = 0x7;
cmd.header.opcode = 0x1;
cmd.header.subOp = 0x44;
cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1;
cmd.Xmin = 0;
cmd.Ymin = 0;
cmd.xMin = 0;
cmd.yMin = 0;
auto pitch = gmm->gmmResourceInfo->getRenderPitch();
auto bitsPerPixel = gmm->gmmResourceInfo->getBitsPerPixel();
auto pitchInPixels = static_cast<uint32_t>(8 * pitch / bitsPerPixel);
cmd.BufferPitch = pitchInPixels;
cmd.BitsPerPixel = bitsPerPixel;
cmd.Format = gmm->gmmResourceInfo->getResourceFormatSurfaceState();
cmd.Xsize = static_cast<uint32_t>(gmm->gmmResourceInfo->getBaseWidth());
cmd.Ysize = static_cast<uint32_t>(gmm->gmmResourceInfo->getBaseHeight());
cmd.bufferPitch = pitchInPixels;
cmd.bitsPerPixel = bitsPerPixel;
cmd.format = gmm->gmmResourceInfo->getResourceFormatSurfaceState();
cmd.xSize = static_cast<uint32_t>(gmm->gmmResourceInfo->getBaseWidth());
cmd.ySize = static_cast<uint32_t>(gmm->gmmResourceInfo->getBaseHeight());
cmd.setBaseAddr(gfxAllocation.getGpuAddress());
cmd.Secure = 0;
cmd.UseFence = 0;
cmd.secure = 0;
cmd.useFence = 0;
auto flagInfo = gmm->gmmResourceInfo->getResourceFlags()->Info;
cmd.TileOn = flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs;
cmd.WalkY = flagInfo.TiledY;
cmd.UsePPGTT = 1;
cmd.Use32BitDump = 1; // Dump out in 32bpp vs 24bpp
cmd.UseFullFormat = 1;
cmd.DirectoryHandle = context;
cmd.tileOn = flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs;
cmd.walkY = flagInfo.TiledY;
cmd.usePPGTT = 1;
cmd.use32BitDump = 1; // Dump out in 32bpp vs 24bpp
cmd.useFullFormat = 1;
cmd.directoryHandle = context;
stream->write(reinterpret_cast<char *>(&cmd), sizeof(cmd));
}

104
shared/source/aub_mem_dump/aub_header.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 Intel Corporation
* Copyright (C) 2018-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -27,88 +27,88 @@ inline uint64_t getMisalignedUint64(const uint64_t *address) {
}
struct AubCmdHdr {
uint32_t DwordLength : 16,
SubOp : 7,
Opcode : 6,
Type : 3;
uint32_t dwordLength : 16,
subOp : 7,
opcode : 6,
type : 3;
};
static_assert(4 == sizeof(AubCmdHdr), "Invalid size for AubCmdHdr");
struct AubCmdDumpBmpHd {
AubCmdHdr Header;
uint32_t Xmin;
uint32_t Ymin;
uint32_t BufferPitch;
uint32_t BitsPerPixel : 8,
Format : 8,
Reserved_0 : 16;
uint32_t Xsize;
uint32_t Ysize;
uint64_t BaseAddr;
uint32_t Secure : 1,
UseFence : 1,
TileOn : 1,
WalkY : 1,
UsePPGTT : 1,
Use32BitDump : 1,
UseFullFormat : 1,
Reserved_1 : 25;
uint32_t DirectoryHandle;
AubCmdHdr header;
uint32_t xMin;
uint32_t yMin;
uint32_t bufferPitch;
uint32_t bitsPerPixel : 8,
format : 8,
reserved0 : 16;
uint32_t xSize;
uint32_t ySize;
uint64_t baseAddr;
uint32_t secure : 1,
useFence : 1,
tileOn : 1,
walkY : 1,
usePPGTT : 1,
use32BitDump : 1,
useFullFormat : 1,
reserved1 : 25;
uint32_t directoryHandle;
uint64_t getBaseAddr() const {
return getMisalignedUint64(&this->BaseAddr);
return getMisalignedUint64(&this->baseAddr);
}
void setBaseAddr(const uint64_t baseAddr) {
setMisalignedUint64(&this->BaseAddr, baseAddr);
setMisalignedUint64(&this->baseAddr, baseAddr);
}
};
static_assert(44 == sizeof(AubCmdDumpBmpHd), "Invalid size for AubCmdDumpBmpHd");
struct AubPpgttContextCreate {
AubCmdHdr Header;
uint32_t Handle;
uint32_t AdvancedContext : 1,
SixtyFourBit : 1,
Reserved_31_2 : 30;
uint64_t PageDirPointer[4];
AubCmdHdr header;
uint32_t handle;
uint32_t advancedContext : 1,
sixtyFourBit : 1,
reserved31To2 : 30;
uint64_t pageDirPointer[4];
};
static_assert(44 == sizeof(AubPpgttContextCreate), "Invalid size for AubPpgttContextCreate");
struct AubCaptureBinaryDumpHD {
AubCmdHdr Header;
uint64_t BaseAddr;
uint64_t Width;
uint64_t Height;
uint64_t Pitch;
uint32_t SurfaceType : 4,
GttType : 2,
Reserved_31_6 : 26;
uint32_t DirectoryHandle;
uint32_t ReservedDW1;
uint32_t ReservedDW2;
char OutputFile[4];
AubCmdHdr header;
uint64_t baseAddr;
uint64_t width;
uint64_t height;
uint64_t pitch;
uint32_t surfaceType : 4,
gttType : 2,
reserved31To6 : 26;
uint32_t directoryHandle;
uint32_t reservedDW1;
uint32_t reservedDW2;
char outputFile[4];
uint64_t getBaseAddr() const {
return getMisalignedUint64(&this->BaseAddr);
return getMisalignedUint64(&this->baseAddr);
}
void setBaseAddr(const uint64_t baseAddr) {
setMisalignedUint64(&this->BaseAddr, baseAddr);
setMisalignedUint64(&this->baseAddr, baseAddr);
}
uint64_t getWidth() const {
return getMisalignedUint64(&this->Width);
return getMisalignedUint64(&this->width);
}
void setWidth(const uint64_t width) {
setMisalignedUint64(&this->Width, width);
setMisalignedUint64(&this->width, width);
}
uint64_t getHeight() const {
return getMisalignedUint64(&this->Height);
return getMisalignedUint64(&this->height);
}
void setHeight(const uint64_t height) {
setMisalignedUint64(&this->Height, height);
setMisalignedUint64(&this->height, height);
}
uint64_t getPitch() const {
return getMisalignedUint64(&this->Pitch);
return getMisalignedUint64(&this->pitch);
}
void setPitch(const uint64_t pitch) {
setMisalignedUint64(&this->Pitch, pitch);
setMisalignedUint64(&this->pitch, pitch);
}
};
static_assert(56 == sizeof(AubCaptureBinaryDumpHD), "Invalid size for AubCaptureBinaryDumpHD");

64
shared/source/aub_mem_dump/aub_mem_dump.h
View File

@@ -43,22 +43,22 @@ inline void setAddress(CmdServicesMemTraceMemoryCompare &cmd, uint64_t address)
union IAPageTableEntry {
struct
{
uint64_t Present : 1; //[0]
uint64_t Writable : 1; //[1]
uint64_t UserSupervisor : 1; //[2]
uint64_t PWT : 1; //[3]
uint64_t PCD : 1; //[4]
uint64_t Accessed : 1; //[5]
uint64_t Dirty : 1; //[6]
uint64_t PAT : 1; //[7]
uint64_t Global : 1; //[8]
uint64_t Reserved_9 : 1; //[9]
uint64_t Reserved_10 : 1; //[10]
uint64_t Reserved_11 : 1; //[11]
uint64_t PhysicalAddress : 27; //[38:12]
uint64_t Reserved_51_39 : 13; //[51:39]
uint64_t Ignored : 11; //[62:52]
uint64_t ExecuteDisable : 1; //[63]
uint64_t present : 1; //[0]
uint64_t writable : 1; //[1]
uint64_t userSupervisor : 1; //[2]
uint64_t pwt : 1; //[3]
uint64_t pcd : 1; //[4]
uint64_t accessed : 1; //[5]
uint64_t dirty : 1; //[6]
uint64_t pat : 1; //[7]
uint64_t global : 1; //[8]
uint64_t reserved_9 : 1; //[9]
uint64_t reserved_10 : 1; //[10]
uint64_t reserved_11 : 1; //[11]
uint64_t physicalAddress : 27; //[38:12]
uint64_t reserved_51_39 : 13; //[51:39]
uint64_t ignored : 11; //[62:52]
uint64_t executeDisable : 1; //[63]
} pageConfig;
uint32_t dwordData[2];
uint64_t uiData;
@@ -67,11 +67,11 @@ union IAPageTableEntry {
union MiGttEntry {
struct
{
uint64_t Present : 1; //[0]
uint64_t LocalMemory : 1; //[1]
uint64_t FunctionNumber : 10; //[11:2]
uint64_t PhysicalAddress : 35; //[46:12]
uint64_t Ignored : 17; //[63:47]
uint64_t present : 1; //[0]
uint64_t localMemory : 1; //[1]
uint64_t functionNumber : 10; //[11:2]
uint64_t physicalAddress : 35; //[46:12]
uint64_t ignored : 17; //[63:47]
} pageConfig;
uint32_t dwordData[2];
uint64_t uiData;
@@ -272,17 +272,17 @@ struct AubDump : public std::conditional<TraitsIn::addressingBits == 32, AubPage
typedef union _MiContextDescriptorReg_ {
struct {
uint64_t Valid : 1; //[0]
uint64_t ForcePageDirRestore : 1; //[1]
uint64_t ForceRestore : 1; //[2]
uint64_t Legacy : 1; //[3]
uint64_t ADor64bitSupport : 1; //[4] Selects 64-bit PPGTT in Legacy mode
uint64_t LlcCoherencySupport : 1; //[5]
uint64_t FaultSupport : 2; //[7:6]
uint64_t PrivilegeAccessOrPPGTT : 1; //[8] Selects PPGTT in Legacy mode
uint64_t FunctionType : 3; //[11:9]
uint64_t LogicalRingCtxAddress : 20; //[31:12]
uint64_t ContextID : 32; //[63:32]
uint64_t valid : 1; //[0]
uint64_t forcePageDirRestore : 1; //[1]
uint64_t forceRestore : 1; //[2]
uint64_t legacy : 1; //[3]
uint64_t aDor64bitSupport : 1; //[4] Selects 64-bit PPGTT in Legacy mode
uint64_t llcCoherencySupport : 1; //[5]
uint64_t faultSupport : 2; //[7:6]
uint64_t privilegeAccessOrPPGTT : 1; //[8] Selects PPGTT in Legacy mode
uint64_t functionType : 3; //[11:9]
uint64_t logicalRingCtxAddress : 20; //[31:12]
uint64_t contextID : 32; //[63:32]
} sData;
uint32_t ulData[2];
uint64_t qwordData[2 / 2];

46
shared/source/aub_mem_dump/aub_mem_dump.inl
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 Intel Corporation
* Copyright (C) 2018-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -135,9 +135,9 @@ void AubDump<Traits>::reserveAddressGGTTAndWriteMmeory(typename Traits::Stream &
template <typename Traits>
void AubDump<Traits>::setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTData data) {
entry.uiData = 0;
entry.pageConfig.PhysicalAddress = address / 4096;
entry.pageConfig.Present = data.present;
entry.pageConfig.LocalMemory = data.localMemory;
entry.pageConfig.physicalAddress = address / 4096;
entry.pageConfig.present = data.present;
entry.pageConfig.localMemory = data.localMemory;
}
template <typename Traits>
@@ -326,18 +326,18 @@ template <typename Traits>
void AubPageTableHelper32<Traits>::createContext(typename Traits::Stream &stream, uint32_t context) {
AubPpgttContextCreate cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.Header.Type = 0x7;
cmd.Header.Opcode = 0x1;
cmd.Header.SubOp = 0x14;
cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1;
cmd.Handle = context;
cmd.AdvancedContext = false;
cmd.header.type = 0x7;
cmd.header.opcode = 0x1;
cmd.header.subOp = 0x14;
cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1;
cmd.handle = context;
cmd.advancedContext = false;
cmd.SixtyFourBit = 0;
cmd.PageDirPointer[0] = BaseClass::getPDEAddress(0x000);
cmd.PageDirPointer[1] = BaseClass::getPDEAddress(0x200);
cmd.PageDirPointer[2] = BaseClass::getPDEAddress(0x400);
cmd.PageDirPointer[3] = BaseClass::getPDEAddress(0x600);
cmd.sixtyFourBit = 0;
cmd.pageDirPointer[0] = BaseClass::getPDEAddress(0x000);
cmd.pageDirPointer[1] = BaseClass::getPDEAddress(0x200);
cmd.pageDirPointer[2] = BaseClass::getPDEAddress(0x400);
cmd.pageDirPointer[3] = BaseClass::getPDEAddress(0x600);
stream.createContext(cmd);
}
@@ -346,15 +346,15 @@ template <typename Traits>
void AubPageTableHelper64<Traits>::createContext(typename Traits::Stream &stream, uint32_t context) {
AubPpgttContextCreate cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.Header.Type = 0x7;
cmd.Header.Opcode = 0x1;
cmd.Header.SubOp = 0x14;
cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1;
cmd.Handle = context;
cmd.AdvancedContext = false;
cmd.header.type = 0x7;
cmd.header.opcode = 0x1;
cmd.header.subOp = 0x14;
cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1;
cmd.handle = context;
cmd.advancedContext = false;
cmd.SixtyFourBit = 1;
cmd.PageDirPointer[0] = getPML4Address(0);
cmd.sixtyFourBit = 1;
cmd.pageDirPointer[0] = getPML4Address(0);
stream.createContext(cmd);
}

36
shared/source/aub_mem_dump/definitions/aub_services.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 Intel Corporation
* Copyright (C) 2018-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -19,7 +19,7 @@
struct CmdServicesMemTraceVersion {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -160,7 +160,7 @@ struct CmdServicesMemTraceVersion {
struct CmdServicesMemTraceRegisterCompare {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -230,7 +230,7 @@ struct CmdServicesMemTraceRegisterCompare {
struct CmdServicesMemTraceRegisterPoll {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -308,7 +308,7 @@ struct CmdServicesMemTraceRegisterPoll {
struct CmdServicesMemTraceRegisterWrite {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -382,7 +382,7 @@ struct CmdServicesMemTraceRegisterWrite {
struct CmdServicesMemTraceMemoryCompare {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -527,7 +527,7 @@ struct CmdServicesMemTraceMemoryCompare {
struct CmdServicesMemTraceMemoryPoll {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -665,7 +665,7 @@ struct CmdServicesMemTraceMemoryPoll {
struct CmdServicesMemTraceMemoryWrite {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -816,7 +816,7 @@ struct CmdServicesMemTraceMemoryWrite {
struct CmdServicesMemTraceMemoryWriteDiscontiguous {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -835,7 +835,7 @@ struct CmdServicesMemTraceMemoryWriteDiscontiguous {
struct {
uint64_t address;
uint32_t dataSizeInBytes;
} Dword_2_To_190[63];
} dword2To190[63];
int32_t getDword2To190Length() const {
return 190 - (2) + 1;
}
@@ -960,7 +960,7 @@ struct CmdServicesMemTraceMemoryWriteDiscontiguous {
struct CmdServicesMemTraceFrameBegin {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1002,7 +1002,7 @@ struct CmdServicesMemTraceFrameBegin {
struct CmdServicesMemTraceComment {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1049,7 +1049,7 @@ struct CmdServicesMemTraceComment {
struct CmdServicesMemTraceDelay {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1088,7 +1088,7 @@ struct CmdServicesMemTraceDelay {
struct CmdServicesMemTraceMemoryDump {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1151,7 +1151,7 @@ struct CmdServicesMemTraceMemoryDump {
struct CmdServicesMemTraceTestPhaseMarker {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1202,7 +1202,7 @@ struct CmdServicesMemTraceTestPhaseMarker {
struct CmdServicesMemTraceMemoryContinuousRegion {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1248,7 +1248,7 @@ struct CmdServicesMemTraceMemoryContinuousRegion {
struct CmdServicesMemTracePredicate {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;
@@ -1308,7 +1308,7 @@ struct CmdServicesMemTracePredicate {
struct CmdServicesMemTraceDumpCompress {
union {
AubCmdHdr Header;
AubCmdHdr header;
struct {
uint32_t dwordCount : 16;
uint32_t instructionSubOpcode : 7;