Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 33 additions & 21 deletions orc-rt/unittests/AllocActionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "orc-rt/ExecutorAddress.h"
#include "orc-rt/SPSAllocAction.h"

#include "SimplePackedSerializationTestUtils.h"
#include "AllocActionTestUtils.h"
#include "gtest/gtest.h"

using namespace orc_rt;
Expand Down Expand Up @@ -77,11 +77,14 @@ TEST(AllocActionTest, RunFinalizationActionsComplete) {

std::vector<AllocActionPair> InitialActions;

auto MakeArgBuffer = [&]() { return makeExecutorAddrBuffer(&Val); };
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
auto MakeAAOnVal = [&](AllocActionFn Fn) {
return *MakeAllocAction<SPSExecutorAddr>::from(Fn,
ExecutorAddr::fromPtr(&Val));
};
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});

auto DeallocActions = cantFail(runFinalizeActions(std::move(InitialActions)));

Expand All @@ -102,11 +105,14 @@ TEST(AllocActionTest, RunFinalizeActionsFail) {

std::vector<AllocActionPair> InitialActions;

auto MakeArgBuffer = [&]() { return makeExecutorAddrBuffer(&Val); };
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
InitialActions.push_back({{fail_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
auto MakeAAOnVal = [&](AllocActionFn Fn) {
return *MakeAllocAction<SPSExecutorAddr>::from(Fn,
ExecutorAddr::fromPtr(&Val));
};
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});
InitialActions.push_back({*MakeAllocAction<>::from(fail_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});

auto DeallocActions = runFinalizeActions(std::move(InitialActions));

Expand All @@ -126,11 +132,14 @@ TEST(AllocActionTest, RunFinalizeActionsNullFinalize) {

std::vector<AllocActionPair> InitialActions;

auto MakeArgBuffer = [&]() { return makeExecutorAddrBuffer(&Val); };
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
InitialActions.push_back({{nullptr, WrapperFunctionBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
auto MakeAAOnVal = [&](AllocActionFn Fn) {
return *MakeAllocAction<SPSExecutorAddr>::from(Fn,
ExecutorAddr::fromPtr(&Val));
};
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});
InitialActions.push_back({*MakeAllocAction<>::from(nullptr),
MakeAAOnVal(decrement_sps_allocaction)});

auto DeallocActions = cantFail(runFinalizeActions(std::move(InitialActions)));

Expand All @@ -148,11 +157,14 @@ TEST(AllocActionTest, RunFinalizeActionsNullDealloc) {

std::vector<AllocActionPair> InitialActions;

auto MakeArgBuffer = [&]() { return makeExecutorAddrBuffer(&Val); };
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{decrement_sps_allocaction, MakeArgBuffer()}});
InitialActions.push_back({{increment_sps_allocaction, MakeArgBuffer()},
{nullptr, WrapperFunctionBuffer()}});
auto MakeAAOnVal = [&](AllocActionFn Fn) {
return *MakeAllocAction<SPSExecutorAddr>::from(Fn,
ExecutorAddr::fromPtr(&Val));
};
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
MakeAAOnVal(decrement_sps_allocaction)});
InitialActions.push_back({MakeAAOnVal(increment_sps_allocaction),
*MakeAllocAction<>::from(nullptr)});

auto DeallocActions = cantFail(runFinalizeActions(std::move(InitialActions)));

Expand Down
30 changes: 30 additions & 0 deletions orc-rt/unittests/AllocActionTestUtils.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//===- AllocActionTestUtils.h ---------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#ifndef ORC_RT_UNITTEST_ALLOCACTIONTESTUTILS_H
#define ORC_RT_UNITTEST_ALLOCACTIONTESTUTILS_H

#include "SimplePackedSerializationTestUtils.h"
#include "orc-rt/AllocAction.h"

#include <optional>

template <typename... SPSArgTs> struct MakeAllocAction {
template <typename... ArgTs>
static std::optional<orc_rt::AllocAction> from(orc_rt::AllocActionFn Fn,
ArgTs &&...Args) {
using SPS = orc_rt::SPSArgList<SPSArgTs...>;
auto B = orc_rt::WrapperFunctionBuffer::allocate(SPS::size(Args...));
orc_rt::SPSOutputBuffer OB(B.data(), B.size());
if (!SPS::serialize(OB, Args...))
return std::nullopt;
return orc_rt::AllocAction(Fn, std::move(B));
}
};

#endif // ORC_RT_UNITTEST_ALLOCACTIONTESTUTILS_H
Loading