Skip to content

S
swiftshader
Commit 827e9a28 by Nicolas Capens Committed by Nicolas Capens
Options

Fix LLVM host triple for ORCv2 JIT

llvm::orc::JITTargetMachineBuilder::detectHost() currently states: // FIXME: getProcessTriple is bogus. It returns the host LLVM was compiled on, // rather than a valid triple for the current process. This change uses LLVM_DEFAULT_TARGET_TRIPLE instead, which we define based on the platform and predefined macros (see llvm-config.h). This doesn't fix any known bugs, but it's good to not leave the triple unknown, to avoid future issues. This change also refactors passing the JITTargetMachineBuilder by rvalue reference and uses some less cryptic variable names. Bug: b/171236524 Change-Id: I7be752be66082654307210817250eb1dd025cb0c Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/49851Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>
parent e1012cfc
Showing with 54 additions and 24 deletions
.vscode/c_cpp_properties.json
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"${workspaceFolder}/src", "${workspaceFolder}/src",
"${workspaceFolder}/third_party/benchmark/include", "${workspaceFolder}/third_party/benchmark/include",
"${workspaceFolder}/third_party/cppdap/include", "${workspaceFolder}/third_party/cppdap/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/common/include", "${workspaceFolder}/third_party/llvm-10.0/configs/common/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/windows/include", "${workspaceFolder}/third_party/llvm-10.0/configs/windows/include",
"${workspaceFolder}/third_party/llvm-7.0/llvm/include", "${workspaceFolder}/third_party/llvm-10.0/llvm/include",
"${workspaceFolder}/third_party/marl/include", "${workspaceFolder}/third_party/marl/include",
"${workspaceFolder}/third_party/SPIRV-Headers/include", "${workspaceFolder}/third_party/SPIRV-Headers/include",
"${workspaceFolder}/third_party/SPIRV-Tools/include" "${workspaceFolder}/third_party/SPIRV-Tools/include"
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
"${workspaceFolder}/src", "${workspaceFolder}/src",
"${workspaceFolder}/third_party/benchmark/include", "${workspaceFolder}/third_party/benchmark/include",
"${workspaceFolder}/third_party/cppdap/include", "${workspaceFolder}/third_party/cppdap/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/common/include", "${workspaceFolder}/third_party/llvm-10.0/configs/common/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/windows/include", "${workspaceFolder}/third_party/llvm-10.0/configs/windows/include",
"${workspaceFolder}/third_party/llvm-7.0/llvm/include", "${workspaceFolder}/third_party/llvm-10.0/llvm/include",
"${workspaceFolder}/third_party/marl/include", "${workspaceFolder}/third_party/marl/include",
"${workspaceFolder}/third_party/SPIRV-Headers/include", "${workspaceFolder}/third_party/SPIRV-Headers/include",
"${workspaceFolder}/third_party/SPIRV-Tools/include" "${workspaceFolder}/third_party/SPIRV-Tools/include"
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
"${workspaceFolder}/src", "${workspaceFolder}/src",
"${workspaceFolder}/third_party/benchmark/include", "${workspaceFolder}/third_party/benchmark/include",
"${workspaceFolder}/third_party/cppdap/include", "${workspaceFolder}/third_party/cppdap/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/common/include", "${workspaceFolder}/third_party/llvm-10.0/configs/common/include",
"${workspaceFolder}/third_party/llvm-7.0/configs/windows/include", "${workspaceFolder}/third_party/llvm-10.0/configs/windows/include",
"${workspaceFolder}/third_party/llvm-7.0/llvm/include", "${workspaceFolder}/third_party/llvm-10.0/llvm/include",
"${workspaceFolder}/third_party/marl/include", "${workspaceFolder}/third_party/marl/include",
"${workspaceFolder}/third_party/SPIRV-Headers/include", "${workspaceFolder}/third_party/SPIRV-Headers/include",
"${workspaceFolder}/third_party/SPIRV-Tools/include" "${workspaceFolder}/third_party/SPIRV-Tools/include"
......
src/Reactor/BUILD.gn
...@@ -351,7 +351,7 @@ if (supports_llvm) { ...@@ -351,7 +351,7 @@ if (supports_llvm) {
} else if (is_mac) { } else if (is_mac) {
include_dirs += [ "$llvm_dir/configs/darwin/include/" ] include_dirs += [ "$llvm_dir/configs/darwin/include/" ]
} else { } else {
assert(false, "llvm-7.0 not configured for target platform") assert(false, "llvm not configured for target platform")
} }
} }
} }
......
src/Reactor/LLVMJIT.cpp
...@@ -29,6 +29,7 @@ __pragma(warning(push)) ...@@ -29,6 +29,7 @@ __pragma(warning(push))
#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h" #include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
#include "llvm/ExecutionEngine/SectionMemoryManager.h" #include "llvm/ExecutionEngine/SectionMemoryManager.h"
#include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/LegacyPassManager.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/TargetSelect.h" #include "llvm/Support/TargetSelect.h"
#include "llvm/Transforms/InstCombine/InstCombine.h" #include "llvm/Transforms/InstCombine/InstCombine.h"
#include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Scalar.h"
...@@ -65,13 +66,14 @@ public: ...@@ -65,13 +66,14 @@ public:
llvm::orc::JITTargetMachineBuilder getTargetMachineBuilder(rr::Optimization::Level optLevel) const; llvm::orc::JITTargetMachineBuilder getTargetMachineBuilder(rr::Optimization::Level optLevel) const;
const llvm::DataLayout &getDataLayout() const; const llvm::DataLayout &getDataLayout() const;
const llvm::Triple getTargetTriple() const; const llvm::Triple &getTargetTriple() const;
private: private:
JITGlobals(const llvm::orc::JITTargetMachineBuilder &jtmb, const llvm::DataLayout &dataLayout); JITGlobals(llvm::orc::JITTargetMachineBuilder &&jitTargetMachineBuilder, llvm::DataLayout &&dataLayout);
static llvm::CodeGenOpt::Level toLLVM(rr::Optimization::Level level); static llvm::CodeGenOpt::Level toLLVM(rr::Optimization::Level level);
const llvm::orc::JITTargetMachineBuilder jtmb;
const llvm::orc::JITTargetMachineBuilder jitTargetMachineBuilder;
const llvm::DataLayout dataLayout; const llvm::DataLayout dataLayout;
}; };
...@@ -82,19 +84,47 @@ JITGlobals *JITGlobals::get() ...@@ -82,19 +84,47 @@ JITGlobals *JITGlobals::get()
llvm::InitializeNativeTargetAsmPrinter(); llvm::InitializeNativeTargetAsmPrinter();
llvm::InitializeNativeTargetAsmParser(); llvm::InitializeNativeTargetAsmParser();
auto jtmb = llvm::orc::JITTargetMachineBuilder::detectHost(); // TODO(b/171236524): JITTargetMachineBuilder::detectHost() currently uses the target triple of the host,
ASSERT_MSG(jtmb, "JITTargetMachineBuilder::detectHost() failed"); // rather than a valid triple for the current process. Once fixed, we can use that function instead.
auto dataLayout = jtmb->getDefaultDataLayoutForTarget(); llvm::orc::JITTargetMachineBuilder jitTargetMachineBuilder(llvm::Triple(LLVM_DEFAULT_TARGET_TRIPLE));
// Retrieve host CPU name and sub-target features and add them to builder.
// Relocation model, code model and codegen opt level are kept to default values.
llvm::StringMap<bool> cpuFeatures;
bool ok = llvm::sys::getHostCPUFeatures(cpuFeatures);
#if defined(__i386__) || defined(__x86_64__) || \
(defined(__linux__) && (defined(__arm__) || defined(__aarch64__)))
ASSERT_MSG(ok, "llvm::sys::getHostCPUFeatures returned false");
#else
(void)ok; // getHostCPUFeatures always returns false on other platforms
#endif
for(auto &feature : cpuFeatures)
{
jitTargetMachineBuilder.getFeatures().AddFeature(feature.first(), feature.second);
}
#if LLVM_VERSION_MAJOR >= 11 /* TODO(b/165000222): Unconditional after LLVM 11 upgrade */
jitTargetMachineBuilder.setCPU(std::string(llvm::sys::getHostCPUName()));
#else
jitTargetMachineBuilder.setCPU(llvm::sys::getHostCPUName());
#endif
auto dataLayout = jitTargetMachineBuilder.getDefaultDataLayoutForTarget();
ASSERT_MSG(dataLayout, "JITTargetMachineBuilder::getDefaultDataLayoutForTarget() failed"); ASSERT_MSG(dataLayout, "JITTargetMachineBuilder::getDefaultDataLayoutForTarget() failed");
return JITGlobals(jtmb.get(), dataLayout.get());
return JITGlobals(std::move(jitTargetMachineBuilder), std::move(dataLayout.get()));
}(); }();
return &instance; return &instance;
} }
llvm::orc::JITTargetMachineBuilder JITGlobals::getTargetMachineBuilder(rr::Optimization::Level optLevel) const llvm::orc::JITTargetMachineBuilder JITGlobals::getTargetMachineBuilder(rr::Optimization::Level optLevel) const
{ {
llvm::orc::JITTargetMachineBuilder out = jtmb; llvm::orc::JITTargetMachineBuilder out = jitTargetMachineBuilder;
out.setCodeGenOptLevel(toLLVM(optLevel)); out.setCodeGenOptLevel(toLLVM(optLevel));
return out; return out;
} }
...@@ -103,13 +133,13 @@ const llvm::DataLayout &JITGlobals::getDataLayout() const ...@@ -103,13 +133,13 @@ const llvm::DataLayout &JITGlobals::getDataLayout() const
return dataLayout; return dataLayout;
} }
const llvm::Triple JITGlobals::getTargetTriple() const const llvm::Triple &JITGlobals::getTargetTriple() const
{ {
return jtmb.getTargetTriple(); return jitTargetMachineBuilder.getTargetTriple();
} }
JITGlobals::JITGlobals(const llvm::orc::JITTargetMachineBuilder &jtmb, const llvm::DataLayout &dataLayout) JITGlobals::JITGlobals(llvm::orc::JITTargetMachineBuilder &&jitTargetMachineBuilder, llvm::DataLayout &&dataLayout)
: jtmb(jtmb) : jitTargetMachineBuilder(jitTargetMachineBuilder)
, dataLayout(dataLayout) , dataLayout(dataLayout)
{ {
} }
...@@ -529,8 +559,8 @@ public: ...@@ -529,8 +559,8 @@ public:
size_t count, size_t count,
const rr::Config &config) const rr::Config &config)
: objectLayer(session, []() { : objectLayer(session, []() {
static MemoryMapper mm; static MemoryMapper memoryMapper;
return std::make_unique<llvm::SectionMemoryManager>(&mm); return std::make_unique<llvm::SectionMemoryManager>(&memoryMapper);
}) })
, compileLayer(session, objectLayer, std::make_unique<llvm::orc::ConcurrentIRCompiler>(JITGlobals::get()->getTargetMachineBuilder(config.getOptimization().getLevel()))) , compileLayer(session, objectLayer, std::make_unique<llvm::orc::ConcurrentIRCompiler>(JITGlobals::get()->getTargetMachineBuilder(config.getOptimization().getLevel())))
, mangle(session, JITGlobals::get()->getDataLayout()) , mangle(session, JITGlobals::get()->getDataLayout())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment