[cmake, dynarmic/tests] do not enable avx2, remove unused cmake opts (#2844)
Signed-off-by: lizzie lizzie@eden-emu.dev Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2844 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
parent
dc907616a9
commit
2a3e815dcd
|
|
@ -20,7 +20,6 @@ option(DYNARMIC_ENABLE_CPU_FEATURE_DETECTION "Turning this off causes dynarmic t
|
||||||
|
|
||||||
option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" ${PLATFORM_OPENBSD})
|
option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" ${PLATFORM_OPENBSD})
|
||||||
|
|
||||||
option(DYNARMIC_FATAL_ERRORS "Errors are fatal" OFF)
|
|
||||||
option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF)
|
option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF)
|
||||||
option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF)
|
option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF)
|
||||||
CMAKE_DEPENDENT_OPTION(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF "NOT YUZU_DISABLE_LLVM" OFF)
|
CMAKE_DEPENDENT_OPTION(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF "NOT YUZU_DISABLE_LLVM" OFF)
|
||||||
|
|
@ -29,7 +28,6 @@ option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
|
||||||
|
|
||||||
option(DYNARMIC_INSTALL "Install dynarmic headers and CMake files" OFF)
|
option(DYNARMIC_INSTALL "Install dynarmic headers and CMake files" OFF)
|
||||||
option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF)
|
option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF)
|
||||||
option(DYNARMIC_WARNINGS_AS_ERRORS "Warnings as errors" ${MASTER_PROJECT})
|
|
||||||
option(DYNARMIC_ENABLE_LTO "Enable LTO" OFF)
|
option(DYNARMIC_ENABLE_LTO "Enable LTO" OFF)
|
||||||
|
|
||||||
# Default to a Release build
|
# Default to a Release build
|
||||||
|
|
@ -91,11 +89,6 @@ if (MSVC)
|
||||||
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (DYNARMIC_WARNINGS_AS_ERRORS)
|
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS
|
|
||||||
/WX)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (CXX_CLANG)
|
if (CXX_CLANG)
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS
|
list(APPEND DYNARMIC_CXX_FLAGS
|
||||||
-Qunused-arguments
|
-Qunused-arguments
|
||||||
|
|
@ -109,21 +102,6 @@ else()
|
||||||
-pedantic
|
-pedantic
|
||||||
-Wno-missing-braces)
|
-Wno-missing-braces)
|
||||||
|
|
||||||
if (ARCHITECTURE STREQUAL "x86_64")
|
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS -mtune=core2)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (DYNARMIC_WARNINGS_AS_ERRORS)
|
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS
|
|
||||||
-pedantic-errors
|
|
||||||
-Werror)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (DYNARMIC_FATAL_ERRORS)
|
|
||||||
list(APPEND DYNARMIC_CXX_FLAGS
|
|
||||||
-Wfatal-errors)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (CXX_GCC)
|
if (CXX_GCC)
|
||||||
# GCC produces bogus -Warray-bounds warnings from xbyak headers for code paths that are not
|
# GCC produces bogus -Warray-bounds warnings from xbyak headers for code paths that are not
|
||||||
# actually reachable. Specifically, it happens in cases where some code casts an Operand&
|
# actually reachable. Specifically, it happens in cases where some code casts an Operand&
|
||||||
|
|
|
||||||
|
|
@ -135,8 +135,4 @@ target_include_directories(dynarmic_tests PRIVATE . ../src)
|
||||||
target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
|
target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
|
||||||
target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1)
|
target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1)
|
||||||
|
|
||||||
if ("x86_64" IN_LIST ARCHITECTURE)
|
|
||||||
target_compile_options(dynarmic_tests PRIVATE -mavx2)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_test(dynarmic_tests dynarmic_tests --durations yes)
|
add_test(dynarmic_tests dynarmic_tests --durations yes)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue