Fix incompatibilities with MSVC in unit tests
MSVC doesn't support designated initializers in C++ code
PiperOrigin-RevId: 321601896
diff --git a/test/dwconv-microkernel-tester.h b/test/dwconv-microkernel-tester.h
index 01f8444..86a02ac 100644
--- a/test/dwconv-microkernel-tester.h
+++ b/test/dwconv-microkernel-tester.h
@@ -198,10 +198,7 @@
std::fill(output.begin(), output.end(), 0xA5);
std::fill(packed_weights.begin(), packed_weights.end(), 0);
- const xnn_qu8_packing_params packing_params = {
- .input_zero_point = input_zero_point(),
- .kernel_zero_point = kernel_zero_point(),
- };
+ const xnn_qu8_packing_params packing_params = { input_zero_point(), kernel_zero_point() };
xnn_pack_qu8_dwconv_ghw_w(
kr(), 1, channels(), cr(),
kernel.data(), bias.data(), packed_weights.data(), &packing_params);
diff --git a/test/gemm-microkernel-tester.h b/test/gemm-microkernel-tester.h
index 9332503..31086ef 100644
--- a/test/gemm-microkernel-tester.h
+++ b/test/gemm-microkernel-tester.h
@@ -239,10 +239,7 @@
std::fill(c.begin(), c.end(), 0xA5);
std::fill(packed_w.begin(), packed_w.end(), b_zero_point());
- const xnn_qu8_packing_params packing_params = {
- .input_zero_point = a_zero_point(),
- .kernel_zero_point = b_zero_point(),
- };
+ const xnn_qu8_packing_params packing_params = { a_zero_point(), b_zero_point() };
xnn_pack_qu8_gemm_goi_w(1, n(), k(), nr(), kr(), sr(),
b.data(), bias.data(), packed_w.data(), &packing_params);
@@ -343,10 +340,7 @@
std::fill(c.begin(), c.end(), 0xA5);
std::fill(packed_w.begin(), packed_w.end(), b_zero_point());
- const xnn_qu8_packing_params packing_params = {
- .input_zero_point = a_zero_point(),
- .kernel_zero_point = b_zero_point(),
- };
+ const xnn_qu8_packing_params packing_params = { a_zero_point(), b_zero_point() };
xnn_pack_qu8_conv_goki_w(
1, n(), ks(), k(), nr(), kr(), sr(),
b.data(), bias.data(), packed_w.data(), &packing_params);
diff --git a/test/memory-planner-test.cc b/test/memory-planner-test.cc
index 3f69ef3..c8c5f5b 100644
--- a/test/memory-planner-test.cc
+++ b/test/memory-planner-test.cc
@@ -57,34 +57,24 @@
struct xnn_value_allocation_tracker tracker;
xnn_init_value_allocation_tracker(&tracker, &subgraph);
// As this is an empty subgraph, we create the following xnn_value_usage stub.
- tracker.usage[0] = (struct xnn_value_usage){
- .first_node = 1,
- .last_node = 1,
- };
+ tracker.usage[0].first_node = 1,
+ tracker.usage[0].last_node = 1,
xnn_add_value_allocation_tracker(&tracker, 0, 56);
- tracker.usage[1] = (struct xnn_value_usage){
- .first_node = 0,
- .last_node = 1,
- };
+ tracker.usage[1].first_node = 0,
+ tracker.usage[1].last_node = 1,
xnn_add_value_allocation_tracker(&tracker, 1, 40);
- tracker.usage[2] = (struct xnn_value_usage){
- .first_node = 1,
- .last_node = 1,
- };
+ tracker.usage[2].first_node = 1,
+ tracker.usage[2].last_node = 1,
xnn_add_value_allocation_tracker(&tracker, 2, 64);
- tracker.usage[3] = (struct xnn_value_usage){
- .first_node = 0,
- .last_node = 0,
- };
+ tracker.usage[3].first_node = 0,
+ tracker.usage[3].last_node = 0,
xnn_add_value_allocation_tracker(&tracker, 3, 152);
- tracker.usage[4] = (struct xnn_value_usage){
- .first_node = 1,
- .last_node = 1,
- };
+ tracker.usage[4].first_node = 1,
+ tracker.usage[4].last_node = 1,
xnn_add_value_allocation_tracker(&tracker, 4, 20);
xnn_plan_value_allocation_tracker(&tracker);
@@ -116,52 +106,36 @@
struct xnn_value_allocation_tracker tracker;
xnn_init_value_allocation_tracker(&tracker, &subgraph);
// As this is an empty subgraph, we create the following xnn_value_usage stub.
- tracker.usage[0] = (struct xnn_value_usage){
- .first_node = 0,
- .last_node = 1,
- };
+ tracker.usage[0].first_node = 0,
+ tracker.usage[0].last_node = 1,
xnn_add_value_allocation_tracker(&tracker, 0, 32);
- tracker.usage[1] = (struct xnn_value_usage){
- .first_node = 1,
- .last_node = 4,
- };
+ tracker.usage[1].first_node = 1,
+ tracker.usage[1].last_node = 4,
xnn_add_value_allocation_tracker(&tracker, 1, 28);
- tracker.usage[2] = (struct xnn_value_usage){
- .first_node = 2,
- .last_node = 5,
- };
+ tracker.usage[2].first_node = 2,
+ tracker.usage[2].last_node = 5,
xnn_add_value_allocation_tracker(&tracker, 2, 36);
- tracker.usage[3] = (struct xnn_value_usage){
- .first_node = 3,
- .last_node = 5,
- };
+ tracker.usage[3].first_node = 3,
+ tracker.usage[3].last_node = 5,
xnn_add_value_allocation_tracker(&tracker, 3, 16);
- tracker.usage[4] = (struct xnn_value_usage){
- .first_node = 4,
- .last_node = 5,
- };
+ tracker.usage[4].first_node = 4,
+ tracker.usage[4].last_node = 5,
xnn_add_value_allocation_tracker(&tracker, 4, 8);
- tracker.usage[5] = (struct xnn_value_usage){
- .first_node = 5,
- .last_node = 7,
- };
+ tracker.usage[5].first_node = 5,
+ tracker.usage[5].last_node = 7,
xnn_add_value_allocation_tracker(&tracker, 5, 64);
- tracker.usage[6] = (struct xnn_value_usage){
- .first_node = 6,
- .last_node = 8,
- };
+ tracker.usage[6].first_node = 6,
+ tracker.usage[6].last_node = 8,
xnn_add_value_allocation_tracker(&tracker, 6, 10);
- tracker.usage[7] = (struct xnn_value_usage){
- .first_node = 7,
- .last_node = 8,
- };
+ tracker.usage[7].first_node = 7,
+ tracker.usage[7].last_node = 8,
xnn_add_value_allocation_tracker(&tracker, 7, 40);
xnn_plan_value_allocation_tracker(&tracker);