From ae9db336e7b1c7345c03f589183f6337574267ba Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 9 Sep 2024 18:27:21 -0700 Subject: [PATCH] FEXCore/Context: Removes unused features No functional change here. - CoreRunningMode enum and variable wasn't used anymore. - Code was moved to the frontend - CustomCPUFactory wasn't used anymore - All special signal handling and various features were moved to TestHarnessRunner - We also don't want to support actual custom CPU cores. - TestHarnessRunner just runs as a host runner if compiled on an x86-64 device if vixl sim isn't enabled now. - Removes the Core config option entirely. - Moves VDSOPointers struct to the frontend - Every use of this lives in the Linux frontend instead now --- FEXCore/Source/Interface/Config/Config.cpp | 16 ---------- .../Source/Interface/Config/Config.json.in | 13 -------- FEXCore/Source/Interface/Context/Context.cpp | 4 --- FEXCore/Source/Interface/Context/Context.h | 16 ---------- FEXCore/Source/Interface/Core/Core.cpp | 10 ++---- FEXCore/include/FEXCore/Config/Config.h | 17 ---------- FEXCore/include/FEXCore/Core/Context.h | 16 ---------- Source/Tools/CodeSizeValidation/Main.cpp | 2 -- .../LinuxSyscalls/SignalDelegator.h | 3 +- .../Tools/LinuxEmulation/VDSO_Emulation.cpp | 4 +-- Source/Tools/LinuxEmulation/VDSO_Emulation.h | 11 ++++--- .../TestHarnessRunner/TestHarnessRunner.cpp | 31 +++++++++---------- unittests/32Bit_ASM/CMakeLists.txt | 8 ++--- unittests/ASM/CMakeLists.txt | 8 ++--- unittests/FEXLinuxTests/CMakeLists.txt | 2 +- unittests/POSIX/CMakeLists.txt | 2 +- unittests/ThunkFunctionalTests/CMakeLists.txt | 2 +- unittests/gcc-target-tests-32/CMakeLists.txt | 2 +- unittests/gcc-target-tests-64/CMakeLists.txt | 2 +- unittests/gvisor-tests/CMakeLists.txt | 2 +- 20 files changed, 39 insertions(+), 132 deletions(-) diff --git a/FEXCore/Source/Interface/Config/Config.cpp b/FEXCore/Source/Interface/Config/Config.cpp index 96f7dc3c9c..80761e00c7 100644 --- a/FEXCore/Source/Interface/Config/Config.cpp +++ b/FEXCore/Source/Interface/Config/Config.cpp @@ -318,24 +318,8 @@ fextl::string FindContainerPrefix() { void ReloadMetaLayer() { Meta->Load(); - // Do configuration option fix ups after everything is reloaded - if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_CORE)) { - // Sanitize Core option - FEX_CONFIG_OPT(Core, CORE); -#if (_M_X86_64) - constexpr uint32_t MaxCoreNumber = 1; -#else - constexpr uint32_t MaxCoreNumber = 0; -#endif - if (Core > MaxCoreNumber) { - // Sanitize the core option by setting the core to the JIT if invalid - FEXCore::Config::EraseSet(FEXCore::Config::CONFIG_CORE, fextl::fmt::format("{}", static_cast(FEXCore::Config::CONFIG_IRJIT))); - } - } - if (FEXCore::Config::Exists(FEXCore::Config::CONFIG_CACHEOBJECTCODECOMPILATION)) { FEX_CONFIG_OPT(CacheObjectCodeCompilation, CACHEOBJECTCODECOMPILATION); - FEX_CONFIG_OPT(Core, CORE); } fextl::string ContainerPrefix {FindContainerPrefix()}; diff --git a/FEXCore/Source/Interface/Config/Config.json.in b/FEXCore/Source/Interface/Config/Config.json.in index 7ea15f2761..a28c9c2f9e 100644 --- a/FEXCore/Source/Interface/Config/Config.json.in +++ b/FEXCore/Source/Interface/Config/Config.json.in @@ -1,19 +1,6 @@ { "Options": { "CPU": { - "Core": { - "Type": "uint32", - "Default": "FEXCore::Config::ConfigCore::CONFIG_IRJIT", - "TextDefault": "irjit", - "ShortArg": "c", - "Choices": [ "irjit", "host" ], - "ArgumentHandler": "CoreHandler", - "Desc": [ - "Which CPU core to use", - "host only exists on x86_64", - "[irjit, host]" - ] - }, "Multiblock": { "Type": "bool", "Default": "false", diff --git a/FEXCore/Source/Interface/Context/Context.cpp b/FEXCore/Source/Interface/Context/Context.cpp index aff122f710..91a0ff082c 100644 --- a/FEXCore/Source/Interface/Context/Context.cpp +++ b/FEXCore/Source/Interface/Context/Context.cpp @@ -39,10 +39,6 @@ void FEXCore::Context::ContextImpl::CompileRIPCount(FEXCore::Core::InternalThrea CompileBlock(Thread->CurrentFrame, GuestRIP, MaxInst); } -void FEXCore::Context::ContextImpl::SetCustomCPUBackendFactory(CustomCPUFactoryType Factory) { - CustomCPUFactory = std::move(Factory); -} - void FEXCore::Context::ContextImpl::SetSignalDelegator(FEXCore::SignalDelegator* _SignalDelegation) { SignalDelegation = _SignalDelegation; } diff --git a/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h index f1e3871ac1..7863ed6d4f 100644 --- a/FEXCore/Source/Interface/Context/Context.h +++ b/FEXCore/Source/Interface/Context/Context.h @@ -26,14 +26,8 @@ #include #include -#include -#include -#include -#include #include #include -#include -#include namespace FEXCore { class CodeLoader; @@ -65,11 +59,6 @@ namespace Validation { } // namespace FEXCore::IR namespace FEXCore::Context { -enum CoreRunningMode { - MODE_RUN = 0, - MODE_SINGLESTEP = 1, -}; - struct ExitFunctionLinkData { uint64_t HostBranch; uint64_t GuestRIP; @@ -110,8 +99,6 @@ class ContextImpl final : public FEXCore::Context::Context { void CompileRIP(FEXCore::Core::InternalThreadState* Thread, uint64_t GuestRIP) override; void CompileRIPCount(FEXCore::Core::InternalThreadState* Thread, uint64_t GuestRIP, uint64_t MaxInst) override; - void SetCustomCPUBackendFactory(CustomCPUFactoryType Factory) override; - void HandleCallback(FEXCore::Core::InternalThreadState* Thread, uint64_t RIP) override; uint64_t RestoreRIPFromHostPC(FEXCore::Core::InternalThreadState* Thread, uint64_t HostPC) override; @@ -220,7 +207,6 @@ class ContextImpl final : public FEXCore::Context::Context { friend class FEXCore::IR::Validation::IRValidation; struct { - CoreRunningMode RunningMode {CoreRunningMode::MODE_RUN}; uint64_t VirtualMemSize {1ULL << 36}; uint64_t TSCScale = 0; @@ -240,7 +226,6 @@ class ContextImpl final : public FEXCore::Context::Context { FEX_CONFIG_OPT(AOTIRGenerate, AOTIRGENERATE); FEX_CONFIG_OPT(AOTIRLoad, AOTIRLOAD); FEX_CONFIG_OPT(SMCChecks, SMCCHECKS); - FEX_CONFIG_OPT(Core, CORE); FEX_CONFIG_OPT(MaxInstPerBlock, MAXINST); FEX_CONFIG_OPT(RootFSPath, ROOTFS); FEX_CONFIG_OPT(ThunkHostLibsPath, THUNKHOSTLIBS); @@ -273,7 +258,6 @@ class ContextImpl final : public FEXCore::Context::Context { fextl::unique_ptr ThunkHandler; fextl::unique_ptr Dispatcher; - CustomCPUFactoryType CustomCPUFactory; FEXCore::Context::ExitHandler CustomExitHandler; #ifdef BLOCKSTATS diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp index 3ffa1753a5..6fd35dd874 100644 --- a/FEXCore/Source/Interface/Core/Core.cpp +++ b/FEXCore/Source/Interface/Core/Core.cpp @@ -420,14 +420,8 @@ void ContextImpl::InitializeCompiler(FEXCore::Core::InternalThreadState* Thread) Thread->PassManager->RegisterSyscallHandler(SyscallHandler); // Create CPU backend - switch (Config.Core) { - case FEXCore::Config::CONFIG_IRJIT: - Thread->PassManager->InsertRegisterAllocationPass(); - Thread->CPUBackend = FEXCore::CPU::CreateArm64JITCore(this, Thread); - break; - case FEXCore::Config::CONFIG_CUSTOM: Thread->CPUBackend = CustomCPUFactory(this, Thread); break; - default: ERROR_AND_DIE_FMT("Unknown core configuration"); break; - } + Thread->PassManager->InsertRegisterAllocationPass(); + Thread->CPUBackend = FEXCore::CPU::CreateArm64JITCore(this, Thread); Thread->PassManager->Finalize(); } diff --git a/FEXCore/include/FEXCore/Config/Config.h b/FEXCore/include/FEXCore/Config/Config.h index 0c62631cfa..6fe65ab568 100644 --- a/FEXCore/include/FEXCore/Config/Config.h +++ b/FEXCore/include/FEXCore/Config/Config.h @@ -18,18 +18,6 @@ namespace FEXCore::Config { namespace Handler { - static inline std::optional CoreHandler(std::string_view Value) { - if (Value == "irjit") { - return "0"; - } -#ifdef _M_X86_64 - else if (Value == "host") { - return "1"; - } -#endif - return "0"; - } - static inline std::optional SMCCheckHandler(std::string_view Value) { if (Value == "none") { return "0"; @@ -60,11 +48,6 @@ enum ConfigOption { #define ENUMDEFINES #include -enum ConfigCore { - CONFIG_IRJIT, - CONFIG_CUSTOM, -}; - enum ConfigSMCChecks { CONFIG_SMC_NONE, CONFIG_SMC_MTRACK, diff --git a/FEXCore/include/FEXCore/Core/Context.h b/FEXCore/include/FEXCore/Core/Context.h index cd01962928..8921955ce8 100644 --- a/FEXCore/include/FEXCore/Core/Context.h +++ b/FEXCore/include/FEXCore/Core/Context.h @@ -68,14 +68,8 @@ class AOTIRWriter { virtual void Close() = 0; }; -struct VDSOSigReturn { - void* VDSO_kernel_sigreturn; - void* VDSO_kernel_rt_sigreturn; -}; - using CodeRangeInvalidationFn = std::function; -using CustomCPUFactoryType = std::function(Context*, Core::InternalThreadState* Thread)>; using CustomIREntrypointHandler = std::function; using ExitHandler = std::function; @@ -130,16 +124,6 @@ class Context { FEX_DEFAULT_VISIBILITY virtual void CompileRIP(FEXCore::Core::InternalThreadState* Thread, uint64_t GuestRIP) = 0; FEX_DEFAULT_VISIBILITY virtual void CompileRIPCount(FEXCore::Core::InternalThreadState* Thread, uint64_t GuestRIP, uint64_t MaxInst) = 0; - /** - * @brief Allows the frontend to pass in a custom CPUBackend creation factory - * - * This allows the frontend to have its own frontend. Typically for debugging - * - * @param CTX The context that we created - * @param Factory The factory that the context will call if the DefaultCore config ise set to CUSTOM - */ - FEX_DEFAULT_VISIBILITY virtual void SetCustomCPUBackendFactory(CustomCPUFactoryType Factory) = 0; - FEX_DEFAULT_VISIBILITY virtual void HandleCallback(FEXCore::Core::InternalThreadState* Thread, uint64_t RIP) = 0; ///< State reconstruction helpers diff --git a/Source/Tools/CodeSizeValidation/Main.cpp b/Source/Tools/CodeSizeValidation/Main.cpp index 513ae7a853..7c244b0d11 100644 --- a/Source/Tools/CodeSizeValidation/Main.cpp +++ b/Source/Tools/CodeSizeValidation/Main.cpp @@ -480,8 +480,6 @@ int main(int argc, char** argv, char** const envp) { // Setup configurations that this tool needs // Maximum one instruction. FEXCore::Config::EraseSet(FEXCore::Config::CONFIG_MAXINST, "1"); - // IRJIT. Only works on JITs. - FEXCore::Config::EraseSet(FEXCore::Config::CONFIG_CORE, fextl::fmt::format("{}", static_cast(FEXCore::Config::CONFIG_IRJIT))); // Enable block disassembly. FEXCore::Config::EraseSet( FEXCore::Config::CONFIG_DISASSEMBLE, diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h index 95dd99ccdb..ac6cd02429 100644 --- a/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h +++ b/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h @@ -151,7 +151,6 @@ class SignalDelegator final : public FEXCore::SignalDelegator, public FEXCore::A } FEX_CONFIG_OPT(Is64BitMode, IS64BIT_MODE); - FEX_CONFIG_OPT(Core, CORE); fextl::string const ApplicationName; FEXCORE_TELEMETRY_INIT(CrashMask, TYPE_CRASH_MASK); FEXCORE_TELEMETRY_INIT(UnhandledNonCanonical, TYPE_UNHANDLED_NONCANONICAL_ADDRESS); @@ -198,7 +197,7 @@ class SignalDelegator final : public FEXCore::SignalDelegator, public FEXCore::A bool InstallHostThunk(int Signal); bool UpdateHostThunk(int Signal); - FEXCore::Context::VDSOSigReturn VDSOPointers {}; + FEX::VDSO::VDSOSigReturn VDSOPointers {}; bool IsAddressInDispatcher(uint64_t Address) const { return Address >= Config.DispatcherBegin && Address < Config.DispatcherEnd; diff --git a/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp b/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp index 47b31a114b..482a47de49 100644 --- a/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp +++ b/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp @@ -20,7 +20,7 @@ #include namespace FEX::VDSO { -FEXCore::Context::VDSOSigReturn VDSOPointers {}; +VDSOSigReturn VDSOPointers {}; namespace VDSOHandlers { using TimeType = decltype(::time)*; using GetTimeOfDayType = decltype(::gettimeofday)*; @@ -678,7 +678,7 @@ const std::span GetVDSOThunkDefinitions() { return VDSODefinitions; } -const FEXCore::Context::VDSOSigReturn& GetVDSOSymbols() { +const VDSOSigReturn& GetVDSOSymbols() { return VDSOPointers; } } // namespace FEX::VDSO diff --git a/Source/Tools/LinuxEmulation/VDSO_Emulation.h b/Source/Tools/LinuxEmulation/VDSO_Emulation.h index a1dfcc9b81..897f1ea41f 100644 --- a/Source/Tools/LinuxEmulation/VDSO_Emulation.h +++ b/Source/Tools/LinuxEmulation/VDSO_Emulation.h @@ -5,10 +5,6 @@ #include "LinuxSyscalls/Syscalls.h" -namespace FEXCore::Context { -struct VDSOSigReturn; -} - namespace FEX::VDSO { using MapperFn = std::function; struct VDSOMapping { @@ -17,11 +13,16 @@ struct VDSOMapping { void* OptionalSigReturnMapping {}; size_t OptionalMappingSize {}; }; + +struct VDSOSigReturn { + void* VDSO_kernel_sigreturn; + void* VDSO_kernel_rt_sigreturn; +}; VDSOMapping LoadVDSOThunks(bool Is64Bit, FEX::HLE::SyscallHandler* const Handler); void UnloadVDSOMapping(const VDSOMapping& Mapping); uint64_t GetVSyscallEntry(const void* VDSOBase); const std::span GetVDSOThunkDefinitions(); -const FEXCore::Context::VDSOSigReturn& GetVDSOSymbols(); +const VDSOSigReturn& GetVDSOSymbols(); } // namespace FEX::VDSO diff --git a/Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp b/Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp index cb8a6e8ce2..68adcf0328 100644 --- a/Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp +++ b/Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp @@ -238,8 +238,6 @@ int main(int argc, char** argv, char** const envp) { FEXCore::Config::EraseSet(FEXCore::Config::CONFIG_DISABLE_VIXL_INDIRECT_RUNTIME_CALLS, "0"); #endif - FEX_CONFIG_OPT(Core, CORE); - #ifndef _WIN32 fextl::unique_ptr Allocator; @@ -276,21 +274,20 @@ int main(int argc, char** argv, char** const envp) { (!HostFeatures.SupportsAES256 && Loader.RequiresAES256()) || (!HostFeatures.SupportsAFP && Loader.RequiresAFP()); + bool IsHostRunner = false; #if !defined(VIXL_SIMULATOR) && defined(_M_X86_64) - const bool IsHostRunner = Core == FEXCore::Config::CONFIG_CUSTOM; - if (IsHostRunner) { - ///< Features that are only unsupported when running using the HostRunner and the CI machine doesn't support the feature getting tested. - Xbyak::util::Cpu X86Features {}; - const bool Supports3DNow = X86Features.has(Xbyak::util::Cpu::t3DN) && X86Features.has(Xbyak::util::Cpu::tE3DN); - const bool SupportsSSE4A = X86Features.has(Xbyak::util::Cpu::tSSE4a); - const bool SupportsBMI1 = X86Features.has(Xbyak::util::Cpu::tBMI1); - const bool SupportsBMI2 = X86Features.has(Xbyak::util::Cpu::tBMI2); - const bool SupportsCLWB = X86Features.has(Xbyak::util::Cpu::tCLWB); - - TestUnsupported |= (!Supports3DNow && Loader.Requires3DNow()) || (!SupportsSSE4A && Loader.RequiresSSE4A()) || - (!SupportsBMI1 && Loader.RequiresBMI1()) || (!SupportsBMI2 && Loader.RequiresBMI2()) || - (!SupportsCLWB && Loader.RequiresCLWB()); - } + IsHostRunner = true; + ///< Features that are only unsupported when running using the HostRunner and the CI machine doesn't support the feature getting tested. + Xbyak::util::Cpu X86Features {}; + const bool Supports3DNow = X86Features.has(Xbyak::util::Cpu::t3DN) && X86Features.has(Xbyak::util::Cpu::tE3DN); + const bool SupportsSSE4A = X86Features.has(Xbyak::util::Cpu::tSSE4a); + const bool SupportsBMI1 = X86Features.has(Xbyak::util::Cpu::tBMI1); + const bool SupportsBMI2 = X86Features.has(Xbyak::util::Cpu::tBMI2); + const bool SupportsCLWB = X86Features.has(Xbyak::util::Cpu::tCLWB); + + TestUnsupported |= (!Supports3DNow && Loader.Requires3DNow()) || (!SupportsSSE4A && Loader.RequiresSSE4A()) || + (!SupportsBMI1 && Loader.RequiresBMI1()) || (!SupportsBMI2 && Loader.RequiresBMI2()) || + (!SupportsCLWB && Loader.RequiresCLWB()); #endif #ifdef _WIN32 @@ -301,7 +298,7 @@ int main(int argc, char** argv, char** const envp) { return 0; } - if (Core != FEXCore::Config::CONFIG_CUSTOM) { + if (!IsHostRunner) { #ifndef _WIN32 auto SyscallHandler = Loader.Is64BitMode() ? FEX::HLE::x64::CreateHandler(CTX.get(), SignalDelegation.get()) : FEX::HLE::x32::CreateHandler(CTX.get(), SignalDelegation.get(), std::move(Allocator)); diff --git a/unittests/32Bit_ASM/CMakeLists.txt b/unittests/32Bit_ASM/CMakeLists.txt index 2c5bb6c39f..556dba9ea6 100644 --- a/unittests/32Bit_ASM/CMakeLists.txt +++ b/unittests/32Bit_ASM/CMakeLists.txt @@ -51,9 +51,9 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(TEST_ARGS) if (_M_ARM_64 OR ENABLE_VIXL_SIMULATOR) list(APPEND TEST_ARGS - "--no-silent -g -c irjit -n 1 --no-multiblock" "jit_1" "jit" - "--no-silent -g -c irjit -n 500 --no-multiblock" "jit_500" "jit" - "--no-silent -g -c irjit -n 500 --multiblock" "jit_500_m" "jit" + "--no-silent -g -n 1 --no-multiblock" "jit_1" "jit" + "--no-silent -g -n 500 --no-multiblock" "jit_500" "jit" + "--no-silent -g -n 500 --multiblock" "jit_500_m" "jit" ) endif() @@ -61,7 +61,7 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(CPU_CLASS Simulator) elseif (_M_X86_64) list(APPEND TEST_ARGS - "--no-silent -g -c host" "host" "host" + "--no-silent -g" "host" "host" ) endif() diff --git a/unittests/ASM/CMakeLists.txt b/unittests/ASM/CMakeLists.txt index c69f54de8b..2e259e0acf 100644 --- a/unittests/ASM/CMakeLists.txt +++ b/unittests/ASM/CMakeLists.txt @@ -53,9 +53,9 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(TEST_ARGS) if (_M_ARM_64 OR ENABLE_VIXL_SIMULATOR) list(APPEND TEST_ARGS - "--no-silent -g -c irjit -n 1 --no-multiblock" "jit_1" "jit" - "--no-silent -g -c irjit -n 500 --no-multiblock" "jit_500" "jit" - "--no-silent -g -c irjit -n 500 --multiblock" "jit_500_m" "jit" + "--no-silent -g -n 1 --no-multiblock" "jit_1" "jit" + "--no-silent -g -n 500 --no-multiblock" "jit_500" "jit" + "--no-silent -g -n 500 --multiblock" "jit_500_m" "jit" ) endif() @@ -63,7 +63,7 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(CPU_CLASS Simulator) elseif (_M_X86_64) list(APPEND TEST_ARGS - "--no-silent -g -c host" "host" "host" + "--no-silent -g" "host" "host" ) endif() diff --git a/unittests/FEXLinuxTests/CMakeLists.txt b/unittests/FEXLinuxTests/CMakeLists.txt index 5279773bd0..827c357d55 100644 --- a/unittests/FEXLinuxTests/CMakeLists.txt +++ b/unittests/FEXLinuxTests/CMakeLists.txt @@ -65,7 +65,7 @@ function(AddTests Tests BinDirectory Bitness) "guest" "$" ${THUNK_ARGS} - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" + "-o" "stderr" "--no-silent" "-n" "500" "--" "${BIN_PATH}") if (_M_X86_64 AND NOT TEST_NAME STREQUAL "thunk_testlib") diff --git a/unittests/POSIX/CMakeLists.txt b/unittests/POSIX/CMakeLists.txt index eeb84b811a..10e8024672 100644 --- a/unittests/POSIX/CMakeLists.txt +++ b/unittests/POSIX/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(POSIX_TEST ${POSIX_TESTS}) "${TEST_NAME}" "guest" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" + "-o" "stderr" "--no-silent" "-n" "500" "--" "${POSIX_TEST}") set_property(TEST "${TEST_NAME}.jit.posix" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() diff --git a/unittests/ThunkFunctionalTests/CMakeLists.txt b/unittests/ThunkFunctionalTests/CMakeLists.txt index 8e10ea3eb3..cbcff7f1db 100644 --- a/unittests/ThunkFunctionalTests/CMakeLists.txt +++ b/unittests/ThunkFunctionalTests/CMakeLists.txt @@ -4,7 +4,7 @@ function(AddThunksTest Bin ThunksFile) set (ARGS "-t" "${CMAKE_INSTALL_PREFIX}/lib/fex-emu/HostThunks" "-j" "${CMAKE_INSTALL_PREFIX}/share/fex-emu/GuestThunks" - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" + "-o" "stderr" "--no-silent" "-n" "500" ) if (NOT ThunksFile) set (TEST_NAME ThunkFunctionalTest-NoThunks-${Bin}) diff --git a/unittests/gcc-target-tests-32/CMakeLists.txt b/unittests/gcc-target-tests-32/CMakeLists.txt index d5bd27c6e9..ff5f3187f6 100644 --- a/unittests/gcc-target-tests-32/CMakeLists.txt +++ b/unittests/gcc-target-tests-32/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(TEST ${TESTS}) "${TEST_NAME}" "guest" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" + "-o" "stderr" "--no-silent" "-n" "500" "--" "${TEST}") set_property(TEST "${TEST_NAME}.jit.gcc-target-32" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() diff --git a/unittests/gcc-target-tests-64/CMakeLists.txt b/unittests/gcc-target-tests-64/CMakeLists.txt index eb92e0f499..59ee1b4b16 100644 --- a/unittests/gcc-target-tests-64/CMakeLists.txt +++ b/unittests/gcc-target-tests-64/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(TEST ${TESTS}) "${TEST_NAME}" "guest" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" + "-o" "stderr" "--no-silent" "-n" "500" "--" "${TEST}") set_property(TEST "${TEST_NAME}.jit.gcc-target-64" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() diff --git a/unittests/gvisor-tests/CMakeLists.txt b/unittests/gvisor-tests/CMakeLists.txt index 0e304e1079..63097a6284 100644 --- a/unittests/gvisor-tests/CMakeLists.txt +++ b/unittests/gvisor-tests/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(TEST ${TESTS}) "${TEST_NAME}" "guest" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" + "-o" "stderr" "--no-silent" "-n" "500" "--" "${TEST}") set_property(TEST "${TEST_NAME}.jit.gvisor" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach()