Skip to content

Commit

Permalink
ifdef LLVM versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlen
mlen committed Oct 10, 2018
1 parent 719c34e commit c86d02b
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 16 deletions.
20 changes: 10 additions & 10 deletions src/ast/codegen_llvm.cpp
View file
Expand Up @@ -429,7 +429,7 @@ void CodegenLLVM::visit(Call &call)
arg.accept(*this);
Value *offset = b_.CreateGEP(printf_args, {b_.getInt32(0), b_.getInt32(i)});
if (arg.type.IsArray())
b_.CreateMemCpy(offset, 0, expr_, 0, arg.type.size);
b_.CREATE_MEMCPY(offset, expr_, arg.type.size, 1);
else
b_.CreateStore(expr_, offset);
}
Expand Down Expand Up @@ -478,7 +478,7 @@ void CodegenLLVM::visit(Call &call)
arg.accept(*this);
Value *offset = b_.CreateGEP(system_args, {b_.getInt32(0), b_.getInt32(i)});
if (arg.type.IsArray())
b_.CreateMemCpy(offset, 0, expr_, 0, arg.type.size);
b_.CREATE_MEMCPY(offset, expr_, arg.type.size, 1);
else
b_.CreateStore(expr_, offset);
}
Expand Down Expand Up @@ -551,7 +551,7 @@ void CodegenLLVM::visit(Call &call)
b_.CreateStore(b_.getInt64(0), b_.CreateGEP(perfdata, {b_.getInt64(0), b_.getInt64(sizeof(uint64_t) + sizeof(uint64_t))}));

// store map ident:
b_.CreateMemCpy(b_.CreateGEP(perfdata, {b_.getInt64(0), b_.getInt64(sizeof(uint64_t) + 2 * sizeof(uint64_t))}), 0, str_buf, 0, map.ident.length() + 1);
b_.CREATE_MEMCPY(b_.CreateGEP(perfdata, {b_.getInt64(0), b_.getInt64(sizeof(uint64_t) + 2 * sizeof(uint64_t))}), str_buf, map.ident.length() + 1, 1);
b_.CreatePerfEventOutput(ctx_, perfdata, sizeof(uint64_t) + 2 * sizeof(uint64_t) + map.ident.length() + 1);
b_.CreateLifetimeEnd(perfdata);
expr_ = nullptr;
Expand All @@ -570,7 +570,7 @@ void CodegenLLVM::visit(Call &call)
b_.CreateStore(b_.getInt64(asyncactionint(AsyncAction::clear)), perfdata);
else
b_.CreateStore(b_.getInt64(asyncactionint(AsyncAction::zero)), perfdata);
b_.CreateMemCpy(b_.CreateGEP(perfdata, {b_.getInt64(0), b_.getInt64(sizeof(uint64_t))}), 0, str_buf, 0, map.ident.length() + 1);
b_.CREATE_MEMCPY(b_.CreateGEP(perfdata, {b_.getInt64(0), b_.getInt64(sizeof(uint64_t))}), str_buf, map.ident.length() + 1, 1);
b_.CreatePerfEventOutput(ctx_, perfdata, sizeof(uint64_t) + map.ident.length() + 1);
b_.CreateLifetimeEnd(perfdata);
expr_ = nullptr;
Expand Down Expand Up @@ -764,12 +764,12 @@ void CodegenLLVM::visit(Ternary &ternary)
// copy selected string via CreateMemCpy
b_.SetInsertPoint(left_block);
ternary.left->accept(*this);
b_.CreateMemCpy(buf, 0, expr_, 0, ternary.type.size);
b_.CREATE_MEMCPY(buf, expr_, ternary.type.size, 1);
b_.CreateBr(done);

b_.SetInsertPoint(right_block);
ternary.right->accept(*this);
b_.CreateMemCpy(buf, 0, expr_, 0, ternary.type.size);
b_.CREATE_MEMCPY(buf, expr_, ternary.type.size, 1);
b_.CreateBr(done);

b_.SetInsertPoint(done);
Expand All @@ -796,7 +796,7 @@ void CodegenLLVM::visit(FieldAccess &acc)
{
// TODO This should be do-able without allocating more memory here
AllocaInst *dst = b_.CreateAllocaBPF(field.type, "internal_" + type.cast_type + "." + acc.field);
b_.CreateMemCpy(dst, 0, src, 0, field.type.size);
b_.CREATE_MEMCPY(dst, src, field.type.size, 1);
expr_ = dst;
// TODO clean up dst memory?
}
Expand Down Expand Up @@ -920,7 +920,7 @@ void CodegenLLVM::visit(AssignVarStatement &assignment)
}
else
{
b_.CreateMemCpy(variables_[var.ident], 0, expr_, 0, var.type.size);
b_.CREATE_MEMCPY(variables_[var.ident], expr_, var.type.size, 1);
}
}

