Updating GEMMBenchmark constructor to use ConstantOrFunction

Colm-in-Arm · Colm-in-Arm · commit 06ea627f4653 · 2025-09-30T16:27:55.000+01:00
Builds with XNNPACK_ENABLE_ARM_SME2=ON are failing.

Signed-off-by: Colm Donelan &lt;colm.donelan@arm.com&gt;
diff --git a/bench/gemm-benchmark.cc b/bench/gemm-benchmark.cc
@@ -789,7 +789,7 @@ void GEMMBenchmark(benchmark::State& state,
                    xnn_init_f32_minmax_params_fn init_minmax_params,
                    xnn_pack_weights_and_biases_fn pack_weights,
                    xnn_packed_stride_weights_and_biases_fn packed_stride,
-                   size_t mr, size_t nr, size_t kr, size_t sr, size_t mr_packed,
+                   ConstantOrFunction mr, ConstantOrFunction nr, size_t kr, size_t sr, ConstantOrFunction mr_packed,
                    uint64_t arch_flags) {
   if (!benchmark::utils::CheckArchFlags(state, arch_flags)) {
     return;
diff --git a/bench/gemm-benchmark.h b/bench/gemm-benchmark.h
@@ -98,7 +98,7 @@ void GEMMBenchmark(benchmark::State& state,
                    xnn_init_f32_minmax_params_fn init_minmax_params,
                    xnn_pack_weights_and_biases_fn pack_weights,
                    xnn_packed_stride_weights_and_biases_fn packed_stride,
-                   size_t mr, size_t nr, size_t kr, size_t sr, size_t mr_packed,
+                   ConstantOrFunction mr, ConstantOrFunction nr, size_t kr, size_t sr, ConstantOrFunction mr_packed,
                    uint64_t arch_flags = 0);
 
 void GEMMBenchmark(benchmark::State& state,
