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

Revert "Pass HardwareInfo to AubHelper::checkPTEAddress()"

Browse Source 
Delete AubHelper::checkPTEAddress()

This reverts commit aa587b3bc5.

Change-Id: I32b90ce7dddfd2347586b2c47b9114b45cced8ab
This commit is contained in:
Maciej Dziuban
2019-02-19 09:20:43 +01:00
committed by sys_ocldev
parent 64fbfb21bf
commit 802eb37394
10 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/aub_mem_dump/aub_mem_dump.h
View File

@@ -19,7 +19,6 @@
namespace OCLRT {
class AubHelper;
struct HardwareInfo;
}
namespace AubMemDump {
@@ -243,7 +242,7 @@ struct AubPageTableHelper32 : public AubPageTableHelper<Traits>, PageTableTraits
static void createContext(typename Traits::Stream &stream, uint32_t context);
static uint64_t reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress,
size_t blockSize, uint64_t physAddress,
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper, const OCLRT::HardwareInfo *hwInfo);
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper);
static void fixupLRC(uint8_t *pLrc);
};
@@ -259,7 +258,7 @@ struct AubPageTableHelper64 : public AubPageTableHelper<Traits>, PageTableTraits
static void createContext(typename Traits::Stream &stream, uint32_t context);
static uint64_t reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress,
size_t blockSize, uint64_t physAddress,
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper, const OCLRT::HardwareInfo *hwInfo);
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper);
static void fixupLRC(uint8_t *pLrc);
};
@@ -294,8 +293,7 @@ struct AubDump : public std::conditional<TraitsIn::addressingBits == 32, AubPage
static uint64_t reserveAddressGGTT(Stream &stream, uint32_t addr, size_t size, uint64_t physStart, AubGTTData data);
static uint64_t reserveAddressGGTT(Stream &stream, const void *memory, size_t size, uint64_t physStart, AubGTTData data);
static void reserveAddressGGTTAndWriteMmeory(Stream &stream, uintptr_t gfxAddress, const void *memory, uint64_t physAddress,
size_t size, size_t offset, uint64_t additionalBits,
const OCLRT::AubHelper &aubHelper, const OCLRT::HardwareInfo *hwInfo);
size_t size, size_t offset, uint64_t additionalBits, const OCLRT::AubHelper &aubHelper);
static void setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTData data);

11
runtime/aub_mem_dump/aub_mem_dump.inl
View File

@@ -117,12 +117,12 @@ uint64_t AubDump<Traits>::reserveAddressGGTT(typename Traits::Stream &stream, co
template <typename Traits>
void AubDump<Traits>::reserveAddressGGTTAndWriteMmeory(typename Traits::Stream &stream, uintptr_t gfxAddress,
const void *memory, uint64_t physAddress,
size_t size, size_t offset, uint64_t additionalBits,
const OCLRT::AubHelper &aubHelper, const HardwareInfo *hwInfo) {
size_t size, size_t offset,
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) {
auto vmAddr = (gfxAddress + offset) & ~(MemoryConstants::pageSize - 1);
auto pAddr = physAddress & ~(MemoryConstants::pageSize - 1);
AubDump<Traits>::reserveAddressPPGTT(stream, vmAddr, MemoryConstants::pageSize, pAddr, additionalBits, aubHelper, hwInfo);
AubDump<Traits>::reserveAddressPPGTT(stream, vmAddr, MemoryConstants::pageSize, pAddr, additionalBits, aubHelper);
int hint = OCLRT::AubHelper::getMemTrace(additionalBits);
@@ -142,7 +142,7 @@ void AubDump<Traits>::setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTDat
template <typename Traits>
uint64_t AubPageTableHelper32<Traits>::reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress,
size_t blockSize, uint64_t physAddress,
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper, const HardwareInfo *hwInfo) {
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) {
auto startAddress = gfxAddress;
auto endAddress = gfxAddress + blockSize - 1;
@@ -206,7 +206,7 @@ uint64_t AubPageTableHelper32<Traits>::reserveAddressPPGTT(typename Traits::Stre
template <typename Traits>
uint64_t AubPageTableHelper64<Traits>::reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress,
size_t blockSize, uint64_t physAddress,
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper, const HardwareInfo *hwInfo) {
uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) {
auto startAddress = gfxAddress;
auto endAddress = gfxAddress + blockSize - 1;
@@ -312,7 +312,6 @@ uint64_t AubPageTableHelper64<Traits>::reserveAddressPPGTT(typename Traits::Stre
stream.writePTE(startAddress, pte, addressSpace);
startAddress += sizeof(pte);
OCLRT::AubHelper::checkPTEAddress(hwInfo, startAddress);
physPage += 4096;
currPTE++;