Expand Down Expand Up @@ -1119,7 +1119,7 @@ AllocaInst *CodegenLLVM::getMapKey(Map &map)
expr->accept(*this);
Value *offset_val = b_.CreateGEP(key, {b_.getInt64(0), b_.getInt64(offset)});
if (expr->type.type == Type::string || expr->type.type == Type::usym)
b_.CreateMemCpy(offset_val, 0, expr_, 0, expr->type.size);
b_.CREATE_MEMCPY(offset_val, expr_, expr->type.size, 1);
else
b_.CreateStore(expr_, offset_val);
offset += expr->type.size;
Expand Down Expand Up @@ -1149,7 +1149,7 @@ AllocaInst *CodegenLLVM::getHistMapKey(Map &map, Value *log2)
expr->accept(*this);
Value *offset_val = b_.CreateGEP(key, {b_.getInt64(0), b_.getInt64(offset)});
if (expr->type.type == Type::string || expr->type.type == Type::usym)
b_.CreateMemCpy(offset_val, 0, expr_, 0, expr->type.size);
b_.CREATE_MEMCPY(offset_val, expr_, expr->type.size, 1);
else
b_.CreateStore(expr_, offset_val);
offset += expr->type.size;
Expand Down
2 changes: 1 addition & 1 deletion src/ast/irbuilderbpf.cpp
View file
Expand Up @@ -193,7 +193,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Map &map, AllocaInst *key)

SetInsertPoint(lookup_success_block);
if (map.type.type == Type::string || map.type.type == Type::cast)
CreateMemCpy(value, 0, call, 0, map.type.size, 1);
CREATE_MEMCPY(value, call, map.type.size, 1);
else
CreateStore(CreateLoad(getInt64Ty(), call), value);
CreateBr(lookup_merge_block);
Expand Down
9 changes: 9 additions & 0 deletions src/ast/irbuilderbpf.h
View file
Expand Up @@ -6,6 +6,15 @@
#include "types.h"

#include <llvm/IR/IRBuilder.h>
#include <llvm/Config/llvm-config.h>

#if LLVM_VERSION_MAJOR >= 5 && LLVM_VERSION_MAJOR < 7
#define CREATE_MEMCPY(dst, src, size, algn) CreateMemCpy((dst), (src), (size), (algn))
#elif LLVM_VERSION_MAJOR >= 7
#define CREATE_MEMCPY(dst, src, size, algn) CreateMemCpy((dst), (algn), (src), (algn), (size))
#else
#error Unsupported LLVM version
#endif

namespace bpftrace {
namespace ast {
Expand Down
48 changes: 43 additions & 5 deletions src/bpforc.h
View file
Expand Up @@ -5,8 +5,10 @@
#include "llvm/ExecutionEngine/SectionMemoryManager.h"
#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
#include "llvm/ExecutionEngine/Orc/LambdaResolver.h"
#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Config/llvm-config.h"

namespace bpftrace {

Expand Down Expand Up @@ -36,6 +38,42 @@ class MemoryManager : public SectionMemoryManager
std::map<std::string, std::tuple<uint8_t *, uintptr_t>> &sections_;
};

#if LLVM_VERSION_MAJOR >= 5 && LLVM_VERSION_MAJOR < 7
class BpfOrc
{
private:
std::unique_ptr<TargetMachine> TM;
RTDyldObjectLinkingLayer ObjectLayer;
IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;

public:
std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_;

using ModuleHandle = decltype(CompileLayer)::ModuleHandleT;

BpfOrc(TargetMachine *TM_)
: TM(TM_),
ObjectLayer([this]() { return std::make_shared<MemoryManager>(sections_); }),
CompileLayer(ObjectLayer, SimpleCompiler(*TM))
{
}

void compileModule(std::unique_ptr<Module> M)
{
auto mod = addModule(move(M));
CompileLayer.emitAndFinalize(mod);
}

ModuleHandle addModule(std::unique_ptr<Module> M) {
// We don't actually care about resolving symbols from other modules
auto Resolver = createLambdaResolver(
[](const std::string &Name) { return JITSymbol(nullptr); },
[](const std::string &Name) { return JITSymbol(nullptr); });

return cantFail(CompileLayer.addModule(std::move(M), std::move(Resolver)));
}
};
#elif LLVM_VERSION_MAJOR >= 7
class BpfOrc
{
private:
Expand All @@ -54,12 +92,9 @@ class BpfOrc
[](const std::string &Name) -> JITSymbol { return nullptr; },
[](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
CompileLayer(ObjectLayer, SimpleCompiler(*TM))
{
}
CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}

void compileModule(std::unique_ptr<Module> M)
{
void compileModule(std::unique_ptr<Module> M) {
auto K = addModule(move(M));
CompileLayer.emitAndFinalize(K);
}
Expand All @@ -70,5 +105,8 @@ class BpfOrc
return K;
}
};
#else
#error Unsupported LLVM version
#endif

} // namespace bpftrace

0 comments on commit c86d02b

Please sign in to comment.