From 8d858b4334948fec6c96a14bc88691ca5178e50d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:38:11 -0400 Subject: [PATCH] feat: pick a game's CPU cores in its game profile (#1566) * feat: pick a game's CPU cores in its game profile * fix: match per-game cores against the online CPU list --- .../launcher/core/GameEnvironmentOptions.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../overlay/usr/local/bin/droiddeck-game-env | 41 +++++++++++++++++++ tools/tests/test_game_environment.py | 20 +++++++++ 4 files changed, 63 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index e339f38df1..bcf3a0448c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -34,6 +34,7 @@ object GameEnvironmentOptions { Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT), Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT), Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER), + Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT), Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")), Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")), Option("WINEDLLOVERRIDES", "", 0, Type.TEXT), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f242f6873..4e0b1e55d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,6 +95,7 @@ On by default. Starts an Easy Anti-Cheat game without its anti-cheat when the game supports offline play. Turn off to launch through Easy Anti-Cheat as usual. Online modes that require Easy Anti-Cheat remain unavailable. DXVK overlay for D3D9–11. fps displays frame rate; unset hides it. DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer the session frame limiter for ordinary play. + CPU cores for this game, such as 0-4 or 0,2,4, in place of the session\'s game cores. Fewer cores run cooler. D3D12 frame-rate limit. 0 disables the limit. Mesa OpenGL threading. true can help CPU-limited OpenGL games; test per game. Wine sync diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 43f24138d7..f8b4acaebb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -299,6 +299,46 @@ def vram_cap(env): return result +def parse_cores(text): + """CPU numbers from a list such as "0-3,6"; None when the text is not one.""" + cores = set() + for part in text.replace(" ", "").split(","): + match = re.fullmatch(r"(\d{1,3})(?:-(\d{1,3}))?", part) + if not match: + return None + first, last = int(match.group(1)), int(match.group(2) or match.group(1)) + if last < first: + return None + cores.update(range(first, last + 1)) + return cores or None + + +def online_cores(): + try: + with open("/sys/devices/system/cpu/online") as f: + cores = parse_cores(f.read().strip()) + except OSError: + cores = None + return cores or os.sched_getaffinity(0) | set(range(os.cpu_count() or 0)) + + +def game_cores(env): + """Pins the game to the cores its profile names, in place of the session's game cores.""" + text = env.get("DROIDDECK_GAME_CORES", "").strip() + if not text: + return + cores = parse_cores(text) + chosen = cores & online_cores() if cores else None + if not chosen: + print("droiddeck-game-env: ignoring game cores %r" % text, file=sys.stderr) + return + try: + os.sched_setaffinity(0, chosen) + print("droiddeck-game-env: game cores %s" % ",".join(map(str, sorted(chosen))), file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: could not use game cores %r (%s)" % (text, error), file=sys.stderr) + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -574,6 +614,7 @@ def main(): env["BANNER_AUDIO_DIRECT_MIC"] = "0" env = vram_cap(env) env = force_ssbs(command, env) + game_cores(env) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 817281af5b..3895ebc695 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -8,6 +8,7 @@ import shlex import subprocess import sys import tempfile +from unittest import mock import unittest BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" @@ -372,6 +373,25 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_game_cores_are_parsed_from_lists_and_ranges(self): + parse = MODULE["parse_cores"] + self.assertEqual(parse("0-3,6"), {0, 1, 2, 3, 6}) + self.assertEqual(parse(" 4, 5 "), {4, 5}) + for bad in ("", "a", "3-1", "1,,2", "-1", "1-"): + self.assertIsNone(parse(bad), bad) + + def test_a_profiles_game_cores_pin_the_game_within_the_online_cores(self): + calls = [] + os_mod = MODULE["os"] + with mock.patch.dict(MODULE["game_cores"].__globals__, {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}}), \ + mock.patch.object(os_mod, "sched_setaffinity", side_effect=lambda pid, cores: calls.append(set(cores)), create=True): + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "0-2,9"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "junk"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "12-13"}) + MODULE["game_cores"]({}) + self.assertEqual(calls, [{0, 1, 2}]) + self.assertEqual(MODULE["parse_cores"]("0,2-7"), {0, 2, 3, 4, 5, 6, 7}) + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch"