Skip to content

Commit

Permalink
microkernel tester filename changes for reduce-window-d files
Browse files Browse the repository at this point in the history
  • Loading branch information
vishalchaudharymcw committed Oct 21, 2024
1 parent a2723a1 commit c56dae2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ sh_test(
name = "%s_test" % kernel,
srcs = [
"%s.cc" % kernel.replace("_", "-"),
"rwd-microkernel-tester.h",
"reducewindow-d-microkernel-tester.h",
],
deps = MICROKERNEL_TEST_DEPS,
) for kernel in [
Expand Down
5 changes: 2 additions & 3 deletions test/f32-rwdsum.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@

#include "xnnpack/microparams-init.h"
#include "xnnpack/reduce.h"
#include "rwd-microkernel-tester.h"
#include "reducewindow-d-microkernel-tester.h"
#define XNN_UKERNEL_WITH_PARAMS(arch_flags, ukernel, batch_tile, vector_tile, datatype, void, init_params) \
XNN_TEST_RWD_CHANNEL_EQ_ROW_EQ(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params); \
XNN_TEST_RWD_CHANNEL_EQ_ROW_GT(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params); \
XNN_TEST_RWD_CHANNEL_GT_ROW_EQ(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params); \
XNN_TEST_RWD_CHANNEL_GT_ROW_GT(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params); \
XNN_TEST_RWD_CHANNEL_EQ_ROW_258(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params);
XNN_TEST_RWD_CHANNEL_GT_ROW_GT(ukernel, ukernel, RWDMicrokernelTester::OpType::Sum, init_params);
#include "src/f32-rwdsum/f32-rwdsum.h"
#undef XNN_UKERNEL_WITH_PARAMS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2024 Google LLC
//
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -240,14 +240,4 @@ class RWDMicrokernelTester {
.Test(__VA_ARGS__); \
} \
} \
}

#define XNN_TEST_RWD_CHANNEL_EQ_ROW_258(ukernel, ...) \
TEST(ukernel, overflow_accumulator) { \
for (size_t channels = 1; channels < 2; ++channels) { \
RWDMicrokernelTester() \
.rows(258) \
.channels(channels) \
.Test(__VA_ARGS__); \
} \
}
3 changes: 1 addition & 2 deletions tools/generate-rwd-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@
XNN_TEST_RWD_CHANNEL_EQ_ROW_GT(ukernel, ${", ".join(TEST_ARGS)});
XNN_TEST_RWD_CHANNEL_GT_ROW_EQ(ukernel, ${", ".join(TEST_ARGS)});
XNN_TEST_RWD_CHANNEL_GT_ROW_GT(ukernel, ${", ".join(TEST_ARGS)});
XNN_TEST_RWD_CHANNEL_EQ_ROW_258(ukernel, ${", ".join(TEST_ARGS)});
"""

def main(args):
options = parser.parse_args(args)

tester = options.tester
tester_header = {
"RWDMicrokernelTester": "rwd-microkernel-tester.h",
"RWDMicrokernelTester": "reducewindow-d-microkernel-tester.h",
}[tester]

tests = """\
Expand Down

0 comments on commit c56dae2

Please sign in to comment.