zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-01-21 06:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add CPU misdetection workaround for the Pentium G840 and a llvm_cpu CVAR that can force codegen to a specific CPU architecture

Browse source
This commit is contained in:
Magnus Norddahl 2016-11-03 12:02:07 +01:00
parent 7cba67ad45
commit 356830a8c8
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/r_compiler/llvmdrawers.cpp
View file

@ -35,6 +35,14 @@
#include "r_compiler/ssa/ssa_struct_type.h" #include "r_compiler/ssa/ssa_struct_type.h"
#include "r_compiler/ssa/ssa_value.h" #include "r_compiler/ssa/ssa_value.h"
#include "r_compiler/ssa/ssa_barycentric_weight.h" #include "r_compiler/ssa/ssa_barycentric_weight.h"
#include "x86.h"
#include "c_cvars.h"
#include "version.h"
CUSTOM_CVAR(String, llvm_cpu, "auto", CVAR_ARCHIVE | CVAR_NOINITCALL)
{
Printf("You must restart " GAMENAME " for this change to take effect.\n");
}
class LLVMProgram class LLVMProgram
{ {
@ -485,12 +493,22 @@ void LLVMProgram::CreateEE()
std::string errorstring; std::string errorstring;
std::string mcpu = sys::getHostCPUName();
if (std::string(CPU.CPUString).find("G840") && mcpu == "sandybridge")
mcpu = "westmere"; // Pentium G840 is misdetected as a sandy bridge CPU
if (stricmp(llvm_cpu, "auto") != 0)
{
mcpu = llvm_cpu;
Printf("Overriding LLVM CPU target to %s\n", mcpu.c_str());
}
llvm::Module *module = mModule.get(); llvm::Module *module = mModule.get();
EngineBuilder engineBuilder(std::move(mModule)); EngineBuilder engineBuilder(std::move(mModule));
engineBuilder.setErrorStr(&errorstring); engineBuilder.setErrorStr(&errorstring);
engineBuilder.setOptLevel(CodeGenOpt::Aggressive); engineBuilder.setOptLevel(CodeGenOpt::Aggressive);
engineBuilder.setEngineKind(EngineKind::JIT); engineBuilder.setEngineKind(EngineKind::JIT);
engineBuilder.setMCPU(sys::getHostCPUName()); engineBuilder.setMCPU(mcpu);
machine = engineBuilder.selectTarget(); machine = engineBuilder.selectTarget();
if (!machine) if (!machine)
I_FatalError("Could not create LLVM target machine"); I_FatalError("Could not create LLVM target machine");