diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 2ff728785..80be5c7d4 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -352,7 +352,7 @@ def game_cores(env): def cpu_topology(env): - if "WINE_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + if "WINE_CPU_TOPOLOGY" in env or "PROTON_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): return try: cores = sorted(os.sched_getaffinity(0)) @@ -361,7 +361,7 @@ def cpu_topology(env): online = online_cores() if not cores or set(cores) >= online or cores[-1] >= len(online): return - env["WINE_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) + env["WINE_CPU_TOPOLOGY"] = env["PROTON_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) print("droiddeck-game-env: Windows sees %d cores (%s)" % (len(cores), env["WINE_CPU_TOPOLOGY"]), file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 6c90be2d6..147ce7383 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -453,19 +453,21 @@ class GameEnvironmentTest(unittest.TestCase): os_mod = MODULE["os"] online = {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}} cases = [ - ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7"), - ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2"), - ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None), - ({}, {6, 7}, None), - ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3"), - ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, ""), - ({"BL_GAME_CPUS": "9"}, {9}, None), + ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7", "2:6,7"), + ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2", "3:0,1,2"), + ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None, None), + ({}, {6, 7}, None, None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3", None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, "", None), + ({"BL_GAME_CPUS": "6,7", "PROTON_CPU_TOPOLOGY": "1:7"}, {6, 7}, None, "1:7"), + ({"BL_GAME_CPUS": "9"}, {9}, None, None), ] - for env, affinity, expected in cases: + for env, affinity, expected, proton in cases: with mock.patch.dict(MODULE["cpu_topology"].__globals__, online), \ mock.patch.object(os_mod, "sched_getaffinity", return_value=affinity, create=True): MODULE["cpu_topology"](env) self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) + self.assertEqual(env.get("PROTON_CPU_TOPOLOGY"), proton, env) def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: