From a8093c2a3cf98ccccabeb1d6a2c1ccc5e191557f Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 10 Feb 2026 03:34:07 +0100 Subject: [*] change all std::unordered_map and std::unordered_set into ankerl::unordered_dense::map/set variants (#3442) mainly doing this to reduce memory footprint; we all know how nice ankerl::unordered_dense is in theory 4x faster - in practice these maps arent that "hot" anyways so not likely to have much perf gained i just want to reduce mem fragmentation to ease my porting process, plus it helps other platforms as well (ahem weak Mediatek devices) :) Signed-off-by: lizzie Co-authored-by: Caio Oliveira Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3442 Reviewed-by: DraVee Reviewed-by: CamilleLaVey Co-authored-by: lizzie Co-committed-by: lizzie --- src/input_common/drivers/android.h | 5 ++++- src/input_common/drivers/sdl_driver.cpp | 4 ++-- src/input_common/drivers/sdl_driver.h | 7 +++++-- src/input_common/input_engine.h | 17 ++++++++++------- src/input_common/main.h | 11 +++++++---- 5 files changed, 28 insertions(+), 16 deletions(-) (limited to 'src/input_common') diff --git a/src/input_common/drivers/android.h b/src/input_common/drivers/android.h index 03e2b2c983..18678de602 100644 --- a/src/input_common/drivers/android.h +++ b/src/input_common/drivers/android.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later @@ -87,7 +90,7 @@ public: Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override; private: - std::unordered_map input_devices; + ankerl::unordered_dense::map input_devices; /// Returns the correct identifier corresponding to the player index PadIdentifier GetIdentifier(const std::string& guid, size_t port) const; diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index ddee11035c..81b0a2313a 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -570,7 +570,7 @@ SDLDriver::~SDLDriver() { std::vector SDLDriver::GetInputDevices() const { std::vector devices; - std::unordered_map> joycon_pairs; + ankerl::unordered_dense::map> joycon_pairs; for (const auto& [key, value] : joystick_map) { for (const auto& joystick : value) { if (!joystick->GetSDLJoystick()) { diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index a140ad072c..1677ab8289 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -6,7 +9,7 @@ #include #include #include -#include +#include #include @@ -116,7 +119,7 @@ private: Common::SPSCQueue vibration_queue; /// Map of GUID of a list of corresponding virtual Joysticks - std::unordered_map>> joystick_map; + ankerl::unordered_dense::map>> joystick_map; std::mutex joystick_map_mutex; bool start_thread = false; diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index 3e328509b1..7ad40027e4 100644 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -5,7 +8,7 @@ #include #include -#include +#include #include "common/common_types.h" #include "common/input.h" @@ -267,10 +270,10 @@ protected: private: struct ControllerData { - std::unordered_map buttons; - std::unordered_map hat_buttons; - std::unordered_map axes; - std::unordered_map motions; + ankerl::unordered_dense::map buttons; + ankerl::unordered_dense::map hat_buttons; + ankerl::unordered_dense::map axes; + ankerl::unordered_dense::map motions; Common::Input::BatteryLevel battery{}; Common::Input::BodyColorStatus color{}; Common::Input::CameraStatus camera{}; @@ -298,8 +301,8 @@ private: bool configuring{false}; const std::string input_engine; int last_callback_key = 0; - std::unordered_map controller_list; - std::unordered_map callback_list; + ankerl::unordered_dense::map controller_list; + ankerl::unordered_dense::map callback_list; MappingCallback mapping_callback; }; diff --git a/src/input_common/main.h b/src/input_common/main.h index 1d19019ee8..d0e447ec2d 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -5,7 +8,7 @@ #include #include -#include +#include #include namespace Common { @@ -53,9 +56,9 @@ enum class InputType { None, Button, Stick, Motion, Touch }; * Given a ParamPackage for a Device returned from `GetInputDevices`, attempt to get the default * mapping for the device. */ -using AnalogMapping = std::unordered_map; -using ButtonMapping = std::unordered_map; -using MotionMapping = std::unordered_map; +using AnalogMapping = ankerl::unordered_dense::map; +using ButtonMapping = ankerl::unordered_dense::map; +using MotionMapping = ankerl::unordered_dense::map; class InputSubsystem { public: -- cgit v1.2.3