Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPU: Cache reservation memory direct access handle (optimization) #11240

Merged
merged 1 commit into from May 4, 2022
Merged

SPU: Cache reservation memory direct access handle (optimization) #11240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions Utilities/Thread.h
View file
Open in desktop
Expand Up @@ -276,8 +276,8 @@ class thread_ctrl final
}

// Wait for both thread sync var and provided atomic var
template <atomic_wait::op Op = atomic_wait::op::eq, typename T, typename U>
static inline void wait_on(T& wait, U old, u64 usec = -1)
template <uint Max, typename Func>
static inline void wait_on_custom(Func&& setter, u64 usec = -1)
{
auto _this = g_tls_this_thread;

Expand All @@ -286,13 +286,19 @@ class thread_ctrl final
return;
}

atomic_wait::list<3> list{};
list.set<0, Op>(wait, old);
list.set<1>(_this->m_sync, 0, 4 + 1);
list.set<2>(_this->m_taskq, nullptr);
atomic_wait::list<Max + 2> list{};
list.template set<Max>(_this->m_sync, 0, 4 + 1);
list.template set<Max + 1>(_this->m_taskq, nullptr);
setter(list);
list.wait(atomic_wait_timeout{usec <= 0xffff'ffff'ffff'ffff / 1000 ? usec * 1000 : 0xffff'ffff'ffff'ffff});
}

template <atomic_wait::op Op = atomic_wait::op::eq, typename T, typename U>
static inline void wait_on(T& wait, U old, u64 usec = -1)
{
wait_on_custom<1>([&](atomic_wait::list<3>& list){ list.set<0, Op>(wait, old); }, usec);
}

// Exit.
[[noreturn]] static void emergency_exit(std::string_view reason);

Expand Down
71 changes: 49 additions & 22 deletions rpcs3/Emu/Cell/SPUThread.cpp
View file
Open in desktop
Expand Up @@ -3942,40 +3942,46 @@ s64 spu_thread::get_ch_value(u32 ch)

spu_function_logger logger(*this, "MFC Events read");

if (mask1 & SPU_EVENT_LR && raddr)
state += cpu_flag::wait;

using resrv_ptr = std::add_pointer_t<decltype(rdata)>;

resrv_ptr resrv_mem{};
std::shared_ptr<utils::shm> rdata_shm;

if (raddr && mask1 & SPU_EVENT_LR)
{
if (mask1 != SPU_EVENT_LR && mask1 != SPU_EVENT_LR + SPU_EVENT_TM)
auto area = vm::get(vm::any, raddr);

if (area && (area->flags & vm::preallocated) && vm::check_addr(raddr))
{
// Combining LR with other flags needs another solution
fmt::throw_exception("Not supported: event mask 0x%x", mask1);
// Obtain pointer to pre-allocated storage
resrv_mem = vm::get_super_ptr<decltype(rdata)>(raddr);
}

for (; !events.count; events = get_events(mask1, false, true))
else if (area)
{
const auto old = state.add_fetch(cpu_flag::wait);

if (is_stopped(old))
{
return -1;
}
// Ensure possesion over reservation memory so it won't be deallocated
auto [base_addr, shm_] = area->peek(raddr);

if (is_paused(old))
if (shm_)
{
// Ensure reservation data won't change while paused for debugging purposes
check_state();
continue;
const u32 data_offs = raddr - base_addr;
rdata_shm = std::move(shm_);
vm::writer_lock{}, resrv_mem = reinterpret_cast<resrv_ptr>(rdata_shm->map_self() + data_offs);
}

vm::reservation_notifier(raddr).wait(rtime, -128, atomic_wait_timeout{100'000});
}

check_state();
return events.events & mask1;
if (!resrv_mem)
{
spu_log.error("A dangling reservation address has been found while reading SPU_RdEventStat channel. (addr=0x%x, events_mask=0x%x)", raddr, mask1);
raddr = 0;
set_events(SPU_EVENT_LR);
}
}

for (; !events.count; events = get_events(mask1, true, true))
for (; !events.count; events = get_events(mask1 & ~SPU_EVENT_LR, true, true))
{
const auto old = state.add_fetch(cpu_flag::wait);
const auto old = +state;

if (is_stopped(old))
{
Expand All @@ -3984,7 +3990,28 @@ s64 spu_thread::get_ch_value(u32 ch)

if (is_paused(old))
{
// Ensure spu_thread::rdata's stagnancy while the thread is paused for debugging purposes
check_state();
state += cpu_flag::wait;
continue;
}

// Optimized check
if (raddr && (!vm::check_addr(raddr) || rtime != vm::reservation_acquire(raddr) || !cmp_rdata(rdata, *resrv_mem)))
{
raddr = 0;
set_events(SPU_EVENT_LR);
continue;
}

if (raddr)
{
thread_ctrl::wait_on_custom<2>([&](atomic_wait::list<4>& list)
{
list.set<0>(state, old);
list.set<1>(vm::reservation_notifier(raddr), rtime, -128);
}, 100);

continue;
}

Expand Down