Skip to content

Commit be4c2cc

Browse files
AUBDump: Move PPGGT entries to lower physical memory (starting BIT31)
- 1GB remaining for regular allocations in AubDump Change-Id: I9dcc7a6f0c495ed95622cf6d5ec366af06bbf350
1 parent 2b89486 commit be4c2cc

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

runtime/aub_mem_dump/aub_mem_dump.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ const uint64_t PageTableTraits<48>::physicalMemory = 0; // 1ull <<addressingBits
5252

5353
const uint64_t PageTableTraits<48>::numPTEntries = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS);
5454
const uint64_t PageTableTraits<48>::sizePT = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS) * sizeof(uint64_t);
55-
const uint64_t PageTableTraits<48>::ptBaseAddress = BIT(37);
55+
const uint64_t PageTableTraits<48>::ptBaseAddress = BIT(34);
5656

5757
const uint64_t PageTableTraits<48>::numPDEntries = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS - PageTableTraits<48>::NUM_PTE_BITS);
5858
const uint64_t PageTableTraits<48>::sizePD = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS - PageTableTraits<48>::NUM_PTE_BITS) * sizeof(uint64_t);
59-
const uint64_t PageTableTraits<48>::pdBaseAddress = BIT(36);
59+
const uint64_t PageTableTraits<48>::pdBaseAddress = BIT(33);
6060

6161
const uint64_t PageTableTraits<48>::numPDPEntries = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS - PageTableTraits<48>::NUM_PTE_BITS - PageTableTraits<48>::NUM_PDE_BITS);
6262
const uint64_t PageTableTraits<48>::sizePDP = BIT(PageTableTraits<48>::addressingBits - PageTableTraits<48>::NUM_OFFSET_BITS - PageTableTraits<48>::NUM_PTE_BITS - PageTableTraits<48>::NUM_PDE_BITS) * sizeof(uint64_t);
63-
const uint64_t PageTableTraits<48>::pdpBaseAddress = BIT(35);
63+
const uint64_t PageTableTraits<48>::pdpBaseAddress = BIT(32);
6464
const uint64_t PageTableTraits<48>::numPML4Entries = BIT(NUM_PML4_BITS);
6565
const uint64_t PageTableTraits<48>::sizePML4 = BIT(NUM_PML4_BITS) * sizeof(uint64_t);
66-
const uint64_t PageTableTraits<48>::pml4BaseAddress = BIT(34);
66+
const uint64_t PageTableTraits<48>::pml4BaseAddress = BIT(31);
6767
// clang-format on
6868

6969
void LrcaHelper::setRingTail(void *pLRCIn, uint32_t ringTail) const {

unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ std::string getAubFileName(const OCLRT::Device *pDevice, const std::string baseN
3838
return strfilename.str();
3939
}
4040

41+
TEST(PageTableTraits, when48BitTraitsAreUsedThenPageTableAddressesAreCorrect) {
42+
EXPECT_EQ(BIT(34), AubMemDump::PageTableTraits<48>::ptBaseAddress);
43+
EXPECT_EQ(BIT(33), AubMemDump::PageTableTraits<48>::pdBaseAddress);
44+
EXPECT_EQ(BIT(32), AubMemDump::PageTableTraits<48>::pdpBaseAddress);
45+
EXPECT_EQ(BIT(31), AubMemDump::PageTableTraits<48>::pml4BaseAddress);
46+
}
47+
48+
TEST(PageTableTraits, when32BitTraitsAreUsedThenPageTableAddressesAreCorrect) {
49+
EXPECT_EQ(BIT(38), AubMemDump::PageTableTraits<32>::ptBaseAddress);
50+
EXPECT_EQ(BIT(37), AubMemDump::PageTableTraits<32>::pdBaseAddress);
51+
EXPECT_EQ(BIT(36), AubMemDump::PageTableTraits<32>::pdpBaseAddress);
52+
}
53+
4154
typedef Test<DeviceFixture> AubMemDumpTests;
4255

4356
HWTEST_F(AubMemDumpTests, givenAubFileStreamWhenOpenAndCloseIsCalledThenFileNameIsReportedCorrectly) {

0 commit comments

Comments
 (0)