From b9da45cb1f284f3d3d1815cf8d3d77ad314cc901 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 19 Jan 2026 16:27:18 +0100 Subject: [tests] fix compile+linking issues with PlayTime (#3345) fixes linking + comp issues but not the test themselves, who have now became invalid Signed-off-by: lizzie Co-authored-by: DraVee Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3345 Reviewed-by: DraVee Reviewed-by: Maufeat Co-authored-by: lizzie Co-committed-by: lizzie --- src/tests/video_core/memory_tracker.cpp | 102 ++++++++++++++++---------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'src/tests/video_core/memory_tracker.cpp') diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp index b5b2a98216..08ebf05237 100644 --- a/src/tests/video_core/memory_tracker.cpp +++ b/src/tests/video_core/memory_tracker.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include @@ -6,12 +6,14 @@ #include #include #include +#include #include #include "common/common_types.h" #include "video_core/buffer_cache/memory_tracker_base.h" #include "core/device_memory.h" +#include "core/memory.h" #include "video_core/host1x/gpu_device_memory_manager.h" namespace { @@ -22,11 +24,11 @@ constexpr u64 WORD = 4096 * 64; constexpr u64 HIGH_PAGE_BITS = 22; constexpr u64 HIGH_PAGE_SIZE = 1ULL << HIGH_PAGE_BITS; -constexpr VAddr c = 16 * HIGH_PAGE_SIZE; +constexpr DAddr c = 16 * HIGH_PAGE_SIZE; class RasterizerInterface { public: - void UpdatePagesCachedCount(VAddr addr, u64 size, int delta) { + void UpdatePagesCachedCount(DAddr addr, size_t size, s32 delta) { ++update_calls; calls.emplace_back(addr, size, delta); const u64 page_start{addr >> Core::DEVICE_PAGEBITS}; @@ -42,10 +44,14 @@ public: } } + void UpdatePagesCachedBatch(std::span> ranges, s32 delta) { + // TODO: for now assume fine? + } + [[nodiscard]] size_t UpdateCalls() const noexcept { return update_calls; } - [[nodiscard]] const std::vector>& UpdateCallsList() const noexcept { return calls; } + [[nodiscard]] const std::vector>& UpdateCallsList() const noexcept { return calls; } - [[nodiscard]] int Count(VAddr addr) const noexcept { + [[nodiscard]] int Count(DAddr addr) const noexcept { const auto it = page_table.find(addr >> Core::DEVICE_PAGEBITS); return it == page_table.end() ? 0 : it->second; } @@ -60,7 +66,7 @@ public: private: std::unordered_map page_table; - std::vector> calls; + std::vector> calls; size_t update_calls = 0; }; @@ -70,7 +76,7 @@ using MemoryTracker = VideoCommon::MemoryTrackerBase; TEST_CASE("MemoryTracker: Small region", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE(rasterizer.Count() == 0); memory_track->UnmarkRegionAsCpuModified(c, WORD); REQUIRE(rasterizer.Count() == WORD / PAGE); @@ -82,27 +88,21 @@ TEST_CASE("MemoryTracker: Small region", "[video_core]") { TEST_CASE("MemoryTracker: Large region", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 32); memory_track->MarkRegionAsCpuModified(c + 4096, WORD * 4); - REQUIRE(memory_track->ModifiedCpuRegion(c, WORD + PAGE * 2) == - Range{c + PAGE, c + WORD + PAGE * 2}); - REQUIRE(memory_track->ModifiedCpuRegion(c + PAGE * 2, PAGE * 6) == - Range{c + PAGE * 2, c + PAGE * 8}); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD + PAGE * 2) == Range{c + PAGE, c + WORD + PAGE * 2}); + REQUIRE(memory_track->ModifiedCpuRegion(c + PAGE * 2, PAGE * 6) == Range{c + PAGE * 2, c + PAGE * 8}); REQUIRE(memory_track->ModifiedCpuRegion(c, WORD * 32) == Range{c + PAGE, c + WORD * 4 + PAGE}); - REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 4, PAGE) == - Range{c + WORD * 4, c + WORD * 4 + PAGE}); - REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 3 + PAGE * 63, PAGE) == - Range{c + WORD * 3 + PAGE * 63, c + WORD * 4}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 4, PAGE) == Range{c + WORD * 4, c + WORD * 4 + PAGE}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 3 + PAGE * 63, PAGE) == Range{c + WORD * 3 + PAGE * 63, c + WORD * 4}); memory_track->MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 6, PAGE); memory_track->MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); - REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == - Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 9}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 9}); memory_track->UnmarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); - REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == - Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 7}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 7}); memory_track->MarkRegionAsCpuModified(c + PAGE, WORD * 31 + PAGE * 63); REQUIRE(memory_track->ModifiedCpuRegion(c, WORD * 32) == Range{c + PAGE, c + WORD * 32}); @@ -116,7 +116,7 @@ TEST_CASE("MemoryTracker: Large region", "[video_core]") { TEST_CASE("MemoryTracker: Rasterizer counting", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE(rasterizer.Count() == 0); memory_track->UnmarkRegionAsCpuModified(c, PAGE); REQUIRE(rasterizer.Count() == 1); @@ -131,7 +131,7 @@ TEST_CASE("MemoryTracker: Rasterizer counting", "[video_core]") { TEST_CASE("MemoryTracker: Basic range", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->MarkRegionAsCpuModified(c, PAGE); int num = 0; @@ -145,7 +145,7 @@ TEST_CASE("MemoryTracker: Basic range", "[video_core]") { TEST_CASE("MemoryTracker: Border upload", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); memory_track->ForEachUploadRange(c, WORD * 2, [](u64 offset, u64 size) { @@ -156,7 +156,7 @@ TEST_CASE("MemoryTracker: Border upload", "[video_core]") { TEST_CASE("MemoryTracker: Border upload range", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); memory_track->ForEachUploadRange(c + WORD - PAGE, PAGE * 2, [](u64 offset, u64 size) { @@ -176,7 +176,7 @@ TEST_CASE("MemoryTracker: Border upload range", "[video_core]") { TEST_CASE("MemoryTracker: Border upload partial range", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); memory_track->ForEachUploadRange(c + WORD - 1, 2, [](u64 offset, u64 size) { @@ -196,7 +196,7 @@ TEST_CASE("MemoryTracker: Border upload partial range", "[video_core]") { TEST_CASE("MemoryTracker: Partial word uploads", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); int num = 0; memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { REQUIRE(offset == c); @@ -220,7 +220,7 @@ TEST_CASE("MemoryTracker: Partial word uploads", "[video_core]") { TEST_CASE("MemoryTracker: Partial page upload", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); int num = 0; memory_track->MarkRegionAsCpuModified(c + PAGE * 2, PAGE); @@ -241,7 +241,7 @@ TEST_CASE("MemoryTracker: Partial page upload", "[video_core]") { TEST_CASE("MemoryTracker: Partial page upload with multiple words on the right") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 9); memory_track->MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); int num = 0; @@ -261,7 +261,7 @@ TEST_CASE("MemoryTracker: Partial page upload with multiple words on the right") TEST_CASE("MemoryTracker: Partial page upload with multiple words on the left", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 8); memory_track->MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); int num = 0; @@ -281,7 +281,7 @@ TEST_CASE("MemoryTracker: Partial page upload with multiple words on the left", TEST_CASE("MemoryTracker: Partial page upload with multiple words in the middle", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 8); memory_track->MarkRegionAsCpuModified(c + PAGE * 13, PAGE * 140); int num = 0; @@ -307,7 +307,7 @@ TEST_CASE("MemoryTracker: Partial page upload with multiple words in the middle" TEST_CASE("MemoryTracker: Empty right bits", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 2048); memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); memory_track->ForEachUploadRange(c, WORD * 2048, [](u64 offset, u64 size) { @@ -318,7 +318,7 @@ TEST_CASE("MemoryTracker: Empty right bits", "[video_core]") { TEST_CASE("MemoryTracker: Out of bound ranges 1", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c - WORD, 3 * WORD); memory_track->MarkRegionAsCpuModified(c, PAGE); REQUIRE(rasterizer.Count() == (3 * WORD - PAGE) / PAGE); @@ -335,7 +335,7 @@ TEST_CASE("MemoryTracker: Out of bound ranges 1", "[video_core]") { TEST_CASE("MemoryTracker: Out of bound ranges 2", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c + 0x22000, PAGE)); REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c + 0x28000, PAGE)); REQUIRE(rasterizer.Count() == 2); @@ -349,7 +349,7 @@ TEST_CASE("MemoryTracker: Out of bound ranges 2", "[video_core]") { TEST_CASE("MemoryTracker: Out of bound ranges 3", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, 0x310720); REQUIRE(rasterizer.Count(c) == 1); REQUIRE(rasterizer.Count(c + PAGE) == 1); @@ -359,7 +359,7 @@ TEST_CASE("MemoryTracker: Out of bound ranges 3", "[video_core]") { TEST_CASE("MemoryTracker: Sparse regions 1", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->MarkRegionAsCpuModified(c + PAGE * 1, PAGE); memory_track->MarkRegionAsCpuModified(c + PAGE * 3, PAGE * 4); @@ -374,7 +374,7 @@ TEST_CASE("MemoryTracker: Sparse regions 1", "[video_core]") { TEST_CASE("MemoryTracker: Sparse regions 2", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, PAGE * 0x23); REQUIRE(rasterizer.Count() == 0x23); memory_track->MarkRegionAsCpuModified(c + PAGE * 0x1B, PAGE); @@ -390,7 +390,7 @@ TEST_CASE("MemoryTracker: Sparse regions 2", "[video_core]") { TEST_CASE("MemoryTracker: Single page modified range", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); memory_track->UnmarkRegionAsCpuModified(c, PAGE); REQUIRE(!memory_track->IsRegionCpuModified(c, PAGE)); @@ -398,7 +398,7 @@ TEST_CASE("MemoryTracker: Single page modified range", "[video_core]") { TEST_CASE("MemoryTracker: Two page modified range", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); REQUIRE(memory_track->IsRegionCpuModified(c, PAGE * 2)); @@ -408,9 +408,9 @@ TEST_CASE("MemoryTracker: Two page modified range", "[video_core]") { TEST_CASE("MemoryTracker: Multi word modified ranges", "[video_core]") { for (int offset = 0; offset < 4; ++offset) { - const VAddr address = c + WORD * offset; + const DAddr address = c + WORD * offset; RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); REQUIRE(memory_track->IsRegionCpuModified(address, PAGE)); REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 48, PAGE)); REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 56, PAGE)); @@ -430,7 +430,7 @@ TEST_CASE("MemoryTracker: Multi word modified ranges", "[video_core]") { TEST_CASE("MemoryTracker: Single page in large region", "[video_core]") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 16); REQUIRE(!memory_track->IsRegionCpuModified(c, WORD * 16)); @@ -448,7 +448,7 @@ TEST_CASE("MemoryTracker: Single page in large region", "[video_core]") { TEST_CASE("MemoryTracker: Wrap word regions") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 32); memory_track->MarkRegionAsCpuModified(c + PAGE * 63, PAGE * 2); REQUIRE(memory_track->IsRegionCpuModified(c, WORD * 2)); @@ -470,7 +470,7 @@ TEST_CASE("MemoryTracker: Wrap word regions") { TEST_CASE("MemoryTracker: Unaligned page region query") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->MarkRegionAsCpuModified(c + 4000, 1000); REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); @@ -481,7 +481,7 @@ TEST_CASE("MemoryTracker: Unaligned page region query") { TEST_CASE("MemoryTracker: Cached write") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->CachedCpuWrite(c + PAGE, c + PAGE); REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); @@ -493,7 +493,7 @@ TEST_CASE("MemoryTracker: Cached write") { TEST_CASE("MemoryTracker: Multiple cached write") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->CachedCpuWrite(c + PAGE, PAGE); memory_track->CachedCpuWrite(c + PAGE * 3, PAGE); @@ -508,7 +508,7 @@ TEST_CASE("MemoryTracker: Multiple cached write") { TEST_CASE("MemoryTracker: Cached write unmarked") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->CachedCpuWrite(c + PAGE, PAGE); memory_track->UnmarkRegionAsCpuModified(c + PAGE, PAGE); @@ -521,7 +521,7 @@ TEST_CASE("MemoryTracker: Cached write unmarked") { TEST_CASE("MemoryTracker: Cached write iterated") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); memory_track->CachedCpuWrite(c + PAGE, PAGE); int num = 0; @@ -536,7 +536,7 @@ TEST_CASE("MemoryTracker: Cached write iterated") { TEST_CASE("MemoryTracker: Cached write downloads") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD); REQUIRE(rasterizer.Count() == 64); memory_track->CachedCpuWrite(c + PAGE, PAGE); @@ -559,7 +559,7 @@ TEST_CASE("MemoryTracker: Cached write downloads") { TEST_CASE("MemoryTracker: FlushCachedWrites batching") { RasterizerInterface rasterizer; - std::unique_ptr memory_track(std::make_unique(rasterizer)); + std::optional memory_track(rasterizer); memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); memory_track->CachedCpuWrite(c + PAGE, PAGE); memory_track->CachedCpuWrite(c + PAGE * 2, PAGE); @@ -577,11 +577,11 @@ TEST_CASE("DeviceMemoryManager: UpdatePagesCachedBatch basic") { Core::DeviceMemory device_memory; Tegra::MaxwellDeviceMemoryManager manager(device_memory); // empty should be a no-op - std::vector> empty; + std::vector> empty; manager.UpdatePagesCachedBatch(empty, 1); // small ranges should be accepted and not crash - std::vector> ranges; + std::vector> ranges; ranges.emplace_back(0, Core::Memory::YUZU_PAGESIZE); ranges.emplace_back(Core::Memory::YUZU_PAGESIZE, Core::Memory::YUZU_PAGESIZE); manager.UpdatePagesCachedBatch(ranges, 1); -- cgit v1.2.3