Skip to content

Commit 136b577

Browse files
XcedfXcedf
committed
Readbacks proof of concept shadps4-emu#2668 
1 parent bc55a89 commit 136b577

File tree

14 files changed

+413
-201
lines changed

14 files changed

+413
-201
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
911911
src/video_core/buffer_cache/buffer.h
912912
src/video_core/buffer_cache/buffer_cache.cpp
913913
src/video_core/buffer_cache/buffer_cache.h
914-
src/video_core/buffer_cache/memory_tracker_base.h
914+
src/video_core/buffer_cache/memory_tracker.h
915915
src/video_core/buffer_cache/range_set.h
916916
src/video_core/buffer_cache/word_manager.h
917917
src/video_core/renderer_vulkan/liverpool_to_vk.cpp

‎src/core/address_space.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,15 @@ struct AddressSpace::Impl {
302302
new_flags = PAGE_READWRITE;
303303
} else if (read && !write) {
304304
new_flags = PAGE_READONLY;
305-
} else if (execute && !read && not write) {
305+
} else if (execute && !read && !write) {
306306
new_flags = PAGE_EXECUTE;
307307
} else if (!read && !write && !execute) {
308308
new_flags = PAGE_NOACCESS;
309309
} else {
310310
LOG_CRITICAL(Common_Memory,
311-
"Unsupported protection flag combination for address {:#x}, size {}",
312-
virtual_addr, size);
311+
"Unsupported protection flag combination for address {:#x}, size {}, "
312+
"read={}, write={}, execute={}",
313+
virtual_addr, size, read, write, execute);
313314
return;
314315
}
315316

‎src/core/address_space.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Core {
1212

1313
enum class MemoryPermission : u32 {
14+
None = 0,
1415
Read = 1 << 0,
1516
Write = 1 << 1,
1617
ReadWrite = Read | Write,

‎src/video_core/amdgpu/liverpool.cpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Liverpool::~Liverpool() {
7474

7575
void Liverpool::Process(std::stop_token stoken) {
7676
Common::SetCurrentThreadName("shadPS4:GpuCommandProcessor");
77+
gpu_id = std::this_thread::get_id();
7778

7879
while (!stoken.stop_requested()) {
7980
{
@@ -635,9 +636,8 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
635636
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
636637
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
637638
dma_data->dst_sel == DmaDataDst::Gds) {
638-
rasterizer->InlineData(dma_data->dst_addr_lo,
639-
dma_data->SrcAddress<const void*>(),
640-
dma_data->NumBytes(), true);
639+
rasterizer->CopyBuffer(dma_data->dst_addr_lo, dma_data->SrcAddress<VAddr>(),
640+
dma_data->NumBytes(), true, false);
641641
} else if (dma_data->src_sel == DmaDataSrc::Data &&
642642
(dma_data->dst_sel == DmaDataDst::Memory ||
643643
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
@@ -646,14 +646,15 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
646646
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
647647
(dma_data->dst_sel == DmaDataDst::Memory ||
648648
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
649-
// LOG_WARNING(Render_Vulkan, "GDS memory read");
649+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->src_addr_lo,
650+
dma_data->NumBytes(), false, true);
650651
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
651652
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
652653
(dma_data->dst_sel == DmaDataDst::Memory ||
653654
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
654-
rasterizer->InlineData(dma_data->DstAddress<VAddr>(),
655-
dma_data->SrcAddress<const void*>(),
656-
dma_data->NumBytes(), false);
655+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(),
656+
dma_data->SrcAddress<VAddr>(), dma_data->NumBytes(),
657+
false, false);
657658
} else {
658659
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
659660
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
@@ -689,6 +690,9 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
689690
break;
690691
}
691692
case PM4ItOpcode::Rewind: {
693+
if (!rasterizer) {
694+
break;
695+
}
692696
const PM4CmdRewind* rewind = reinterpret_cast<const PM4CmdRewind*>(header);
693697
while (!rewind->Valid()) {
694698
YIELD_GFX();
@@ -837,8 +841,8 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
837841
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
838842
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
839843
dma_data->dst_sel == DmaDataDst::Gds) {
840-
rasterizer->InlineData(dma_data->dst_addr_lo, dma_data->SrcAddress<const void*>(),
841-
dma_data->NumBytes(), true);
844+
rasterizer->CopyBuffer(dma_data->dst_addr_lo, dma_data->SrcAddress<VAddr>(),
845+
dma_data->NumBytes(), true, false);
842846
} else if (dma_data->src_sel == DmaDataSrc::Data &&
843847
(dma_data->dst_sel == DmaDataDst::Memory ||
844848
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
@@ -847,14 +851,14 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
847851
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
848852
(dma_data->dst_sel == DmaDataDst::Memory ||
849853
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
850-
// LOG_WARNING(Render_Vulkan, "GDS memory read");
854+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->src_addr_lo,
855+
dma_data->NumBytes(), false, true);
851856
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
852857
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
853858
(dma_data->dst_sel == DmaDataDst::Memory ||
854859
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
855-
rasterizer->InlineData(dma_data->DstAddress<VAddr>(),
856-
dma_data->SrcAddress<const void*>(), dma_data->NumBytes(),
857-
false);
860+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->SrcAddress<VAddr>(),
861+
dma_data->NumBytes(), false, false);
858862
} else {
859863
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
860864
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
@@ -865,6 +869,9 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
865869
break;
866870
}
867871
case PM4ItOpcode::Rewind: {
872+
if (!rasterizer) {
873+
break;
874+
}
868875
const PM4CmdRewind* rewind = reinterpret_cast<const PM4CmdRewind*>(header);
869876
while (!rewind->Valid()) {
870877
YIELD_ASC(vqid);

‎src/video_core/amdgpu/liverpool.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,6 +1534,7 @@ struct Liverpool {
15341534
u32 tmp_dwords;
15351535
};
15361536
Common::SlotVector<AscQueueInfo> asc_queues{};
1537+
std::thread::id gpu_id;
15371538

15381539
private:
15391540
struct Task {

0 commit comments

Comments
 (0)