Skip to content

Commit c4491f6

Browse files
committed
Fix tests
1 parent b09ce70 commit c4491f6

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

test/source/kitgenbench.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ namespace setups {
4444
typename TLogger = kitgenbench::setup::NoLogger,
4545
typename TChecker = kitgenbench::setup::NoChecker>
4646
struct InstructionDetails {
47-
Aggregate<kitgenbench::setup::NoRecipe> recipes{};
48-
Aggregate<kitgenbench::setup::NoLogger> loggers{};
49-
Aggregate<kitgenbench::setup::NoChecker> checkers{};
47+
Aggregate<TRecipe> recipes{};
48+
Aggregate<TLogger> loggers{};
49+
Aggregate<TChecker> checkers{};
5050

5151
auto sendTo([[maybe_unused]] auto const& device, [[maybe_unused]] auto& queue) {
5252
// This is not exactly how it's supposed to be used (or at least it's not necessary). You
@@ -121,15 +121,18 @@ TEST_CASE("Single size malloc") {
121121

122122
namespace setups::mallocFreeManySize {
123123

124+
std::vector<std::uint32_t> ALLOCATION_SIZES
125+
= {16U, 256U, 1024U, 16U, 16U, 256U, 16U, 1024U, 1024U};
124126
struct MallocFreeRecipe {
125-
std::vector<std::uint32_t> sizes{};
127+
std::vector<std::uint32_t> sizes{ALLOCATION_SIZES};
126128
std::uint32_t currentIndex{0U};
127129
void* currentPointer{nullptr};
128130

129131
ALPAKA_FN_ACC auto next([[maybe_unused]] const auto& acc) {
130-
if (currentIndex >= sizes.size())
132+
if (currentIndex >= sizes.size()) {
131133
return std::make_tuple(kitgenbench::Actions::STOP,
132134
std::span<std::byte>{static_cast<std::byte*>(nullptr), 0U});
135+
}
133136

134137
if (currentPointer == nullptr) {
135138
currentPointer = malloc(sizes[currentIndex]);
@@ -150,8 +153,6 @@ namespace setups::mallocFreeManySize {
150153
nlohmann::json generateReport() { return {}; }
151154
};
152155

153-
std::vector<std::uint32_t> ALLOCATION_SIZES
154-
= {16U, 256U, 1024U, 16U, 16U, 256U, 16U, 1024U, 1024U};
155156
auto makeInstructionDetails() { return InstructionDetails<MallocFreeRecipe>{}; }
156157

157158
namespace detail {

0 commit comments

Comments
 (0)