armsx/ARMSX3
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX3.git synced 2026-08-24 16:58:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Settings: seed per-title core settings, starting with Web of Shadows

Browse Source 
Accurate SPU Reservations off is worth a large amount in Spider-Man: Web of
Shadows and is not safe globally, so it goes in that title's own override rather
than the default.

Its SPURS reservation traffic serialises behind the global exclusive
vm::writer_lock that every reservation_op takes, which no amount of CPU can help:
all six SPU threads and several PPUs were measured yielding at the same rate with
18.8% of total CPU in sched_yield. Off, SPURS takes the lock-free path and
vm::writer_lock fell from 8.06% to 0.96%.

Kept per-title because it is off-spec -- upstream defaults it on, and Sonic
Unleashed fails EARLIER with it off, reaching neither the loading icon nor the
logo, which is consistent with the bypass being the SPURS area itself.

The seed writes only fields a title does not already carry, so a deliberate
change is never overwritten, and it runs once. Other regions of the same game
need their own entry.
This commit is contained in:
jpolo1224
2026-08-11 10:26:35 -04:00
parent 0909f77a95
commit 49012ba969
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/armsx3-ui/app/src/main/java/com/armsx2/config/ConfigStore.kt
+34
View File
@@ -71,6 +71,21 @@ object ConfigStore {
// The relaxed-ZCULL default was recorded as a raw core override as well, and the OFF
// migration above only ever corrected the curated field.
private const val KEY_RELAXED_ZCULL_OVERRIDE_PURGED = "config.migrated.relaxedZcullOverridePurged"
// Per-title core settings that differ from the safe global default, seeded once into the
// title's own override so the global stays conservative. Keyed by serial; other regions of
// the same game need their own entry.
private const val KEY_PER_GAME_SEED = "config.migrated.perGameSeedV1"
private val PER_GAME_SEED: Map<String, Map<String, Any>> = mapOf(
// Spider-Man: Web of Shadows. Its SPURS reservation traffic serialises behind the global
// exclusive vm::writer_lock taken by every reservation_op, which no amount of CPU can
// help: measured all six SPU threads and several PPUs yielding at the same rate, 18.8% of
// total CPU in sched_yield. Turning accurate reservations off routes SPURS through the
// lock-free path in SPUThread.cpp and dropped vm::writer_lock from 8.06% to 0.96%.
//
// Deliberately per-game and not a global default. It is off-spec, upstream defaults it
// on, and Sonic Unleashed fails EARLIER with it off, so it is not safe to apply blindly.
"BLUS30218" to mapOf("ps3AccurateSpuRsv" to false),
)
private const val KEY_AFFINITY_ON = "config.migrated.affinityScheduler"
// ...and back off it: the mask it enables confines six SPU threads to four cores.
private const val KEY_AFFINITY_OS = "config.migrated.affinitySchedulerOff"
@@ -184,6 +199,25 @@ object ConfigStore {
MainActivityRuntime.prefs.edit { putBoolean(KEY_RELAXED_ZCULL_OFF, true) }
}
// Seed the per-title core settings once. Only fields the title does not already carry
// are written, so a deliberate change is never overwritten.
if (!MainActivityRuntime.prefs.getBoolean(KEY_PER_GAME_SEED, false)) {
runCatching {
for ((serial, fields) in PER_GAME_SEED) {
val existing = loadOverrides(serial) ?: JSONObject()
var changed = false
for ((key, value) in fields) {
if (!existing.has(key)) {
existing.put(key, value)
changed = true
}
}
if (changed) saveOverrides(serial, existing)
}
}
MainActivityRuntime.prefs.edit { putBoolean(KEY_PER_GAME_SEED, true) }
}
// ...and take the raw override with it. The ON migration recorded the same setting a
// second time as a core override, and the OFF migration above only corrected the
// curated field, so the two stores disagreed: relaxedZcull was false everywhere the UI